From 2bfccd77d4de570906ba90f9ca73aa7a23394640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 1 Aug 2016 12:44:03 +0200 Subject: [PATCH 1/4] docs(): updated release links --- docs/sources/installation/debian.md | 6 +++--- docs/sources/installation/rpm.md | 8 ++++---- docs/sources/installation/windows.md | 2 +- packaging/publish/publish.sh | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 42acacf8228..1083f5f3078 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -10,13 +10,13 @@ page_keywords: grafana, installation, debian, ubuntu, guide Description | Download ------------ | ------------- -Stable .deb for Debian-based Linux | [3.1.0](https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.0-1468321182_amd64.deb) +Stable .deb for Debian-based Linux | [3.1.1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.1-1470047149_amd64.deb) ## Install Stable - $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.0-1468321182_amd64.deb + $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.1-1470047149_amd64.deb $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_3.1.0-1468321182_amd64.deb + $ sudo dpkg -i grafana_3.1.1-1470047149_amd64.deb ## APT Repository diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index c08521a7538..d1a402a08c9 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -10,24 +10,24 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide Description | Download ------------ | ------------- -Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [3.1.0 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.0-1468321182.x86_64.rpm) +Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [3.1.1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.1-1470047149.x86_64.rpm) ## Install Latest Stable You can install Grafana using Yum directly. - $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.0-1468321182.x86_64.rpm + $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.1-1470047149.x86_64.rpm Or install manually using `rpm`. #### On CentOS / Fedora / Redhat: $ sudo yum install initscripts fontconfig - $ sudo rpm -Uvh grafana-3.1.0-1468321182.x86_64.rpm + $ sudo rpm -Uvh grafana-3.1.1-1470047149.x86_64.rpm #### On OpenSuse: - $ sudo rpm -i --nodeps grafana-3.1.0-1468321182.x86_64.rpm + $ sudo rpm -i --nodeps grafana-3.1.1-1470047149.x86_64.rpm ## Install via YUM Repository diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index 88c92d2ffed..7dc4ce6d5d3 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -10,7 +10,7 @@ page_keywords: grafana, installation, windows guide Description | Download ------------ | ------------- -Stable Zip package for Windows | [grafana.3.1.0.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-3.1.0.windows-x64.zip) +Stable Zip package for Windows | [grafana.3.1.1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-3.1.1.windows-x64.zip) ## Configure diff --git a/packaging/publish/publish.sh b/packaging/publish/publish.sh index 2ab50095695..291222a80e9 100755 --- a/packaging/publish/publish.sh +++ b/packaging/publish/publish.sh @@ -1,20 +1,20 @@ #! /usr/bin/env bash -deb_ver=3.1.0-1466666977beta1 -rpm_ver=3.1.0-1466666977beta1 +deb_ver=3.1.1-1470047149 +rpm_ver=3.1.1-1470047149 -# wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb +wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb -# package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb -# package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb +package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb +package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb -# wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm +wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm -# package_cloud push grafana/stable/el/7 grafana-${rpm_ver}.x86_64.rpm -# package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm +package_cloud push grafana/stable/el/7 grafana-${rpm_ver}.x86_64.rpm +package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm From 34ea7312bcf2ab293978bdfbf18cc52aa53dce5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 2 Aug 2016 09:35:15 +0200 Subject: [PATCH 2/4] docs(): added missing snapshot config options, fixes #5708 --- docs/sources/installation/configuration.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index d0ce39cf482..3375a62aa9c 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -477,3 +477,14 @@ Format ``:port ### prefix Graphite metric prefix. Defaults to `prod.grafana.%(instance_name)s.` +## [snapshots] + +### external_enabled +Set to false to disable external snapshot publish endpoint (default true) + +### external_snapshot_url +Set root url to a Grafana instance where you want to publish external snapshots (defaults to https://snapshots-origin.raintank.io) + +### external_snapshot_name +Set name for external snapshot button. Defaults to `Publish to snapshot.raintank.io` + From 624e30e7433a483e7523b9fc7847865fff45c2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 10 Aug 2016 08:38:08 +0200 Subject: [PATCH 3/4] fix(docs): minor doc fixes, fixes #5751 --- docs/sources/guides/gettingstarted.md | 2 +- docs/sources/installation/configuration.md | 2 +- docs/sources/reference/playlist.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/sources/guides/gettingstarted.md b/docs/sources/guides/gettingstarted.md index c92f30098ab..004b1fcdadb 100644 --- a/docs/sources/guides/gettingstarted.md +++ b/docs/sources/guides/gettingstarted.md @@ -5,7 +5,7 @@ page_keywords: grafana, guide, documentation --- # Getting started -This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana 2.x instance, and have added at least one [Data Source](/datasources/overview). +This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana server up and running and have added at least one [Data Source](/datasources/overview). ## Beginner guides Watch the 10min [beginners guide to building dashboards](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) to get a quick intro to setting up Dashboards and Panels. diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 3375a62aa9c..931d123c68b 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -76,7 +76,7 @@ The IP address to bind to. If empty will bind to all interfaces The port to bind to, defaults to `3000`. To use port 80 you need to either give the Grafana binary permission for example: - $ sudo setcap 'cap_net_bind_service=+ep' /opt/grafana/current/grafana + $ sudo setcap 'cap_net_bind_service=+ep' /usr/sbin/grafana-server Or redirect port 80 to the Grafana port using: diff --git a/docs/sources/reference/playlist.md b/docs/sources/reference/playlist.md index 5d546b1a3df..f35767625c5 100644 --- a/docs/sources/reference/playlist.md +++ b/docs/sources/reference/playlist.md @@ -14,7 +14,7 @@ Since Grafana automatically scales Dashboards to any resolution they're perfect The Playlist feature can be accessed from Grafana's sidemenu. Click the 'Playlist' button from the sidemenu to access the Playlist functionality. When 'Playlist' button is clicked, playlist view will open up showing saved playlists and an option to create new playlists. - + Click on "New Playlist" button to create a new playlist. Firstly, name your playlist and configure a time interval for Grafana to wait on a particular Dashboard before advancing to the next one on the Playlist. From c0301349fb8fb54a207dc7f806dd6ec0ce082c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 10 Aug 2016 08:39:57 +0200 Subject: [PATCH 4/4] docs(): update mac docs --- docs/sources/installation/mac.md | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index e65c2823666..b68cadbd948 100644 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -11,28 +11,17 @@ Installation can be done using [homebrew](http://brew.sh/) Install latest stable: ``` -brew install grafana/grafana/grafana +brew update +brew install grafana ``` To start grafana look at the command printed after the homebrew install completes. -You can also add the grafana as tap. - -``` -brew tap grafana/grafana -brew install grafana -``` - -Install latest unstable from master: - -``` -brew install --HEAD grafana/grafana/grafana -``` - To upgrade use the reinstall command ``` -brew reinstall --HEAD grafana/grafana/grafana +brew update +brew reinstall grafana ```