Merge branch 'master' into influxdb_alias_seriename

Author: bergquist

CHANGELOG.md

@@ -1,4 +1,9 @@
-# 4.0-pre (unreleased)
+# 4.0-beta2 (unrelased)
+
+### Bugfixes
+* **Graph Panel**: Bar width if bars was only used in series override, [#6528](https://github.com/grafana/grafana/issues/6528)
+
+# 4.0-beta1 (2016-11-09)
 
 ### Enhancements
 * **Login**: Adds option to disable username/password logins, closes [#4674](https://github.com/grafana/grafana/issues/4674)
@@ -18,12 +23,13 @@
 * **Background Tasks**: Now support automatic purging of old rendered images, closes [#2172](https://github.com/grafana/grafana/issues/2172)
 * **Dashboard**: After inactivity hide nav/row actions, fade to nice clean view, can be toggled with `d v`, also added kiosk mode, toggled via `d k` [#6476](https://github.com/grafana/grafana/issues/6476)
 * **Dashboard**: Improved dashboard row menu & add panel UX [#6442](https://github.com/grafana/grafana/issues/6442)
+* **Graph Panel**: Support for stacking null values [#2912](https://github.com/grafana/grafana/issues/2912), [#6287](https://github.com/grafana/grafana/issues/6287), thanks @benrubson!
 
 ### Breaking changes
 * **SystemD**: Change systemd description, closes [#5971](https://github.com/grafana/grafana/pull/5971)
 * **lodash upgrade**: Upgraded lodash from 2.4.2 to 4.15.0, this contains a number of breaking changes that could effect plugins. closes [#6021](https://github.com/grafana/grafana/pull/6021)
 
-### Bugfixes
+### Bug fixes
 * **Table Panel**: Fixed problem when switching to Mixed datasource in metrics tab, fixes [#5999](https://github.com/grafana/grafana/pull/5999)
 * **Playlist**: Fixed problem with play order not matching order defined in playlist, fixes [#5467](https://github.com/grafana/grafana/pull/5467)
 * **Graph panel**: Fixed problem with auto decimals on y axis when datamin=datamax, fixes [#6070](https://github.com/grafana/grafana/pull/6070)

circle.yml

@@ -5,7 +5,7 @@ machine:
     GOPATH: "/home/ubuntu/.go_workspace"
     ORG_PATH: "github.com/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
-    GODIST: "go1.7.1.linux-amd64.tar.gz"
+    GODIST: "go1.7.3.linux-amd64.tar.gz"
   post:
     - mkdir -p download
     - test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST

docs/sources/alerting/notifications.md

@@ -25,31 +25,12 @@ to add and configure a `notification` object. This is done from the Alerting/Not
 On the notifications list page hit the `New Notification` button to go the the page where you
 can configure and setup a new notification.
 
-You you specify name and type, and type specific options. You can also test the notification to make
+You specify name and type, and type specific options. You can also test the notification to make
 sure it's working and setup correctly.
 
-<!-- You can reach this page from the Alerting submenu or Alert List page header. -->
-<!-- When you configure a notification you can have it be a global notifiations, meaning -->
-<!-- it will be sent for all alerts within Grafana. This is useful to make sure you won’t miss to configure -->
-<!-- notifications for an alert.  You can find the alert notification page in the main menu under alerting. -->
-<!--  -->
-
-<!-- ## Add a notifications to an Alert -->
-<!-- You can add and remove notifications from an alert by going to the `Notifications` sub menu in the alerting tab. -->
-<!--  -->
-<!--  -->
-<!-- <img class="no-shadow" src="/img/docs/v4/alerttab_notifications_submenu.png"> -->
-<!--  -->
-<!--  -->
-<!-- Click the `+` button to add a new notification and the `x` to remove. Notifications with a blue backgrounds are enabled by default for all alerts and cannot be modified from this view. -->
-<!--  -->
-<!--  -->
-<!-- <img class="no-shadow" src="/img/docs/v4/add_remove_notifications.png"> -->
-<!--  -->
-
 ### Send on all alerts
 
-This option will make this notification used for all alert rules, existing and new.
+When checked this option will make this notification used for all alert rules, existing and new.
 
 ## Supported notification types
 
@@ -61,12 +42,25 @@ To enable email notification you have to setup [SMTP settings](/installation/con
 in the Grafana config. Email notification will upload an image of the alert graph to an
 external image destination if available or fallback on attaching the image in the email.
 
+### Slack
+
+{{< imgbox max-width="40%" img="/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
+
+To set up slack you need to configure an incoming webhook url at slack. You can follow their guide for how
+to do that https://api.slack.com/incoming-webhooks If you want to include screenshots of the firing alerts
+in the slack messages you have to configure the [external image destination](#external-image-store) in Grafana.
+
+Setting | Description
+---------- | -----------
+Recipient | allows you to override the slack recipient.
+Mention | make it possible to include a mention in the slack notification sent by Grafana. Ex @here or @channel
+
 ### Webhook
 
 The webhook notification is a simple way to send information about an state change over HTTP to a custom endpoint.
 Using this notification you could integrated Grafana into any system you choose, by yourself.
 
-Example json schema:
+Example json body:
 ```json
 {
   "title": "My alert",
@@ -85,19 +79,6 @@ Example json schema:
 }
 ```
 
-### Slack
-
-{{< imgbox max-width="40%" img="/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
-
-To set up slack you need to configure an incoming webhook url at slack. You can follow their guide for how
-to do that https://api.slack.com/incoming-webhooks If you want to include screenshots of the firing alerts
-in the slack messages you have to configure the [external image destination](#external-image-store) in Grafana.
-
-Setting | Description
----------- | -----------
-Recipient | allows you to override the slack recipient.
-Mention | make it possible to include a mention in the slack notification sent by Grafana. Ex @here or @channel
-
 ### PagerDuty
 
 To set up PagerDuty, all you have to do is to provide an api key.
@@ -120,7 +101,3 @@ config file.
 This is not an optional requirement, you can get slack and email notifications without setting this up.
 
 
-
-
-
-

docs/sources/alerting/rules.md

@@ -1,5 +1,5 @@
 +++
-title = "Alerting Engine Rules Guide"
+title = "Alerting Engine & Rules Guide"
 description = "Configuring Alert Rules"
 keywords = ["grafana", "alerting", "guide", "rules"]
 type = "docs"
@@ -73,7 +73,7 @@ in the scenario below.
 - No new notifications are sent as the alert rule is already in state `Alerting`.
 
 So as you can see from the above scenario Grafana will not send out notifications when other series cause the alert
-to fire if the rule already is in state ´Alerting`. To improve support for queries that return multiple series
+to fire if the rule already is in state `Alerting`. To improve support for queries that return multiple series
 we plan to track state **per series** in a future release.
 
 ### No Data / Null values
@@ -107,6 +107,12 @@ The message can contain anything, information about how you might solve the issu
 The actual notifications are configured and shared between multiple alerts. Read the
 [Notifications]({{< relref "notifications.md" >}}) guide for how to configure and setup notifications.
 
+## Alert State History & Annotations
+
+Alert state changes are recorded in the internal annotation table in Grafana's database. The state changes
+are visualized as annotations in the alert rule's graph panel. You can also go into the `State history`
+submenu in the alert tab to view & clear state history.
+
 ## Troubleshooting
 
 {{< imgbox max-width="40%" img="/img/docs/v4/alert_test_rule.png" caption="Test Rule" >}}

docs/sources/installation/debian.md

@@ -14,13 +14,22 @@ weight = 1
 
 Description | Download
 ------------ | -------------
-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)
+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-beta1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.0-1478693311beta1_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_3.1.1-1470047149_amd64.deb
+$ sudo apt-get install -y adduser libfontconfig
+$ sudo dpkg -i grafana_3.1.1-1470047149_amd64.deb
+```
+
+## Install Latest Beta
+
+    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.0-1478693311beta1_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-1478693311beta1_amd64.deb
 
 ## APT Repository
 

docs/sources/installation/rpm.md

@@ -14,7 +14,8 @@ weight = 2
 
 Description | Download
 ------------ | -------------
-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)
+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-beta1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-1478693311beta1.x86_64.rpm)
 
 ## Install Stable
 
@@ -33,6 +34,21 @@ Or install manually using `rpm`.
 
     $ 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-1478693311beta1.x86_64.rpm
+
+Or install manually using `rpm`.
+
+#### On CentOS / Fedora / Redhat:
+
+    $ sudo yum install initscripts fontconfig
+    $ sudo rpm -Uvh grafana-4.0.0-1478693311beta1.x86_64.rpm
+
+#### On OpenSuse:
+
+    $ sudo rpm -i --nodeps grafana-4.0.0-1478693311beta1.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

@@ -13,7 +13,9 @@ weight = 3
 
 Description | Download
 ------------ | -------------
-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)
+Latest stable package for Windows | [grafana.3.1.1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-3.1.1.windows-x64.zip)
+Latest beta package for Windows | [grafana.4.0.0-beta1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.0-beta1.windows-x64.zip)
+
 
 ## Configure
 

package.json

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

pkg/tsdb/influxdb/influxdb.go

@@ -57,7 +57,7 @@ func (e *InfluxDBExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice,
 	}
 
 	if setting.Env == setting.DEV {
-		glog.Debug("Influxdb query", "raw query", query)
+		glog.Debug("Influxdb query", "raw query", rawQuery)
 	}
 
 	req, err := e.createRequest(rawQuery)

pkg/tsdb/influxdb/model_parser.go

@@ -12,7 +12,6 @@ type InfluxdbQueryParser struct{}
 func (qp *InfluxdbQueryParser) Parse(model *simplejson.Json, dsInfo *tsdb.DataSourceInfo) (*Query, error) {
 	policy := model.Get("policy").MustString("default")
 	rawQuery := model.Get("query").MustString("")
-	interval := model.Get("interval").MustString("")
 	alias := model.Get("alias").MustString("")
 
 	measurement := model.Get("measurement").MustString("")
@@ -37,7 +36,8 @@ func (qp *InfluxdbQueryParser) Parse(model *simplejson.Json, dsInfo *tsdb.DataSo
 		return nil, err
 	}
 
-	if interval == "" {
+	interval := model.Get("interval").MustString("")
+	if interval == "" && dsInfo.JsonData != nil {
 		dsInterval := dsInfo.JsonData.Get("timeInterval").MustString("")
 		if dsInterval != "" {
 			interval = dsInterval