Merge branch 'master' into alerting_definitions

docs/mkdocs.yml

@@ -1,5 +1,4 @@
 site_name: Grafana Documentation
-#site_url: http://docs.grafana.com/
 site_url: /
 site_description: Documentation for Grafana, The Graphite and Influxdb dashboard and graph composer
 site_favicon: img/fav32.png
@@ -46,6 +45,7 @@ pages:
 
 - ['guides/basic_concepts.md', 'User Guides', 'Basic Concepts']
 - ['guides/gettingstarted.md', 'User Guides', 'Getting Started']
+- ['guides/whats-new-in-v3.md', 'User Guides', "What's New in Grafana v3.0"]
 - ['guides/whats-new-in-v2-6.md', 'User Guides', "What's New in Grafana v2.6"]
 - ['guides/whats-new-in-v2-5.md', 'User Guides', "What's New in Grafana v2.5"]
 - ['guides/whats-new-in-v2-1.md', 'User Guides', "What's New in Grafana v2.1"]

docs/sources/guides/whats-new-in-v3.md

@@ -0,0 +1,196 @@
+---
+page_title: What's New in Grafana v3.0
+page_description: What's new in Grafana v3.0
+page_keywords: grafana, new, changes, features, documentation
+---
+
+# What's New in Grafana v3.0
+
+## Commercial Support
+
+Commercial Support subscriptions for Grafana are now [generally available](https://grafana.net/support/plans/).
+
+Raintank is committed to a 100% open-source strategy for Grafana. We
+do not want to go down the “open core” route. If your organization
+finds Grafana valuable, please consider purchasing a subscription. Get
+direct support, bug fixes, and training from the core Grafana team.
+
+## Plugins
+
+With the popularity of Grafana continuing to accelerate, it has been
+challenging to keep up with all the requests for new features, new
+panels, new data sources, and new functionality. Saying “no” so often
+has been frustrating, especially for an open source project with such
+a vibrant community.
+
+The team felt that it was time to dramatically improve extensibility
+through plugin support. Grafana 3.0 comes with a completely revamped
+plugin SDK / API.
+
+We’ve refactored our **Data Source** plugin architecture and added
+two new plugin types:
+
+* **Panel** plugins let you add new panel types for your Dashboards.
+* **App** plugins bundle **Panels** plugins, **Data Sources** plugins,
+Dashboards, and Grafana **Pages**. Apps are a great way to provide an
+entire experience right within Grafana.
+
+## Grafana.net
+
+<img src="/img/v3/grafana_net_tour.png">
+
+A preview of [Grafana.net](http://grafana.net) is launching along with this release. We
+think it’s the perfect compliment to Grafana.
+
+Grafana.net currently offers a central repository where the community
+can come together to discover and share plugins (Data Sources, Panels,
+Apps) and Dashboards for Grafana 3.0 and above.
+
+We are also working on a hosted Graphite-compatible Data Source that
+will be optimized for use with Grafana. It’ll be easy to combine your
+existing Data Source(s) with this OpenSaaS option.
+
+Finally, Grafana.net will also be a hub to manage all your Grafana
+instances. You’ll be able to monitor their health and availability,
+perform Dashboard backups, and more.
+
+Grafana.net will officially launch along with the stable version of
+Grafana 3.0, but <a href=http://www.grafana.net>check out the preview
+and sign up for an account</a> in the meantime.
+
+
+## grafana-cli
+
+Grafana 3.0 comes with a new command line tool called grafana-cli. You
+can easily install plugins from Grafana.net with it. For
+example:
+
+
+```
+grafana-cli install grafana-pie-chart-panel
+```
+
+## Personalization & Preferences
+
+The home dashboard, timezone and theme can now be customized on Organization
+and user Profile level. Grafana can also track recently viewed dashboards, which
+can then be displayed in the dashboard list panel.
+
+## Improved Playlists
+
+You can now save Playlists, and start them by using a Playlist URL. If
+you update a running Playlist, it will update after its next cycle.
+
+This is powerful as it allows you to remote control Grafana. If you
+have a big TV display showing Grafana in your company lobby, create a
+playlist named Lobby, and start it on the computer connected to the
+Lobby TV.
+
+You can now change the Lobby playlist and have the dashboards shown in
+the Lobby update accordingly, automatically.
+
+The playlist does not even have to contain multiple Dashboards; you
+can use this feature to reload the whole Dashboard (and Grafana)
+periodically and remotely.
+
+You can also make Playlists dynamic by using Dashboard **tags** to
+define the Playlist.
+
+<img src="/img/v3/playlist.png">
+
+## Improved UI
+
+We’ve always tried to focus on a good looking, usable, and responsive
+UI. We’ve continued to pay a lot of attention to these areas in this
+release.
+
+Grafana 3.0 has a dramatically updated UI that not only looks better
+but also has a number of usability improvements. The side menu now
+works as a dropdown that you can pin to the side. The Organization /
+Profile / Sign out side menu links have been combined into an on hover
+slide out menu.
+
+In addition, all the forms and the layouts of all pages have been
+updated to look and flow better, and be much more consistent. There
+are literally hundreds of UI improvements and refinements.
+
+Here’s the new side menu in action:
+
+<img src="/img/v3/menu.gif">
+
+And here's the new look for Dashboard settings:
+
+<img src="/img/v3/dashboard_settings.png">
+
+Check out the <a href="http://play.grafana.org" target="_blank">Play
+Site</a> to get a feel for some of the UI changes.
+
+## Improved Annotations
+
+It is now possible to define a link in each annotation. You can hover
+over the link and click the annotation text. This feature is very
+useful for linking to particular commits or tickets where more
+detailed information can be presented to the user.
+
+<img src="/img/v3/annotation_links.gif">
+
+## Data source variables
+
+This has been a top requested feature for very long we are exited to finally provide
+this feature. You can now add a new `Data source` type variable. That will
+automatically be filled with instance names of your data sources.
+
+<img src="/img/v3/data_source_variable.png">
+
+You can then use this variable as the panel data source:
+
+<img src="/img/v3/data_source_variable_use.png">
+
+This will allow you to quickly change data source server and reuse the
+same dashboard for different instances of your metrics backend. For example
+you might have Graphite running in multiple data centers or environments.
+
+## Prometheus, InfluxDB, and OpenTSDB improvements
+
+All three of these popular included Data Sources have seen a variety
+of improvements in this release. Here are some highlights:
+
+### Prometheus
+
+The Prometheus Data Source now supports annotations.
+
+### InfluxDB
+
+You can now select the InfluxDB policy from the query editor.
+<img src="/img/v3/influxdb_policy.png">
+
+Grafana 3.0 also comes with support for InfluxDB 0.11 and InfluxDB 0.12.
+
+### OpenTSDB
+
+OpenTSDB 2.2 is better supported and now supports millisecond precision.
+
+## Breaking changes
+
+Dashboards from v2.6 are compatible; no manual updates should be necessary. There could
+be some edge case scenarios where dashboards using templating could stop working.
+If that is the case just enter the edit view for the template variable and hit Update button.
+This is due to a simplification of the variable format system where template variables are
+now stored without any formatting (glob/regex/etc), this is done on the fly when the
+variable is interpolated.
+
+* Plugin API: The plugin API has changed so if you are using a custom
+data source (or panel) they need to be updated as well.
+
+* InfluxDB 0.8: This data source is no longer included in releases,
+you can still install manually from [Grafana.net](http://grafana.net)
+
+* KairosDB: This data source has also no longer shipped with Grafana,
+you can install it manually from [Grafana.net](http://grafana.net)
+
+## CHANGELOG
+
+For a detailed list and link to github issues for everything included
+in the 3.0 release please view the
+[CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+file.

package.json

@@ -26,7 +26,6 @@
     "grunt-contrib-cssmin": "~0.14.0",
     "grunt-contrib-htmlmin": "~0.6.0",
     "grunt-contrib-jshint": "~1.0.0",
-    "grunt-contrib-less": "~0.7.0",
     "grunt-contrib-uglify": "~0.11.0",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-filerev": "^0.2.1",

public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html

@@ -54,7 +54,7 @@
 
 	<div ng-if="agg.type === 'terms'">
 		<div class="gf-form offset-width-7">
-			<label class="gf-form-label">Order</label>
+			<label class="gf-form-label width-10">Order</label>
 			<metric-segment-model property="agg.settings.order" options="orderOptions" on-change="onChangeInternal()" css-class="width-12"></metric-segment-model>
 		</div>
 

public/app/plugins/datasource/influxdb/influx_query.ts

@@ -152,7 +152,7 @@ export default class InfluxQuery {
       if (interpolate) {
         value = this.templateSrv.replace(value, this.scopedVars);
       }
-      if (isNaN(+value)) {
+      if (operator !== '>' && operator !== '<') {
         value = "'" + value.replace('\\', '\\\\') + "'";
       }
     } else if (interpolate){

public/app/plugins/datasource/influxdb/specs/influx_query_specs.ts

@@ -101,6 +101,19 @@ describe('InfluxQuery', function() {
     });
   });
 
+  describe('query with value condition', function() {
+    it('should not quote value', function() {
+      var query = new InfluxQuery({
+        measurement: 'cpu',
+        groupBy: [],
+        tags: [{key: 'value', value: '5', operator: '>'}]
+      }, templateSrv, {});
+
+      var queryText = query.render();
+      expect(queryText).to.be('SELECT mean("value") FROM "cpu" WHERE "value" > 5 AND $timeFilter');
+    });
+  });
+
   describe('series with groupByTag', function() {
     it('should generate correct query', function() {
       var query = new InfluxQuery({

public/app/plugins/datasource/opentsdb/partials/query.editor.html

@@ -81,6 +81,7 @@
 
 		<gf-form-switch class="gf-form"
 										label="Disable downsampling"
+                    label-class="query-keyword"
 										checked="ctrl.target.disableDownsampling"
 										on-change="ctrl.targetBlur()">
 		</gf-form-switch>
@@ -125,7 +126,7 @@
 			</div>
 
 			<div class="gf-form">
-				<label class="gf-form-label">Type</label>
+				<label class="gf-form-label query-keyword">Type</label>
 				<div class="gf-form-select-wrapper">
 					<select ng-model="ctrl.target.currentFilterType" class="gf-form-input" ng-options="filType for filType in ctrl.filterTypes">
 					</select>
@@ -137,7 +138,11 @@
 				</input>
 			</div>
 
-			<gf-form-switch class="gf-form" label="Group by" checked="ctrl.target.currentFilterGroupBy" on-change="ctrl.targetBlur()">
+      <gf-form-switch class="gf-form"
+                    label="Group by" 
+                    label-class="query-keyword"
+                    checked="ctrl.target.currentFilterGroupBy"
+                    on-change="ctrl.targetBlur()">
 			</gf-form-switch>
 
 			<div class="gf-form" ng-show="ctrl.addFilterMode">
@@ -146,7 +151,6 @@
 						<i class="fa fa-warning"></i>
 					</a>
 				</label>
-
 				<label class="gf-form-label">
 					<a ng-click="ctrl.addFilter()" ng-hide="ctrl.errors.filters">add filter</a>
 					<a ng-click="ctrl.closeAddFilterMode()">
@@ -223,12 +227,12 @@
 		</gf-form-switch>
 
 		<gf-form-switch ng-hide="!ctrl.target.shouldComputeRate"
-										class="gf-form" label="Counter" checked="ctrl.target.isCounter" on-change="ctrl.targetBlur()">
+										class="gf-form" label="Counter" label-class="query-keyword" checked="ctrl.target.isCounter" on-change="ctrl.targetBlur()">
 		</gf-form-switch>
 
 
 		<div class="gf-form" ng-hide="!ctrl.target.isCounter || !ctrl.target.shouldComputeRate">
-			<label class="gf-form-label">Counter Max</label>
+			<label class="gf-form-label query-keyword">Counter Max</label>
 			<input type="text" class="gf-form-input"
 					 	 ng-disabled="!ctrl.target.shouldComputeRate"
 						 ng-model="ctrl.target.counterMax" spellcheck='false'
@@ -236,7 +240,7 @@
 						 ng-blur="ctrl.targetBlur()">
 			</input>
 
-			<label class="gf-form-label">Reset Value</label>
+			<label class="gf-form-label query-keyword">Reset Value</label>
 			<input type="text" class="tight-form-input input-small"
 					   ng-disabled="!ctrl.target.shouldComputeRate"
 						 ng-model="ctrl.target.counterResetValue" spellcheck='false'

public/app/plugins/panel/table/renderer.ts

@@ -36,7 +36,7 @@ export class TableRenderer {
     return v;
   }
 
-  createColumnFormater(style) {
+  createColumnFormater(style, column) {
     if (!style) {
       return this.defaultCellFormater;
     }
@@ -53,7 +53,7 @@ export class TableRenderer {
     }
 
     if (style.type === 'number') {
-      let valueFormater = kbn.valueFormats[style.unit];
+      let valueFormater = kbn.valueFormats[column.unit || style.unit];
 
       return v =>  {
         if (v === null || v === void 0) {
@@ -85,7 +85,7 @@ export class TableRenderer {
       let column = this.table.columns[colIndex];
       var regex = kbn.stringToJsRegex(style.pattern);
       if (column.text.match(regex)) {
-        this.formaters[colIndex] = this.createColumnFormater(style);
+        this.formaters[colIndex] = this.createColumnFormater(style, column);
         return this.formaters[colIndex](value);
       }
     }

public/app/plugins/panel/table/specs/renderer_specs.ts

@@ -11,7 +11,8 @@ describe('when rendering table', () => {
       {text: 'Value'},
       {text: 'Colored'},
       {text: 'Undefined'},
-      {text: 'String'}
+      {text: 'String'},
+      {text: 'United', unit: 'bps'},
     ];
 
     var panel = {
@@ -40,6 +41,12 @@ describe('when rendering table', () => {
         {
           pattern: 'String',
           type: 'string',
+        },
+        {
+          pattern: 'United',
+          type: 'number',
+          unit: 'ms',
+          decimals: 2,
         }
       ]
     };
@@ -51,6 +58,11 @@ describe('when rendering table', () => {
       expect(html).to.be('<td>2014-01-01T06:06:06+00:00</td>');
     });
 
+    it('number column with unit specified should ignore style unit', () => {
+      var html = renderer.renderCell(5, 1230);
+      expect(html).to.be('<td>1.23 kbps</td>');
+    });
+
     it('number column should be formated', () => {
       var html = renderer.renderCell(1, 1230);
       expect(html).to.be('<td>1.230 s</td>');
@@ -62,8 +74,8 @@ describe('when rendering table', () => {
     });
 
     it('colored cell should have style', () => {
-        var html = renderer.renderCell(2, 40);
+      var html = renderer.renderCell(2, 40);
-        expect(html).to.be('<td style="color:green">40.0</td>');
+      expect(html).to.be('<td style="color:green">40.0</td>');
     });
 
     it('colored cell should have style', () => {