From b00e9390d34e27da1ac3aab8e27a0f535a4c75fd Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 29 Nov 2016 19:03:33 +0100 Subject: [PATCH] docs(v4): update docs for v4 --- CHANGELOG.md | 2 +- README.md | 2 +- docs/sources/installation/debian.md | 13 +++---------- docs/sources/installation/rpm.md | 24 ++++-------------------- docs/sources/installation/windows.md | 4 +--- 5 files changed, 10 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f437fbab99..8b998aca6f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 4.0-stable (unreleased) +# 4.0-stable (2016-11-29) ### Bugfixes * **Server-side rendering**: Fixed address used when rendering panel via phantomjs and using non default http_addr config [#6660](https://github.com/grafana/grafana/issues/6660) diff --git a/README.md b/README.md index f0507d6012a..ef14defc066 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB. - [What's New in Grafana 2.1](http://docs.grafana.org/guides/whats-new-in-v2-1/) - [What's New in Grafana 2.5](http://docs.grafana.org/guides/whats-new-in-v2-5/) - [What's New in Grafana 3.0](http://docs.grafana.org/guides/whats-new-in-v3/) -- [What's New in Grafana 4.0 Beta](http://docs.grafana.org/guides/whats-new-in-v4/) +- [What's New in Grafana 4.0](http://docs.grafana.org/guides/whats-new-in-v4/) ## Features ### Graphite Target Editor diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 6eddfcdfaa0..4982c283378 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -14,23 +14,16 @@ weight = 1 Description | Download ------------ | ------------- -Stable for Debian-based Linux | [3.1.1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.1-1470047149_amd64.deb) -Latest Beta for Debian-based Linux | [4.0.0-beta2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.0-1479719016beta2_amd64.deb) +Stable for Debian-based Linux | [4.0.0 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.0-1480439068_amd64.deb) ## Install Stable ``` -$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.1-1470047149_amd64.deb +$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.0-1480439068_amd64.deb $ sudo apt-get install -y adduser libfontconfig -$ sudo dpkg -i grafana_3.1.1-1470047149_amd64.deb +$ sudo dpkg -i grafana_4.0.0-1480439068_amd64.deb ``` -## Install Latest Beta - - $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.0-1479719016beta2_amd64.deb - $ sudo apt-get install -y adduser libfontconfig - $ sudo dpkg -i grafana_4.0.0-1479719016beta2_amd64.deb - ## APT Repository Add the following line to your `/etc/apt/sources.list` file. diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md index 24f7826b379..2bb4ef9b605 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -14,40 +14,24 @@ weight = 2 Description | Download ------------ | ------------- -Stable 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) -Latest Beta for CentOS / Fedora / OpenSuse / Redhat Linux | [4.0.0-beta2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-1479719016beta2.x86_64.rpm) +Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.0.0 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-1480439068.x86_64.rpm) ## Install Stable You can install Grafana using Yum directly. - $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.1-1470047149.x86_64.rpm + $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-1480439068.x86_64.rpm Or install manually using `rpm`. #### On CentOS / Fedora / Redhat: $ sudo yum install initscripts fontconfig - $ sudo rpm -Uvh grafana-3.1.1-1470047149.x86_64.rpm + $ sudo rpm -Uvh grafana-4.0.0-1480439068.x86_64.rpm #### On OpenSuse: - $ sudo rpm -i --nodeps grafana-3.1.1-1470047149.x86_64.rpm - -## Or Install Latest Beta - - $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-1479719016beta2.x86_64.rpm - -Or install manually using `rpm`. - -#### On CentOS / Fedora / Redhat: - - $ sudo yum install initscripts fontconfig - $ sudo rpm -Uvh grafana-4.0.0-1479719016beta2.x86_64.rpm - -#### On OpenSuse: - - $ sudo rpm -i --nodeps grafana-4.0.0-1479719016beta2.x86_64.rpm + $ sudo rpm -i --nodeps grafana-4.0.0-1480439068.x86_64.rpm ## Install via YUM Repository diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index be168aace6f..f708243565f 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -13,9 +13,7 @@ weight = 3 Description | Download ------------ | ------------- -Latest stable package for Windows | [grafana.3.1.1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-3.1.1.windows-x64.zip) -Latest beta package for Windows | [grafana.4.0.0-beta2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-beta2.windows-x64.zip) - +Latest stable package for Windows | [grafana.4.0.0.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0.windows-x64.zip) ## Configure