Merge branch 'v3.1.x'

torkelo · torkelo · commit da6ac07b1d34 · 2016-08-11T10:29:48.000+02:00
diff --git a/docs/sources/plugins/installation.md b/docs/sources/plugins/installation.md
@@ -9,7 +9,7 @@ page_keywords: grafana, plugins, documentation
 The easiest way to install plugins is by using the CLI tool grafana-cli which is bundled with grafana. Before any modification take place after modifying plugins, grafana-server needs to be restarted.
 
 ### Grafana plugin directory
-On Linux systems the grafana-cli will assume that the grafana plugin directory is `/var/lib/grafana/plugins`. It's possible to override the directory which grafana-cli will operate on by specifying the --path flag. On Windows systems this parameter have to be specified for every call.
+On Linux systems the grafana-cli will assume that the grafana plugin directory is `/var/lib/grafana/plugins`. It's possible to override the directory which grafana-cli will operate on by specifying the --pluginsDir flag. On Windows systems this parameter have to be specified for every call.
 
 ### Grafana-cli commands
 
diff --git a/public/app/core/services/alert_srv.ts b/public/app/core/services/alert_srv.ts
@@ -16,7 +16,7 @@ export class AlertSrv {
 
   init() {
     this.$rootScope.onAppEvent('alert-error', (e, alert) => {
-      this.set(alert[0], alert[1], 'error', 0);
+      this.set(alert[0], alert[1], 'error', 7000);
     }, this.$rootScope);
 
     this.$rootScope.onAppEvent('alert-warning', (e, alert) => {
@@ -27,10 +27,21 @@ export class AlertSrv {
       this.set(alert[0], alert[1], 'success', 3000);
     }, this.$rootScope);
 
+    appEvents.on('alert-error', options => {
+      this.set(options[0], options[1], 'error', 7000);
+    });
+
     appEvents.on('confirm-modal', this.showConfirmModal.bind(this));
   }
 
   set(title, text, severity, timeout) {
+    if (_.isObject(text)) {
+      console.log('alert error', text);
+      if (text.statusText) {
+        text = `HTTP Error (${text.status}) ${text.statusText}`;
+      }
+    }
+
     var newAlert = {
       title: title || '',
       text: text || '',
diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts
@@ -9,6 +9,7 @@ import moment from 'moment';
 import gfunc from './gfunc';
 import {Parser} from './parser';
 import {QueryCtrl} from 'app/plugins/sdk';
+import appEvents from 'app/core/app_events';
 
 export class GraphiteQueryCtrl extends QueryCtrl {
   static templateUrl = 'partials/query.editor.html';
@@ -141,7 +142,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
         }
       }
     }).catch(err => {
-      this.error = err.message || 'Failed to issue metric query';
+      appEvents.emit('alert-error', ['Error', err]);
     });
   }
 
@@ -178,7 +179,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
       altSegments.unshift(this.uiSegmentSrv.newSegment('*'));
       return altSegments;
     }).catch(err => {
-      this.error = err.message || 'Failed to issue metric query';
+      appEvents.emit('alert-error', ['Error', err]);
       return [];
     });
   }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import moment from 'moment';`
`9`	`9`	`import gfunc from './gfunc';`
`10`	`10`	`import {Parser} from './parser';`
`11`	`11`	`import {QueryCtrl} from 'app/plugins/sdk';`
	`12`	`+import appEvents from 'app/core/app_events';`
`12`	`13`
`13`	`14`	`export class GraphiteQueryCtrl extends QueryCtrl {`
`14`	`15`	`static templateUrl = 'partials/query.editor.html';`
`@@ -141,7 +142,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {`
`141`	`142`	`}`
`142`	`143`	`}`
`143`	`144`	`}).catch(err => {`
`144`		`- this.error = err.message \|\| 'Failed to issue metric query';`
	`145`	`+ appEvents.emit('alert-error', ['Error', err]);`
`145`	`146`	`});`
`146`	`147`	`}`
`147`	`148`
`@@ -178,7 +179,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {`
`178`	`179`	`altSegments.unshift(this.uiSegmentSrv.newSegment('*'));`
`179`	`180`	`return altSegments;`
`180`	`181`	`}).catch(err => {`
`181`		`- this.error = err.message \|\| 'Failed to issue metric query';`
	`182`	`+ appEvents.emit('alert-error', ['Error', err]);`
`182`	`183`	`return [];`
`183`	`184`	`});`
`184`	`185`	`}`