Merge branch 'master' into preferences

appveyor.yml

@@ -5,7 +5,7 @@ os: Windows Server 2012 R2
 clone_folder: c:\gopath\src\github.com\grafana\grafana
 
 environment:
-  nodejs_version: "4"
+  nodejs_version: "5"
   GOPATH: c:\gopath
 
 install:

docs/VERSION

-4.0.0
+3.0.0

docs/sources/installation/debian.md

@@ -10,14 +10,21 @@ page_keywords: grafana, installation, debian, ubuntu, guide
 
 Description | Download
 ------------ | -------------
-.deb for Debian-based Linux | [grafana_2.6.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb)
+Stable .deb for Debian-based Linux | [grafana_2.6.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb)
+Beta .deb for Debian-based Linux |   [grafana_3.0.0-beta11459429091_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta11459429091_amd64.deb)
 
-## Install
+## Install Stable
 
     $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb
     $ sudo apt-get install -y adduser libfontconfig
     $ sudo dpkg -i grafana_2.6.0_amd64.deb
 
+## Install 3.0 Beta
+
+    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.0-beta11459429091_amd64.deb
+    $ sudo apt-get install -y adduser libfontconfig
+    $ sudo dpkg -i grafana_3.0.0-beta11459429091_amd64.deb
+
 ## APT Repository
 
 Add the following line to your `/etc/apt/sources.list` file.

docs/sources/installation/rpm.md

@@ -10,9 +10,10 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide
 
 Description | Download
 ------------ | -------------
-.RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-2.6.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0-1.x86_64.rpm)
+Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-2.6.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0-1.x86_64.rpm)
+Beta .RPM for CentOS / Fedor / OpenSuse / Redhat Linux | [grafana-3.0.0-beta11459429091.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta11459429091.x86_64.rpm)
 
-## Install from package file
+## Install Stable Release from package file
 
 You can install Grafana using Yum directly.
 
@@ -29,6 +30,24 @@ Or install manually using `rpm`.
 
     $ sudo rpm -i --nodeps grafana-2.6.0-1.x86_64.rpm
 
+## Install Beta Release from package file
+
+You can install Grafana using Yum directly.
+
+    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.0-beta11459429091.x86_64.rpm
+
+Or install manually using `rpm`.
+
+#### On CentOS / Fedora / Redhat:
+
+    $ sudo yum install initscripts fontconfig
+    $ sudo rpm -Uvh grafana-3.0.0-beta11459429091.x86_64.rpm
+
+#### On OpenSuse:
+
+    $ sudo rpm -i --nodeps grafana-3.0.0-beta11459429091.x86_64.rpm
+
+
 ## Install via YUM Repository
 
 Add the following to a new file at `/etc/yum.repos.d/grafana.repo`

docs/sources/installation/windows.md

@@ -10,7 +10,7 @@ page_keywords: grafana, installation, windows guide
 
 Description | Download
 ------------ | -------------
-Zip package for Windows | [grafana.2.5.0.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-2.5.0.windows-x64.zip)
+Stable Zip package for Windows | [grafana.2.5.0.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-2.5.0.windows-x64.zip)
 
 ## Configure
 

package.json

@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "3.0.0-pre",
+  "version": "3.0.0-beta1",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"

packaging/publish/publish.sh

 #! /usr/bin/env bash
 
-deb_ver=3.0.0-pre1459365183
-rpm_ver=3.0.0-pre1459365183
+deb_ver=3.0.0-beta11459429091
+rpm_ver=3.0.0-beta11459429091
 
 #rpm_ver=3.0.0-1
 
-# 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

public/app/features/panel/panel_ctrl.ts

@@ -45,7 +45,7 @@ export class PanelCtrl {
     }
 
     $scope.$on("refresh", () => this.refresh());
-    $scope.$on("render", () => this.calculatePanelHeight());
+    $scope.$on("render", () => this.render());
   }
 
   init() {
@@ -149,6 +149,7 @@ export class PanelCtrl {
       return;
     }
 
+    this.calculatePanelHeight();
     this.events.emit('render', payload);
   }
 

public/app/plugins/datasource/cloudwatch/README.md

+# CloudWatch Datasource -  Native Plugin
+
+Grafana ships with **built in** support for CloudWatch. You just have to add it as a data source and you will be ready to build dashboards for you CloudWatch metrics.
+
+Read more about it here:
+
+[http://docs.grafana.org/datasources/cloudwatch/](http://docs.grafana.org/datasources/cloudwatch/)
\ No newline at end of file

public/app/plugins/datasource/elasticsearch/README.md

+# CloudWatch Datasource -  Native Plugin
+
+Grafana ships with **advanced support** for Elasticsearch. You can do many types of simple or complex elasticsearch queries to visualize logs or metrics stored in Elasticsearch. You can also annotate your graphs with log events stored in Elasticsearch.
+
+Read more about it here:
+
+[http://docs.grafana.org/datasources/elasticsearch/](http://docs.grafana.org/datasources/elasticsearch/)
\ No newline at end of file

public/app/plugins/datasource/grafana/README.md

+# Grafana Fake Data Datasource -  Native Plugin
+
+This is the built in Fake Data Datasource that is used before any datasources are set up in your Grafana installation. It means you can create a graph without any data and still get an idea of what it would look like.

public/app/plugins/datasource/graphite/README.md

+# Graphite Datasource -  Native Plugin
+
+Grafana ships with **built in** support for Graphite (of course!). 
+
+Grafana has an advanced Graphite query editor that lets you quickly navigate the metric space, add functions, change function parameters and much more. The editor can handle all types of graphite queries. It can even handle complex nested queries through the use of query references.
+
+Read more about it here:
+
+[http://docs.grafana.org/datasources/graphite/](http://docs.grafana.org/datasources/graphite/)
\ No newline at end of file

public/app/plugins/datasource/influxdb/README.md

+# InfluxDB Datasource -  Native Plugin
+
+Grafana ships with **built in** support for InfluxDB 0.9. 
+
+There are currently two separate datasources for InfluxDB in Grafana: InfluxDB 0.8.x and InfluxDB 0.9.x. The API and capabilities of InfluxDB 0.9.x are completely different from InfluxDB 0.8.x which is why Grafana handles them as different data sources.
+
+This is the plugin for InfluxDB 0.9. It is rapidly evolving and we continue to track its API. 
+
+InfluxDB 0.8 is no longer maintained by InfluxDB Inc, but we provide support as a convenience to existing users. You can find it [here](https://www.grafana.net/plugins/grafana-influxdb-08-datasource).
+
+Read more about InfluxDB here:
+
+[http://docs.grafana.org/datasources/influxdb/](http://docs.grafana.org/datasources/influxdb/)
\ No newline at end of file

public/app/plugins/datasource/mixed/README.md

+# Mixed Datasource -  Native Plugin
+
+This is a **built in** datasource that allows you to mix different datasource on the same graph! You can enable this by selecting the built in -- Mixed -- data source. When selected this will allow you to specify data source on a per query basis. This will, for example, allow you to plot metrics from different Graphite servers on the same Graph or plot data from Elasticsearch alongside data from Prometheus. Mixing different data sources on the same graph works for any data source, even custom ones.
\ No newline at end of file

public/app/plugins/datasource/opentsdb/README.md

+# OpenTSDB Datasource -  Native Plugin
+
+Grafana ships with **built in** support for OpenTSDB, a scalable, distributed time series database.
+
+Read more about it here:
+
+[http://docs.grafana.org/datasources/opentsdb/](http://docs.grafana.org/datasources/opentsdb/)
\ No newline at end of file

public/app/plugins/datasource/prometheus/README.md

+# Prometheus Datasource -  Native Plugin
+
+Grafana ships with **built in** support for Prometheus, the open-source service monitoring system and time series database.
+
+Read more about it here:
+
+[http://docs.grafana.org/datasources/prometheus/](http://docs.grafana.org/datasources/prometheus/)

public/app/plugins/panel/dashlist/README.md

+# Dashlist Panel -  Native Plugin
+
+This Dashlist panel is **included** with Grafana.
+
+The dashboard list panel allows you to display dynamic links to other dashboards. The list can be configured to use starred dashboards, a search query and/or dashboard tags.
+
+Read more about it here:
+
+[http://docs.grafana.org/reference/dashlist/](http://docs.grafana.org/reference/dashlist/)
\ No newline at end of file

public/app/plugins/panel/graph/README.md

+# Graph Panel -  Native Plugin
+
+The Graph is the main graph panel and is **included** with Grafana. It provides a very rich set of graphing options.
+
+Read more about it here:
+
+[http://docs.grafana.org/reference/graph/](http://docs.grafana.org/reference/graph/)
\ No newline at end of file

public/app/plugins/panel/singlestat/README.md

+# Singlestat Panel -  Native Plugin
+
+The Singlestat Panel is **included** with Grafana.
+
+The Singlestat Panel allows you to show the one main summary stat of a SINGLE series. It reduces the series into a single number (by looking at the max, min, average, or sum of values in the series). Singlestat also provides thresholds to color the stat or the Panel background. It can also translate the single number into a text value, and show a sparkline summary of the series.
+
+Read more about it here:
+
+[http://docs.grafana.org/reference/singlestat/](http://docs.grafana.org/reference/singlestat/)
\ No newline at end of file

public/app/plugins/panel/table/README.md

+# Table Panel -  Native Plugin
+
+The Table Panel is **included** with Grafana.
+
+The table panel is very flexible, supporting both multiple modes for time series as well as for table, annotation and raw JSON data. It also provides date formatting and value formatting and coloring options.
+
+Check out the [Table Panel Showcase in the Grafana Playground](http://play.grafana.org/dashboard/db/table-panel-showcase) or read more about it here:
+
+[http://docs.grafana.org/reference/table_panel/](http://docs.grafana.org/reference/table_panel/)
\ No newline at end of file

public/app/plugins/panel/text/README.md

+# Text Panel -  Native Plugin
+
+The Text Panel is **included** with Grafana.
+
+The Text Panel is a very simple panel that displays text. The source text is written in the Markdown syntax meaning you can format the text. Read [GitHub's Mastering Markdown](https://guides.github.com/features/mastering-markdown/) to learn more.
\ No newline at end of file