From afa5e9507aa2c7d19ab06d396aa4e834938f52bd Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 20 Dec 2016 13:02:55 +0100 Subject: [PATCH] docs: updates install links for 4.1.0 beta --- docs/sources/installation/debian.md | 7 +++++++ docs/sources/installation/rpm.md | 16 ++++++++++++++++ docs/sources/installation/windows.md | 1 + packaging/publish/publish_testing.sh | 4 ++-- scripts/trigger_windows_build.sh | 2 +- 5 files changed, 27 insertions(+), 3 deletions(-) mode change 100644 => 100755 packaging/publish/publish_testing.sh diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 5384593b302..ef8a6648699 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -16,6 +16,7 @@ weight = 1 Description | Download ------------ | ------------- Stable for Debian-based Linux | [4.0.2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.2-1481203731_amd64.deb) +Latest beta for Debian-based Linux | [4.1.0-beta1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1482230757beta1_amd64.deb) ## Install Stable @@ -25,6 +26,12 @@ $ sudo apt-get install -y adduser libfontconfig $ sudo dpkg -i grafana_4.0.2-1481203731_amd64.deb ``` +## Install Latest Beta + +$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1482230757beta1_amd64.deb +$ sudo apt-get install -y adduser libfontconfig +$ sudo dpkg -i grafana_4.1.0-1482230757beta1_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 cd99439066f..ac182585a5d 100644 --- a/docs/sources/installation/rpm.md +++ b/docs/sources/installation/rpm.md @@ -16,6 +16,7 @@ weight = 2 Description | Download ------------ | ------------- Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.0.2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.2-1481203731.x86_64.rpm) +Latest beta for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.0-beta1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1482230757beta1.x86_64.rpm) ## Install Stable @@ -34,6 +35,21 @@ Or install manually using `rpm`. $ sudo rpm -i --nodeps grafana-4.0.2-1481203731.x86_64.rpm +## Or Install Latest Beta + + $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1482230757beta1.x86_64.rpm + +Or install manually using `rpm`. + +#### On CentOS / Fedora / Redhat: + + $ sudo yum install initscripts fontconfig + $ sudo rpm -Uvh grafana-4.1.0-1482230757beta1.x86_64.rpm + +#### On OpenSuse: + + $ sudo rpm -i --nodeps grafana-4.1.0-1482230757beta1.x86_64.rpm + ## Install via YUM Repository Add the following to a new file at `/etc/yum.repos.d/grafana.repo` diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index 5217181f1ee..8704501bfe8 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -14,6 +14,7 @@ weight = 3 Description | Download ------------ | ------------- Latest stable package for Windows | [grafana.4.0.2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.2.windows-x64.zip) +Latest beta package for Windows | [grafana.4.1.0-beta1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/) ## Configure diff --git a/packaging/publish/publish_testing.sh b/packaging/publish/publish_testing.sh old mode 100644 new mode 100755 index b6277ebee69..1e39d65b7e5 --- a/packaging/publish/publish_testing.sh +++ b/packaging/publish/publish_testing.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -deb_ver=4.0.2-1481203731 -rpm_ver=4.0.2-1481203731 +deb_ver=4.1.0-1482230757beta1 +rpm_ver=4.1.0-1482230757beta1 wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb diff --git a/scripts/trigger_windows_build.sh b/scripts/trigger_windows_build.sh index 9ba5c5eddb2..521a365a299 100755 --- a/scripts/trigger_windows_build.sh +++ b/scripts/trigger_windows_build.sh @@ -5,5 +5,5 @@ _token=$1 curl \ -H "Content-Type: application/json" \ -H "Authorization: Bearer ${_token}" \ - -X POST -d '{ "accountName": "Torkeldegaard", "projectSlug": "grafana","branch": "v4.0.x","environmentVariables": {}}' \ + -X POST -d '{ "accountName": "Torkeldegaard", "projectSlug": "grafana","branch": "master","environmentVariables": {}}' \ https://ci.appveyor.com/api/builds