IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-01-11 12:11:38 +01:00
commit b48273d1cf
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/sources/guides/whats-new-in-v4-1.md
View File

@ -1,17 +1,17 @@
+++ +++
title = "What's New in Grafana v4.1 beta" title = "What's New in Grafana v4.1"
description = "Feature & improvement highlights for Grafana v4.1 beta" description = "Feature & improvement highlights for Grafana v4.1"
keywords = ["grafana", "new", "documentation", "4.1.0-beta1"] keywords = ["grafana", "new", "documentation", "4.1.0"]
type = "docs" type = "docs"
[menu.docs] [menu.docs]
name = "Version 4.1 beta" name = "Version 4.1"
identifier = "v4.1" identifier = "v4.1"
parent = "whatsnew" parent = "whatsnew"
weight = -1 weight = -1
+++ +++
## Whats new in Grafana v4.1 beta ## Whats new in Grafana v4.1
- **Graph**: Support for shared tooltip on all graphs as you hover over one graph. [#1578](https://github.com/grafana/grafana/pull/1578), [#6274](https://github.com/grafana/grafana/pull/6274) - **Graph**: Support for shared tooltip on all graphs as you hover over one graph. [#1578](https://github.com/grafana/grafana/pull/1578), [#6274](https://github.com/grafana/grafana/pull/6274)
- **Victorops**: Add VictorOps notification integration [#6411](https://github.com/grafana/grafana/issues/6411), thx [@ichekrygin](https://github.com/ichekrygin) - **Victorops**: Add VictorOps notification integration [#6411](https://github.com/grafana/grafana/issues/6411), thx [@ichekrygin](https://github.com/ichekrygin)
- **Opsgenie**: Add OpsGenie notification integratiion [#6687](https://github.com/grafana/grafana/issues/6687), thx [@kylemcc](https://github.com/kylemcc) - **Opsgenie**: Add OpsGenie notification integratiion [#6687](https://github.com/grafana/grafana/issues/6687), thx [@kylemcc](https://github.com/kylemcc)
@ -55,7 +55,7 @@ Once the `access key` and `secret key` have been saved the user will no longer b
## Upgrade & Breaking changes ## Upgrade & Breaking changes
Elasticsearch 1.x is no longer supported. Please upgrade to Elasticsearch 2.x or 5.x. Otherwise Grafana 4.1.0-beta1 contains no breaking changes. Elasticsearch 1.x is no longer supported. Please upgrade to Elasticsearch 2.x or 5.x. Otherwise Grafana 4.1.0 contains no breaking changes.
## Changelog ## Changelog

6
docs/sources/installation/debian.md
View File

@ -15,14 +15,14 @@ weight = 1
Description | Download Description | Download
------------ | ------------- ------------ | -------------
Stable for Debian-based Linux | [4.1.0 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1484056345_amd64.deb) Stable for Debian-based Linux | [4.1.0 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1484127817_amd64.deb)
## Install Stable ## Install Stable
``` ```
$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1484056345_amd64.deb $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1484127817_amd64.deb
$ sudo apt-get install -y adduser libfontconfig $ sudo apt-get install -y adduser libfontconfig
$ sudo dpkg -i grafana_4.1.0-1484056345_amd64.deb $ sudo dpkg -i grafana_4.1.0-1484127817_amd64.deb
``` ```
## APT Repository ## APT Repository

8
docs/sources/installation/rpm.md
View File

@ -15,24 +15,24 @@ weight = 2
Description | Download Description | Download
------------ | ------------- ------------ | -------------
Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.0 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1484056345.x86_64.rpm) Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.0 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1484127817.x86_64.rpm)
## Install Stable ## Install Stable
You can install Grafana using Yum directly. You can install Grafana using Yum directly.
$ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1484056345.x86_64.rpm $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1484127817.x86_64.rpm
Or install manually using `rpm`. Or install manually using `rpm`.
#### On CentOS / Fedora / Redhat: #### On CentOS / Fedora / Redhat:
$ sudo yum install initscripts fontconfig $ sudo yum install initscripts fontconfig
$ sudo rpm -Uvh grafana-4.1.0-1484056345.x86_64.rpm $ sudo rpm -Uvh grafana-4.1.0-1484127817.x86_64.rpm
#### On OpenSuse: #### On OpenSuse:
$ sudo rpm -i --nodeps grafana-4.1.0-1484056345.x86_64.rpm $ sudo rpm -i --nodeps grafana-4.1.0-1484127817.x86_64.rpm
## Install via YUM Repository ## Install via YUM Repository

4
packaging/publish/publish_both.sh
View File

@ -1,6 +1,6 @@
#! /usr/bin/env bash #! /usr/bin/env bash
deb_ver=4.1.0-1484056345 deb_ver=4.1.0-1484127817
rpm_ver=4.1.0-1484056345 rpm_ver=4.1.0-1484127817
wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb