-
-## Enabling app plugins
-After installing an app it have to be enabled before it show up as an datasource or panel. You can do that on the app page in the config tab.
-
-## README.md
-
-The readme file in the mounted folder will show up in the overview tab on the app page.
-
-## Module exports
-```javascript
-export {
- ExampleAppConfigCtrl as ConfigCtrl,
- StreamPageCtrl,
- LogsPageCtrl
-};
-```
-The only required export is the ConfigCtrl. Both StreamPageCtrl and LogsPageCtrl are custom pages defined in plugin.json
-
-## Custom pages
-Custom pages are defined in the plugin.json like this.
-```json
-"pages": [
- { "name": "Live stream", "component": "StreamPageCtrl", "role": "Editor"},
- { "name": "Log view", "component": "LogsPageCtrl", "role": "Viewer"}
-]
-```
-The component field have to match one of the components exported in the module.js in the root of the plugin.
-
-## Bundled plugins
-
-When Grafana starts it will scan all directories within an app plugin and load folders containing a plugin.json as an plugin.
diff --git a/docs/sources/plugins/apps.md b/docs/sources/plugins/apps.md
new file mode 100644
index 00000000000..74038a9feb9
--- /dev/null
+++ b/docs/sources/plugins/apps.md
@@ -0,0 +1,24 @@
+---
+page_title: App plugin
+page_description: App plugin for Grafana
+page_keywords: grafana, plugins, documentation
+---
+
+
+# Apps
+
+App plugins is a new kind of grafana plugin that can bundle datasource and panel plugins within one package. It also enable the plugin author to create custom pages within grafana. The custom pages enables the plugin author to include things like documentation, sign up forms or controlling other services using HTTP requests.
+
+Datasource and panel plugins will show up like normal plugins. The app pages will be available in the main menu.
+
+
+
+
+
+`;
+
+export class SwitchCtrl {
+ onChange: any;
+ checked: any;
+ show: any;
+ id: any;
+
+ /** @ngInject */
+ constructor($scope, private $timeout) {
+ this.show = true;
+ this.id = $scope.$id;
+ }
+
+ internalOnChange() {
+ return new Promise(resolve => {
+ this.$timeout(() => {
+ this.onChange();
+ resolve();
+ });
+ });
+ }
+
+}
+
+export function switchDirective() {
+ return {
+ restrict: 'E',
+ controller: SwitchCtrl,
+ controllerAs: 'ctrl',
+ bindToController: true,
+ scope: {
+ checked: "=",
+ label: "@",
+ labelClass: "@",
+ tooltip: "@",
+ switchClass: "@",
+ onChange: "&",
+ },
+ template: template,
+ link: (scope, elem) => {
+ if (scope.ctrl.tooltip) {
+ var drop = new Drop({
+ target: elem[0],
+ content: scope.ctrl.tooltip,
+ position: "right middle",
+ classes: 'drop-help',
+ openOn: 'hover',
+ hoverOpenDelay: 400,
+ });
+
+ scope.$on('$destroy', function() {
+ drop.destroy();
+ });
+ }
+ }
+ };
+}
+
+coreModule.directive('gfFormSwitch', switchDirective);
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index 5b220d6a1a4..abebb5ce560 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -31,6 +31,8 @@ import {arrayJoin} from './directives/array_join';
import {liveSrv} from './live/live_srv';
import {Emitter} from './utils/emitter';
import {layoutSelector} from './components/layout_selector/layout_selector';
+import {switchDirective} from './components/switch';
+import {dashboardSelector} from './components/dashboard_selector';
import 'app/core/controllers/all';
import 'app/core/services/all';
import 'app/core/routes/routes';
@@ -49,7 +51,9 @@ export {
colorPicker,
liveSrv,
layoutSelector,
+ switchDirective,
infoPopover,
Emitter,
appEvents,
+ dashboardSelector,
};
diff --git a/public/app/core/directives/dropdown_typeahead.js b/public/app/core/directives/dropdown_typeahead.js
index ae825c31fca..2dc5111874e 100644
--- a/public/app/core/directives/dropdown_typeahead.js
+++ b/public/app/core/directives/dropdown_typeahead.js
@@ -119,4 +119,118 @@ function (_, $, coreModule) {
}
};
});
+
+ coreModule.default.directive('dropdownTypeahead2', function($compile) {
+
+ var inputTemplate = '';
+
+ var buttonTemplate = '';
+
+ return {
+ scope: {
+ menuItems: "=dropdownTypeahead2",
+ dropdownTypeaheadOnSelect: "&dropdownTypeaheadOnSelect",
+ model: '=ngModel'
+ },
+ link: function($scope, elem, attrs) {
+ var $input = $(inputTemplate);
+ var $button = $(buttonTemplate);
+ $input.appendTo(elem);
+ $button.appendTo(elem);
+
+ if (attrs.linkText) {
+ $button.html(attrs.linkText);
+ }
+
+ if (attrs.ngModel) {
+ $scope.$watch('model', function(newValue) {
+ _.each($scope.menuItems, function(item) {
+ _.each(item.submenu, function(subItem) {
+ if (subItem.value === newValue) {
+ $button.html(subItem.text);
+ }
+ });
+ });
+ });
+ }
+
+ var typeaheadValues = _.reduce($scope.menuItems, function(memo, value, index) {
+ if (!value.submenu) {
+ value.click = 'menuItemSelected(' + index + ')';
+ memo.push(value.text);
+ } else {
+ _.each(value.submenu, function(item, subIndex) {
+ item.click = 'menuItemSelected(' + index + ',' + subIndex + ')';
+ memo.push(value.text + ' ' + item.text);
+ });
+ }
+ return memo;
+ }, []);
+
+ $scope.menuItemSelected = function(index, subIndex) {
+ var menuItem = $scope.menuItems[index];
+ var payload = {$item: menuItem};
+ if (menuItem.submenu && subIndex !== void 0) {
+ payload.$subItem = menuItem.submenu[subIndex];
+ }
+ $scope.dropdownTypeaheadOnSelect(payload);
+ };
+
+ $input.attr('data-provide', 'typeahead');
+ $input.typeahead({
+ source: typeaheadValues,
+ minLength: 1,
+ items: 10,
+ updater: function (value) {
+ var result = {};
+ _.each($scope.menuItems, function(menuItem) {
+ _.each(menuItem.submenu, function(submenuItem) {
+ if (value === (menuItem.text + ' ' + submenuItem.text)) {
+ result.$subItem = submenuItem;
+ result.$item = menuItem;
+ }
+ });
+ });
+
+ if (result.$item) {
+ $scope.$apply(function() {
+ $scope.dropdownTypeaheadOnSelect(result);
+ });
+ }
+
+ $input.trigger('blur');
+ return '';
+ }
+ });
+
+ $button.click(function() {
+ $button.hide();
+ $input.show();
+ $input.focus();
+ });
+
+ $input.keyup(function() {
+ elem.toggleClass('open', $input.val() === '');
+ });
+
+ $input.blur(function() {
+ $input.hide();
+ $input.val('');
+ $button.show();
+ $button.focus();
+ // clicking the function dropdown menu wont
+ // work if you remove class at once
+ setTimeout(function() {
+ elem.removeClass('open');
+ }, 200);
+ });
+
+ $compile(elem.contents())($scope);
+ }
+ };
+ });
});
diff --git a/public/app/core/directives/plugin_component.ts b/public/app/core/directives/plugin_component.ts
index 4f87a94573e..3e6383cc5c6 100644
--- a/public/app/core/directives/plugin_component.ts
+++ b/public/app/core/directives/plugin_component.ts
@@ -169,7 +169,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $
return System.import(model.module).then(function(appModule) {
return {
baseUrl: model.baseUrl,
- name: 'app-config-' + model.pluginId,
+ name: 'app-config-' + model.id,
bindings: {appModel: "=", appEditCtrl: "="},
attrs: {"app-model": "ctrl.model", "app-edit-ctrl": "ctrl"},
Component: appModule.ConfigCtrl,
diff --git a/public/app/core/routes/dashboard_loaders.js b/public/app/core/routes/dashboard_loaders.js
index 8e2157ad84b..61cdf32c128 100644
--- a/public/app/core/routes/dashboard_loaders.js
+++ b/public/app/core/routes/dashboard_loaders.js
@@ -4,13 +4,17 @@ define([
function (coreModule) {
"use strict";
- coreModule.default.controller('LoadDashboardCtrl', function($scope, $routeParams, dashboardLoaderSrv, backendSrv) {
+ coreModule.default.controller('LoadDashboardCtrl', function($scope, $routeParams, dashboardLoaderSrv, backendSrv, $location) {
if (!$routeParams.slug) {
- backendSrv.get('/api/dashboards/home').then(function(result) {
- var meta = result.meta;
- meta.canSave = meta.canShare = meta.canStar = false;
- $scope.initDashboard(result, $scope);
+ backendSrv.get('/api/dashboards/home').then(function(homeDash) {
+ if (homeDash.redirectUri) {
+ $location.path('dashboard/' + homeDash.redirectUri);
+ } else {
+ var meta = homeDash.meta;
+ meta.canSave = meta.canShare = meta.canStar = false;
+ $scope.initDashboard(homeDash, $scope);
+ }
});
return;
}
diff --git a/public/app/core/routes/routes.ts b/public/app/core/routes/routes.ts
index 92cf32448a1..1608a772e87 100644
--- a/public/app/core/routes/routes.ts
+++ b/public/app/core/routes/routes.ts
@@ -88,16 +88,20 @@ function setupAngularRoutes($routeProvider, $locationProvider) {
resolve: loadOrgBundle,
})
.when('/profile', {
- templateUrl: 'public/app/features/profile/partials/profile.html',
+ templateUrl: 'public/app/features/org/partials/profile.html',
controller : 'ProfileCtrl',
+ controllerAs: 'ctrl',
+ resolve: loadOrgBundle,
})
.when('/profile/password', {
- templateUrl: 'public/app/features/profile/partials/password.html',
+ templateUrl: 'public/app/features/org/partials/change_password.html',
controller : 'ChangePasswordCtrl',
+ resolve: loadOrgBundle,
})
.when('/profile/select-org', {
- templateUrl: 'public/app/features/profile/partials/select_org.html',
+ templateUrl: 'public/app/features/org/partials/select_org.html',
controller : 'SelectOrgCtrl',
+ resolve: loadOrgBundle,
})
// ADMIN
.when('/admin', {
diff --git a/public/app/core/services/context_srv.js b/public/app/core/services/context_srv.js
deleted file mode 100644
index b4a133afea3..00000000000
--- a/public/app/core/services/context_srv.js
+++ /dev/null
@@ -1,47 +0,0 @@
-define([
- 'angular',
- 'lodash',
- '../core_module',
- 'app/core/store',
- 'app/core/config',
-],
-function (angular, _, coreModule, store, config) {
- 'use strict';
-
- coreModule.default.service('contextSrv', function() {
-
- function User() {
- if (config.bootData.user) {
- _.extend(this, config.bootData.user);
- }
- }
-
- this.hasRole = function(role) {
- return this.user.orgRole === role;
- };
-
- this.setPinnedState = function(val) {
- this.pinned = val;
- store.set('grafana.sidemenu.pinned', val);
- };
-
- this.toggleSideMenu = function() {
- this.sidemenu = !this.sidemenu;
- if (!this.sidemenu) {
- this.setPinnedState(false);
- }
- };
-
- this.pinned = store.getBool('grafana.sidemenu.pinned', false);
- if (this.pinned) {
- this.sidemenu = true;
- }
-
- this.version = config.buildInfo.version;
- this.lightTheme = false;
- this.user = new User();
- this.isSignedIn = this.user.isSignedIn;
- this.isGrafanaAdmin = this.user.isGrafanaAdmin;
- this.isEditor = this.hasRole('Editor') || this.hasRole('Admin');
- });
-});
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
new file mode 100644
index 00000000000..ad670f68a32
--- /dev/null
+++ b/public/app/core/services/context_srv.ts
@@ -0,0 +1,73 @@
+///
-
+
diff --git a/public/app/features/dashboard/partials/shareModal.html b/public/app/features/dashboard/partials/shareModal.html
index 41c08fede0b..c8462c7bffc 100644
--- a/public/app/features/dashboard/partials/shareModal.html
+++ b/public/app/features/dashboard/partials/shareModal.html
@@ -38,31 +38,26 @@
-
+
Details
-
+
@@ -33,25 +34,35 @@
-
-
+
On/Off Toggles
-
-
+
-
-
-
-
-
-
-
-
+
+
Toggles
+
+
+
+
+
+
+
+
+
@@ -62,19 +73,19 @@
Title
-
+
-
-
-
+
-
+
-
-
@@ -117,7 +113,7 @@
-
-
-
@@ -20,14 +20,19 @@
Amount
+ ng-change="ctrl.refresh()" ng-model-onblur>
-
-
-
-
-
diff --git a/public/app/features/plugins/import_list/import_list.ts b/public/app/features/plugins/import_list/import_list.ts
index 607cf8cc5ec..738a74d8ae0 100644
--- a/public/app/features/plugins/import_list/import_list.ts
+++ b/public/app/features/plugins/import_list/import_list.ts
@@ -10,6 +10,7 @@ export class DashImportListCtrl {
plugin: any;
datasource: any;
+ /** @ngInject */
constructor($scope, private $http, private backendSrv, private $rootScope) {
this.dashboards = [];
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 1866fad50a0..9ff82027abf 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -27,58 +27,59 @@
-
+
+
-
+
+
+
+
+
+
+
-
+
+
diff --git a/public/app/features/plugins/partials/ds_http_settings.html b/public/app/features/plugins/partials/ds_http_settings.html
index 65c205714bc..404918f90d4 100644
--- a/public/app/features/plugins/partials/ds_http_settings.html
+++ b/public/app/features/plugins/partials/ds_http_settings.html
@@ -5,16 +5,16 @@
Url
-
+
-
@@ -29,12 +29,18 @@
- Specify a complete HTTP url (http://your_server:8080)
+Specify a complete HTTP url (for example http://your_server:8080)
- Your access method isDirect, this means the url
+ Your access method is Direct, this means the url
needs to be accessable from the browser.
- Your access method is currently Proxy, this means the url
+ Your access method is currently Proxy, this means the url
needs to be accessable from the grafana backend.
-
- Http Auth
-
- Tip for with credentials
+
+
+
+
+
+
+
+
diff --git a/public/app/features/plugins/partials/plugin_edit.html b/public/app/features/plugins/partials/plugin_edit.html
index 6cb0ae5bf78..d5f69df2366 100644
--- a/public/app/features/plugins/partials/plugin_edit.html
+++ b/public/app/features/plugins/partials/plugin_edit.html
@@ -4,8 +4,8 @@
-
- 
+
+ ![]()
diff --git a/public/app/features/profile/profileCtrl.js b/public/app/features/profile/profileCtrl.js
deleted file mode 100644
index bae85a3d0c4..00000000000
--- a/public/app/features/profile/profileCtrl.js
+++ /dev/null
@@ -1,51 +0,0 @@
-define([
- 'angular',
- 'app/core/config',
-],
-function (angular, config) {
- 'use strict';
-
- var module = angular.module('grafana.controllers');
-
- module.controller('ProfileCtrl', function($scope, backendSrv, contextSrv, $location) {
-
- $scope.init = function() {
- $scope.getUser();
- $scope.getUserOrgs();
- };
-
- $scope.getUser = function() {
- backendSrv.get('/api/user').then(function(user) {
- $scope.user = user;
- $scope.user.theme = user.theme || 'dark';
- $scope.old_theme = $scope.user.theme;
- });
- };
-
- $scope.getUserOrgs = function() {
- backendSrv.get('/api/user/orgs').then(function(orgs) {
- $scope.orgs = orgs;
- });
- };
-
- $scope.setUsingOrg = function(org) {
- backendSrv.post('/api/user/using/' + org.orgId).then(function() {
- window.location.href = config.appSubUrl + '/profile';
- });
- };
-
- $scope.update = function() {
- if (!$scope.userForm.$valid) { return; }
-
- backendSrv.put('/api/user/', $scope.user).then(function() {
- contextSrv.user.name = $scope.user.name || $scope.user.login;
- if ($scope.old_theme !== $scope.user.theme) {
- window.location.href = config.appSubUrl + $location.path();
- }
- });
- };
-
- $scope.init();
-
- });
-});
diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js
index b2916e1bcc7..291915ee99f 100644
--- a/public/app/features/templating/editorCtrl.js
+++ b/public/app/features/templating/editorCtrl.js
@@ -14,6 +14,7 @@ function (angular, _) {
datasource: null,
refresh: 0,
name: '',
+ hide: 0,
options: [],
includeAll: false,
multi: false,
@@ -25,6 +26,12 @@ function (angular, _) {
{value: 2, text: "On Time Range Change"},
];
+ $scope.hideOptions = [
+ {value: 0, text: ""},
+ {value: 1, text: "Label"},
+ {value: 2, text: "Variable"},
+ ];
+
$scope.init = function() {
$scope.mode = 'list';
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 7bd1fd0940f..d1cab90ac9d 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -74,32 +74,33 @@
Variable
-
+
Name
-
+
Type
-
-
+
-
+
+
-
Data source
-
-
+
+
-
+
@@ -176,17 +177,22 @@
Label
-
+
Hide
-
+
+
+
+
+
+
+
Selection Options
-
- Multi-value
- Enables multiple values to be selected at the same time
-
-
- Include All option
-
+
Custom all value
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
index ce26a35be9b..4cd33e3db29 100644
--- a/public/app/features/templating/templateValuesSrv.js
+++ b/public/app/features/templating/templateValuesSrv.js
@@ -272,7 +272,9 @@ function (angular, _, kbn) {
}
for (i = 0; i < metricNames.length; i++) {
- var value = metricNames[i].text;
+ var item = metricNames[i];
+ var value = item.value || item.text;
+ var text = item.text || item.value;
if (regex) {
matches = regex.exec(value);
@@ -282,12 +284,11 @@ function (angular, _, kbn) {
}
}
- options[value] = value;
+ options[value] = {text: text, value: value};
}
return _.map(_.keys(options).sort(), function(key) {
- var option = { text: key, value: key };
- return option;
+ return options[key];
});
};
diff --git a/public/app/headers/common.d.ts b/public/app/headers/common.d.ts
index 67c8604685f..654cdb8288d 100644
--- a/public/app/headers/common.d.ts
+++ b/public/app/headers/common.d.ts
@@ -1,5 +1,4 @@
-///
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-interface Thenable {
- then(onFulfilled?: (value: R) => U | Thenable, onRejected?: (error: any) => U | Thenable): Thenable;
- then(onFulfilled?: (value: R) => U | Thenable, onRejected?: (error: any) => void): Thenable;
-}
-
-declare class Promise implements Thenable {
- /**
- * If you call resolve in the body of the callback passed to the constructor,
- * your promise is fulfilled with result object passed to resolve.
- * If you call reject your promise is rejected with the object passed to resolve.
- * For consistency and debugging (eg stack traces), obj should be an instanceof Error.
- * Any errors thrown in the constructor callback will be implicitly passed to reject().
- */
- constructor(callback: (resolve : (value?: R | Thenable) => void, reject: (error?: any) => void) => void);
-
- /**
- * onFulfilled is called when/if "promise" resolves. onRejected is called when/if "promise" rejects.
- * Both are optional, if either/both are omitted the next onFulfilled/onRejected in the chain is called.
- * Both callbacks have a single parameter , the fulfillment value or rejection reason.
- * "then" returns a new promise equivalent to the value you return from onFulfilled/onRejected after being passed through Promise.resolve.
- * If an error is thrown in the callback, the returned promise rejects with that error.
- *
- * @param onFulfilled called when/if "promise" resolves
- * @param onRejected called when/if "promise" rejects
- */
- then(onFulfilled?: (value: R) => U | Thenable, onRejected?: (error: any) => U | Thenable): Promise;
- then(onFulfilled?: (value: R) => U | Thenable, onRejected?: (error: any) => void): Promise;
-
- /**
- * Sugar for promise.then(undefined, onRejected)
- *
- * @param onRejected called when/if "promise" rejects
- */
- catch(onRejected?: (error: any) => U | Thenable): Promise;
-}
-
-declare module Promise {
- /**
- * Make a new promise from the thenable.
- * A thenable is promise-like in as far as it has a "then" method.
- */
- function resolve(value?: R | Thenable): Promise;
-
- /**
- * Make a promise that rejects to obj. For consistency and debugging (eg stack traces), obj should be an instanceof Error
- */
- function reject(error: any): Promise;
-
- /**
- * Make a promise that fulfills when every item in the array fulfills, and rejects if (and when) any item rejects.
- * the array passed to all can be a mixture of promise-like objects and other objects.
- * The fulfillment value is an array (in order) of fulfillment values. The rejection value is the first rejection value.
- */
- function all(promises: (R | Thenable)[]): Promise;
-
- /**
- * Make a Promise that fulfills when any item fulfills, and rejects if any item rejects.
- */
- function race(promises: (R | Thenable)[]): Promise;
-}
-
-declare module 'es6-promise' {
- var foo: typeof Promise; // Temp variable to reference Promise in local context
- module rsvp {
- export var Promise: typeof foo;
- }
- export = rsvp;
-}
diff --git a/public/app/headers/es6-shim/es6-shim.d.ts b/public/app/headers/es6-shim/es6-shim.d.ts
index 41f22997af5..265c19e08f9 100644
--- a/public/app/headers/es6-shim/es6-shim.d.ts
+++ b/public/app/headers/es6-shim/es6-shim.d.ts
@@ -1,7 +1,9 @@
+// Generated by typings
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/es6-shim/es6-shim.d.ts
// Type definitions for es6-shim v0.31.2
// Project: https://github.com/paulmillr/es6-shim
// Definitions by: Ron Buckton
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
declare type PropertyKey = string | number | symbol;
@@ -621,7 +623,7 @@ interface WeakSetConstructor {
declare var WeakSet: WeakSetConstructor;
-declare module Reflect {
+declare namespace Reflect {
function apply(target: Function, thisArgument: any, argumentsList: ArrayLike): any;
function construct(target: Function, argumentsList: ArrayLike): any;
function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
@@ -649,7 +651,7 @@ declare module "es6-shim" {
var WeakMap: WeakMapConstructor;
var WeakSet: WeakSetConstructor;
var Promise: PromiseConstructor;
- module Reflect {
+ namespace Reflect {
function apply(target: Function, thisArgument: any, argumentsList: ArrayLike): any;
function construct(target: Function, argumentsList: ArrayLike): any;
function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
diff --git a/public/app/plugins/datasource/cloudwatch/README.md b/public/app/plugins/datasource/cloudwatch/README.md
new file mode 100644
index 00000000000..a1b7bf5cc50
--- /dev/null
+++ b/public/app/plugins/datasource/cloudwatch/README.md
@@ -0,0 +1,7 @@
+# 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
diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
index c03e5085cc2..86e085b3f6f 100644
--- a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
@@ -21,6 +21,7 @@ describe('CloudWatchDatasource', function() {
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.ds = $injector.instantiate(CloudWatchDatasource, {instanceSettings: instanceSettings});
+ $httpBackend.when('GET', /\.html$/).respond('');
}));
describe('When performing CloudWatch query', function() {
diff --git a/public/app/plugins/datasource/elasticsearch/README.md b/public/app/plugins/datasource/elasticsearch/README.md
new file mode 100644
index 00000000000..21978025eeb
--- /dev/null
+++ b/public/app/plugins/datasource/elasticsearch/README.md
@@ -0,0 +1,7 @@
+# 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
diff --git a/public/app/plugins/datasource/elasticsearch/bucket_agg.js b/public/app/plugins/datasource/elasticsearch/bucket_agg.js
index 47d88a6ea3c..18e2f3cf3b1 100644
--- a/public/app/plugins/datasource/elasticsearch/bucket_agg.js
+++ b/public/app/plugins/datasource/elasticsearch/bucket_agg.js
@@ -77,7 +77,7 @@ function (angular, _, queryDef) {
switch($scope.agg.type) {
case 'terms': {
settings.order = settings.order || "asc";
- settings.size = settings.size || "0";
+ settings.size = settings.size || "10";
settings.orderBy = settings.orderBy || "_term";
if (settings.size !== '0') {
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index b048c206edb..c7c2351d0cc 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -74,6 +74,10 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
to: options.range.to.valueOf(),
};
+ if (this.esVersion >= 2) {
+ range[timeField]["format"] = "epoch_millis";
+ }
+
var queryInterpolated = templateSrv.replace(queryString);
var filter = { "bool": { "must": [{ "range": range }] } };
var query = { "bool": { "should": [{ "query_string": { "query": queryInterpolated } }] } };
diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
index bc1da316810..4d630ff9c40 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
@@ -12,11 +12,13 @@ describe('ElasticDatasource', function() {
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(ctx.providePhase(['templateSrv', 'backendSrv']));
+
beforeEach(angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) {
ctx.$q = $q;
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.$injector = $injector;
+ $httpBackend.when('GET', /\.html$/).respond('');
}));
function createDatasource(instanceSettings) {
diff --git a/public/app/plugins/datasource/grafana/README.md b/public/app/plugins/datasource/grafana/README.md
new file mode 100644
index 00000000000..a8319c8dec5
--- /dev/null
+++ b/public/app/plugins/datasource/grafana/README.md
@@ -0,0 +1,3 @@
+# 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.
diff --git a/public/app/plugins/datasource/graphite/README.md b/public/app/plugins/datasource/graphite/README.md
new file mode 100644
index 00000000000..c27c5789bca
--- /dev/null
+++ b/public/app/plugins/datasource/graphite/README.md
@@ -0,0 +1,9 @@
+# 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
diff --git a/public/app/plugins/datasource/graphite/specs/datasource_specs.ts b/public/app/plugins/datasource/graphite/specs/datasource_specs.ts
index 2125922b350..237c37cfcc7 100644
--- a/public/app/plugins/datasource/graphite/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/graphite/specs/datasource_specs.ts
@@ -15,6 +15,7 @@ describe('graphiteDatasource', function() {
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.$injector = $injector;
+ $httpBackend.when('GET', /\.html$/).respond('');
}));
beforeEach(function() {
diff --git a/public/app/plugins/datasource/influxdb/README.md b/public/app/plugins/datasource/influxdb/README.md
new file mode 100644
index 00000000000..45eaa51eb0f
--- /dev/null
+++ b/public/app/plugins/datasource/influxdb/README.md
@@ -0,0 +1,13 @@
+# 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
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index daa6ada3420..4037e963bcb 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -55,7 +55,7 @@ export default class InfluxDatasource {
query = query.replace(/\$interval/g, (target.interval || options.interval));
return query;
- }).join("\n");
+ }).join(";");
// replace grafana variables
allQueries = allQueries.replace(/\$timeFilter/g, timeFilter);
@@ -107,7 +107,7 @@ export default class InfluxDatasource {
var timeFilter = this.getTimeFilter({rangeRaw: options.rangeRaw});
var query = options.annotation.query.replace('$timeFilter', timeFilter);
- query = this.templateSrv.replace(query);
+ query = this.templateSrv.replace(query, null, 'regex');
return this._seriesQuery(query).then(data => {
if (!data || !data.results || !data.results[0]) {
@@ -133,6 +133,17 @@ export default class InfluxDatasource {
return this._influxRequest('GET', '/query', {q: query, epoch: 'ms'});
}
+
+ serializeParams(params) {
+ if (!params) { return '';}
+
+ return _.reduce(params, (memo, value, key) => {
+ if (value === null || value === undefined) { return memo; }
+ memo.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
+ return memo;
+ }, []).join("&");
+ }
+
testDatasource() {
return this.metricFindQuery('SHOW MEASUREMENTS LIMIT 1').then(() => {
return { status: "success", message: "Data source is working", title: "Success" };
@@ -166,6 +177,7 @@ export default class InfluxDatasource {
data: data,
precision: "ms",
inspect: { type: 'influxdb' },
+ paramSerializer: this.serializeParams,
};
options.headers = options.headers || {};
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
index d59bbbbccd5..041e3c8a882 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -193,7 +193,7 @@ export class InfluxQueryCtrl extends QueryCtrl {
if (addTemplateVars) {
for (let variable of this.templateSrv.variables) {
- segments.unshift(this.uiSegmentSrv.newSegment({ type: 'template', value: '/$' + variable.name + '$/', expandable: true }));
+ segments.unshift(this.uiSegmentSrv.newSegment({ type: 'template', value: '/^$' + variable.name + '$/', expandable: true }));
}
}
diff --git a/public/app/plugins/datasource/influxdb/response_parser.ts b/public/app/plugins/datasource/influxdb/response_parser.ts
index ae6f2cb75a9..2e33b398a88 100644
--- a/public/app/plugins/datasource/influxdb/response_parser.ts
+++ b/public/app/plugins/datasource/influxdb/response_parser.ts
@@ -15,7 +15,7 @@ export default class ResponseParser {
var series = influxResults.series[0];
return _.map(series.values, (value) => {
if (_.isArray(value)) {
- if (query.indexOf('SHOW TAG VALUES') >= 0) {
+ if (query.toLowerCase().indexOf('show tag values') >= 0) {
return { text: (value[1] || value[0]) };
} else {
return { text: value[0] };
diff --git a/public/app/plugins/datasource/mixed/README.md b/public/app/plugins/datasource/mixed/README.md
new file mode 100644
index 00000000000..b69bb626c15
--- /dev/null
+++ b/public/app/plugins/datasource/mixed/README.md
@@ -0,0 +1,3 @@
+# 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
diff --git a/public/app/plugins/datasource/opentsdb/README.md b/public/app/plugins/datasource/opentsdb/README.md
new file mode 100644
index 00000000000..697ecd5c4dc
--- /dev/null
+++ b/public/app/plugins/datasource/opentsdb/README.md
@@ -0,0 +1,7 @@
+# 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
diff --git a/public/app/plugins/datasource/opentsdb/config_ctrl.ts b/public/app/plugins/datasource/opentsdb/config_ctrl.ts
index e4d69c40b4d..c7c90e9c17f 100644
--- a/public/app/plugins/datasource/opentsdb/config_ctrl.ts
+++ b/public/app/plugins/datasource/opentsdb/config_ctrl.ts
@@ -16,7 +16,7 @@ export class OpenTsConfigCtrl {
tsdbVersions = [
{name: '<=2.1', value: 1},
- {name: '2.2', value: 2},
+ {name: '>=2.2', value: 2},
];
tsdbResolutions = [
diff --git a/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts b/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
index 1da4268e433..a1dc9baada9 100644
--- a/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
+++ b/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
@@ -12,9 +12,10 @@ describe('opentsdb', function() {
beforeEach(angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) {
ctx.$q = $q;
- ctx.$httpBackend = $httpBackend;
+ ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.ds = $injector.instantiate(OpenTsDatasource, {instanceSettings: instanceSettings});
+ $httpBackend.when('GET', /\.html$/).respond('');
}));
describe('When performing metricFindQuery', function() {
diff --git a/public/app/plugins/datasource/prometheus/README.md b/public/app/plugins/datasource/prometheus/README.md
new file mode 100644
index 00000000000..5b188c3393c
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/README.md
@@ -0,0 +1,7 @@
+# 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/)
diff --git a/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts b/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
index 1958c6be4cf..5457fc0e16d 100644
--- a/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
@@ -14,6 +14,7 @@ describe('PrometheusDatasource', function() {
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.ds = $injector.instantiate(PrometheusDatasource, {instanceSettings: instanceSettings});
+ $httpBackend.when('GET', /\.html$/).respond('');
}));
describe('When querying prometheus with one target using query editor target spec', function() {
diff --git a/public/app/plugins/datasource/prometheus/specs/metric_find_query_specs.ts b/public/app/plugins/datasource/prometheus/specs/metric_find_query_specs.ts
index 5edf7038cd3..d328f4cb25b 100644
--- a/public/app/plugins/datasource/prometheus/specs/metric_find_query_specs.ts
+++ b/public/app/plugins/datasource/prometheus/specs/metric_find_query_specs.ts
@@ -8,6 +8,7 @@ describe('PrometheusMetricFindQuery', function() {
var ctx = new helpers.ServiceTestContext();
var instanceSettings = {url: 'proxied', directUrl: 'direct', user: 'test', password: 'mupp' };
+
beforeEach(angularMocks.module('grafana.core'));
beforeEach(angularMocks.module('grafana.services'));
beforeEach(angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) {
@@ -15,6 +16,7 @@ describe('PrometheusMetricFindQuery', function() {
ctx.$httpBackend = $httpBackend;
ctx.$rootScope = $rootScope;
ctx.ds = $injector.instantiate(PrometheusDatasource, {instanceSettings: instanceSettings});
+ $httpBackend.when('GET', /\.html$/).respond('');
}));
describe('When performing metricFindQuery', function() {
diff --git a/public/app/plugins/panel/dashlist/README.md b/public/app/plugins/panel/dashlist/README.md
new file mode 100644
index 00000000000..55996b5aff4
--- /dev/null
+++ b/public/app/plugins/panel/dashlist/README.md
@@ -0,0 +1,9 @@
+# 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
diff --git a/public/app/plugins/panel/dashlist/module.ts b/public/app/plugins/panel/dashlist/module.ts
index e199e0cfc6e..b619b7ea7d7 100644
--- a/public/app/plugins/panel/dashlist/module.ts
+++ b/public/app/plugins/panel/dashlist/module.ts
@@ -25,7 +25,7 @@ class DashListCtrl extends PanelCtrl {
_.defaults(this.panel, panelDefaults);
if (this.panel.tag) {
- this.panel.tags = [$scope.panel.tag];
+ this.panel.tags = [this.panel.tag];
delete this.panel.tag;
}
diff --git a/public/app/plugins/panel/graph/README.md b/public/app/plugins/panel/graph/README.md
new file mode 100644
index 00000000000..2dc8682f0e3
--- /dev/null
+++ b/public/app/plugins/panel/graph/README.md
@@ -0,0 +1,7 @@
+# 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
diff --git a/public/app/plugins/panel/graph/axisEditor.html b/public/app/plugins/panel/graph/axisEditor.html
deleted file mode 100644
index d9b7b4599e0..00000000000
--- a/public/app/plugins/panel/graph/axisEditor.html
+++ /dev/null
@@ -1,240 +0,0 @@
-
-';
$tooltip.html(body).place_tt(pos.pageX + 20, pos.pageY);
};
@@ -109,7 +108,7 @@ function ($) {
var plot = elem.data().plot;
var plotData = plot.getData();
var seriesList = getSeriesFn();
- var group, value, absoluteTime, relativeTime, hoverInfo, i, series, seriesHtml, tooltipFormat;
+ var group, value, absoluteTime, hoverInfo, i, series, seriesHtml, tooltipFormat;
if (panel.tooltip.msResolution) {
tooltipFormat = 'YYYY-MM-DD HH:mm:ss.SSS';
@@ -132,7 +131,6 @@ function ($) {
seriesHtml = '';
- relativeTime = dashboard.getRelativeTime(seriesHoverInfo.time);
absoluteTime = dashboard.formatDate(seriesHoverInfo.time, tooltipFormat);
for (i = 0; i < seriesHoverInfo.length; i++) {
@@ -142,17 +140,22 @@ function ($) {
continue;
}
+ var highlightClass = '';
+ if (item && i === item.seriesIndex) {
+ highlightClass = 'graph-tooltip-list-item--highlight';
+ }
+
series = seriesList[i];
value = series.formatValue(hoverInfo.value);
- seriesHtml += '
-
-
-
-
-
-
-
- -
-
- - Left Y - -
- - Unit - -
- - -
- - Scale type - -
- - - -
- - Label - -
- - - -
-
- -
-
- - - -
- - Y-Max - -
- - - -
- - Y-Min - -
- - - -
-
- -
-
- - Right Y - -
- - Unit - -
- - -
- - Scale type - -
- - - -
- - Label - -
- - - -
-
-
- -
-
- - - -
- - Y-Max - -
- - - -
- - Y-Min - -
- - - -
-
-
-
- -
-
- - Show Axis - -
- - X-Axis - - - -
- - Y-Axis - - - -
-
- -
-
- - Thresholds - -
- - Level 1 - -
- - - -
-
-
-
- - - Level 2 - -
- - - -
-
-
-
- -
-
-
-
-
diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js
index 0f53852cec0..9e6633b5551 100755
--- a/public/app/plugins/panel/graph/graph.js
+++ b/public/app/plugins/panel/graph/graph.js
@@ -115,7 +115,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
for (var i = 0; i < data.length; i++) {
var series = data[i];
var axis = yaxis[series.yaxis - 1];
- var formater = kbn.valueFormats[panel.y_formats[series.yaxis - 1]];
+ var formater = kbn.valueFormats[panel.yaxes[series.yaxis - 1].format];
// decimal override
if (_.isNumber(panel.decimals)) {
@@ -132,18 +132,18 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
}
// add left axis labels
- if (panel.leftYAxisLabel) {
+ if (panel.yaxes[0].label) {
var yaxisLabel = $("")
- .text(panel.leftYAxisLabel)
+ .text(panel.yaxes[0].label)
.appendTo(elem);
yaxisLabel.css("margin-top", yaxisLabel.width() / 2);
}
// add right axis labels
- if (panel.rightYAxisLabel) {
+ if (panel.yaxes[1].label) {
var rightLabel = $("")
- .text(panel.rightYAxisLabel)
+ .text(panel.yaxes[1].label)
.appendTo(elem);
rightLabel.css("margin-top", rightLabel.width() / 2);
@@ -151,8 +151,10 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
}
function processOffsetHook(plot, gridMargin) {
- if (panel.leftYAxisLabel) { gridMargin.left = 20; }
- if (panel.rightYAxisLabel) { gridMargin.right = 20; }
+ var left = panel.yaxes[0];
+ var right = panel.yaxes[1];
+ if (left.show && left.label) { gridMargin.left = 20; }
+ if (right.show && right.label) { gridMargin.right = 20; }
}
// Function for rendering panel
@@ -217,7 +219,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
for (var i = 0; i < data.length; i++) {
var series = data[i];
- series.data = series.getFlotPairs(series.nullPointMode || panel.nullPointMode, panel.y_formats);
+ series.data = series.getFlotPairs(series.nullPointMode || panel.nullPointMode);
// if hidden remove points and disable stack
if (ctrl.hiddenSeries[series.alias]) {
@@ -279,7 +281,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
var max = _.isUndefined(ctrl.range.to) ? null : ctrl.range.to.valueOf();
options.xaxis = {
- timezone: dashboard.timezone,
+ timezone: dashboard.getTimezone(),
show: panel['x-axis'],
mode: "time",
min: min,
@@ -340,11 +342,11 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
function configureAxisOptions(data, options) {
var defaults = {
position: 'left',
- show: panel['y-axis'],
- min: panel.grid.leftMin,
+ show: panel.yaxes[0].show,
+ min: panel.yaxes[0].min,
index: 1,
- logBase: panel.grid.leftLogBase || 1,
- max: panel.percentage && panel.stack ? 100 : panel.grid.leftMax,
+ logBase: panel.yaxes[0].logBase || 1,
+ max: panel.percentage && panel.stack ? 100 : panel.yaxes[0].max,
};
options.yaxes.push(defaults);
@@ -352,18 +354,19 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
if (_.findWhere(data, {yaxis: 2})) {
var secondY = _.clone(defaults);
secondY.index = 2,
- secondY.logBase = panel.grid.rightLogBase || 1,
+ secondY.show = panel.yaxes[1].show;
+ secondY.logBase = panel.yaxes[1].logBase || 1,
secondY.position = 'right';
- secondY.min = panel.grid.rightMin;
- secondY.max = panel.percentage && panel.stack ? 100 : panel.grid.rightMax;
+ secondY.min = panel.yaxes[1].min;
+ secondY.max = panel.percentage && panel.stack ? 100 : panel.yaxes[1].max;
options.yaxes.push(secondY);
applyLogScale(options.yaxes[1], data);
- configureAxisMode(options.yaxes[1], panel.percentage && panel.stack ? "percent" : panel.y_formats[1]);
+ configureAxisMode(options.yaxes[1], panel.percentage && panel.stack ? "percent" : panel.yaxes[1].format);
}
applyLogScale(options.yaxes[0], data);
- configureAxisMode(options.yaxes[0], panel.percentage && panel.stack ? "percent" : panel.y_formats[0]);
+ configureAxisMode(options.yaxes[0], panel.percentage && panel.stack ? "percent" : panel.yaxes[0].format);
}
function applyLogScale(axis, data) {
@@ -456,7 +459,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
url += panel['x-axis'] ? '' : '&hideAxes=true';
url += panel['y-axis'] ? '' : '&hideYAxis=true';
- switch(panel.y_formats[0]) {
+ switch(panel.yaxes[0].format) {
case 'bytes':
url += '&yUnitSystem=binary';
break;
diff --git a/public/app/plugins/panel/graph/graph_tooltip.js b/public/app/plugins/panel/graph/graph_tooltip.js
index 3e2900be4e9..7f2b83220a8 100644
--- a/public/app/plugins/panel/graph/graph_tooltip.js
+++ b/public/app/plugins/panel/graph/graph_tooltip.js
@@ -33,9 +33,8 @@ function ($) {
return j - 1;
};
- this.showTooltip = function(absoluteTime, relativeTime, innerHtml, pos) {
- var body = '
-
-
-
- -
-
- - Legend - -
-
-
-
- -
-
-
- -
-
-
- - - Side width - -
- - - -
-
-
- -
-
- - Hide series - -
-
-
-
- -
-
-
-
-
- -
-
- - Values - -
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- - - Decimals - -
- - - -
'+ absoluteTime +
- ' (' + relativeTime + ')
';
+ this.showTooltip = function(absoluteTime, innerHtml, pos) {
+ var body = ''+ absoluteTime + '
';
body += innerHtml + '';
+ seriesHtml += '';
plot.highlight(i, hoverInfo.hoverIndex);
}
- self.showTooltip(absoluteTime, relativeTime, seriesHtml, pos);
+ self.showTooltip(absoluteTime, seriesHtml, pos);
}
// single series tooltip
else if (item) {
@@ -169,12 +172,11 @@ function ($) {
value = series.formatValue(value);
- relativeTime = dashboard.getRelativeTime(item.datapoint[0]);
absoluteTime = dashboard.formatDate(item.datapoint[0], tooltipFormat);
group += '
';
seriesHtml += ' ' + series.label + ':
';
seriesHtml += '' + value + '
' + value + '
';
- self.showTooltip(absoluteTime, relativeTime, group, pos);
+ self.showTooltip(absoluteTime, group, pos);
}
// no hit
else {
diff --git a/public/app/plugins/panel/graph/legend.js b/public/app/plugins/panel/graph/legend.js
index 22bbb756b59..5d9e1c24872 100644
--- a/public/app/plugins/panel/graph/legend.js
+++ b/public/app/plugins/panel/graph/legend.js
@@ -157,7 +157,7 @@ function (angular, _, $) {
}
var html = '';
html += '
+ *
* ### Default Transformations
*
* The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and
@@ -10614,26 +10778,35 @@ function $HttpProvider() {
*
* ## Caching
*
- * To enable caching, set the request configuration `cache` property to `true` (to use default
- * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}).
- * When the cache is enabled, `$http` stores the response from the server in the specified
- * cache. The next time the same request is made, the response is served from the cache without
- * sending a request to the server.
+ * {@link ng.$http `$http`} responses are not cached by default. To enable caching, you must
+ * set the config.cache value or the default cache value to TRUE or to a cache object (created
+ * with {@link ng.$cacheFactory `$cacheFactory`}). If defined, the value of config.cache takes
+ * precedence over the default cache value.
*
- * Note that even if the response is served from cache, delivery of the data is asynchronous in
- * the same way that real requests are.
+ * In order to:
+ * * cache all responses - set the default cache value to TRUE or to a cache object
+ * * cache a specific response - set config.cache value to TRUE or to a cache object
*
- * If there are multiple GET requests for the same URL that should be cached using the same
- * cache, but the cache is not populated yet, only one request to the server will be made and
- * the remaining requests will be fulfilled using the response from the first request.
+ * If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
+ * then the default `$cacheFactory($http)` object is used.
*
- * You can change the default cache to a new object (built with
- * {@link ng.$cacheFactory `$cacheFactory`}) by updating the
- * {@link ng.$http#defaults `$http.defaults.cache`} property. All requests who set
- * their `cache` property to `true` will now use this cache object.
+ * The default cache value can be set by updating the
+ * {@link ng.$http#defaults `$http.defaults.cache`} property or the
+ * {@link $httpProvider#defaults `$httpProvider.defaults.cache`} property.
+ *
+ * When caching is enabled, {@link ng.$http `$http`} stores the response from the server using
+ * the relevant cache object. The next time the same request is made, the response is returned
+ * from the cache without sending a request to the server.
+ *
+ * Take note that:
+ *
+ * * Only GET and JSONP requests are cached.
+ * * The cache key is the request URL including search parameters; headers are not considered.
+ * * Cached responses are returned asynchronously, in the same way as responses from the server.
+ * * If multiple identical requests are made using the same cache, which is not yet populated,
+ * one request will be made to the server and remaining requests will return the same response.
+ * * A cache-control header on the response does not affect if or how responses are cached.
*
- * If you set the default cache to `false` then only requests that specify their own custom
- * cache object will be cached.
*
* ## Interceptors
*
@@ -10803,7 +10976,7 @@ function $HttpProvider() {
* transform function or an array of such functions. The transform function takes the http
* response body, headers and status and returns its transformed (typically deserialized) version.
* See {@link ng.$http#overriding-the-default-transformations-per-request
- * Overriding the Default TransformationjqLiks}
+ * Overriding the Default Transformations}
* - **paramSerializer** - `{string|function(Object):string}` - A function used to
* prepare the string representation of request parameters (specified as an object).
* If specified as string, it is interpreted as function registered with the
@@ -10811,10 +10984,9 @@ function $HttpProvider() {
* by registering it as a {@link auto.$provide#service service}.
* The default serializer is the {@link $httpParamSerializer $httpParamSerializer};
* alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike}
- * - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
- * GET request, otherwise if a cache instance built with
- * {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
- * caching.
+ * - **cache** – `{boolean|Object}` – A boolean value or object created with
+ * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of the HTTP response.
+ * See {@link $http#caching $http Caching} for more information.
* - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
* that should abort the request when resolved.
* - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
@@ -13725,8 +13897,10 @@ AST.prototype = {
primary = this.arrayDeclaration();
} else if (this.expect('{')) {
primary = this.object();
- } else if (this.constants.hasOwnProperty(this.peek().text)) {
- primary = copy(this.constants[this.consume().text]);
+ } else if (this.selfReferential.hasOwnProperty(this.peek().text)) {
+ primary = copy(this.selfReferential[this.consume().text]);
+ } else if (this.options.literals.hasOwnProperty(this.peek().text)) {
+ primary = { type: AST.Literal, value: this.options.literals[this.consume().text]};
} else if (this.peek().identifier) {
primary = this.identifier();
} else if (this.peek().constant) {
@@ -13878,15 +14052,7 @@ AST.prototype = {
return false;
},
-
- /* `undefined` is not a constant, it is an identifier,
- * but using it as an identifier is not supported
- */
- constants: {
- 'true': { type: AST.Literal, value: true },
- 'false': { type: AST.Literal, value: false },
- 'null': { type: AST.Literal, value: null },
- 'undefined': {type: AST.Literal, value: undefined },
+ selfReferential: {
'this': {type: AST.ThisExpression },
'$locals': {type: AST.LocalsExpression }
}
@@ -14576,7 +14742,7 @@ ASTInterpreter.prototype = {
forEach(ast.body, function(expression) {
expressions.push(self.recurse(expression.expression));
});
- var fn = ast.body.length === 0 ? function() {} :
+ var fn = ast.body.length === 0 ? noop :
ast.body.length === 1 ? expressions[0] :
function(scope, locals) {
var lastValue;
@@ -14717,7 +14883,7 @@ ASTInterpreter.prototype = {
return context ? {value: locals} : locals;
};
case AST.NGValueParameter:
- return function(scope, locals, assign, inputs) {
+ return function(scope, locals, assign) {
return context ? {value: assign} : assign;
};
}
@@ -14931,7 +15097,7 @@ var Parser = function(lexer, $filter, options) {
this.lexer = lexer;
this.$filter = $filter;
this.options = options;
- this.ast = new AST(this.lexer);
+ this.ast = new AST(lexer, options);
this.astCompiler = options.csp ? new ASTInterpreter(this.ast, $filter) :
new ASTCompiler(this.ast, $filter);
};
@@ -15008,16 +15174,39 @@ function getValueOf(value) {
function $ParseProvider() {
var cacheDefault = createMap();
var cacheExpensive = createMap();
+ var literals = {
+ 'true': true,
+ 'false': false,
+ 'null': null,
+ 'undefined': undefined
+ };
+
+ /**
+ * @ngdoc method
+ * @name $parseProvider#addLiteral
+ * @description
+ *
+ * Configure $parse service to add literal values that will be present as literal at expressions.
+ *
+ * @param {string} literalName Token for the literal value. The literal name value must be a valid literal name.
+ * @param {*} literalValue Value for this literal. All literal values must be primitives or `undefined`.
+ *
+ **/
+ this.addLiteral = function(literalName, literalValue) {
+ literals[literalName] = literalValue;
+ };
this.$get = ['$filter', function($filter) {
var noUnsafeEval = csp().noUnsafeEval;
var $parseOptions = {
csp: noUnsafeEval,
- expensiveChecks: false
+ expensiveChecks: false,
+ literals: copy(literals)
},
$parseOptionsExpensive = {
csp: noUnsafeEval,
- expensiveChecks: true
+ expensiveChecks: true,
+ literals: copy(literals)
};
var runningChecksEnabled = false;
@@ -15266,15 +15455,15 @@ function $ParseProvider() {
* [Kris Kowal's Q](https://github.com/kriskowal/q).
*
* $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred
- * implementations, and the other which resembles ES6 promises to some degree.
+ * implementations, and the other which resembles ES6 (ES2015) promises to some degree.
*
* # $q constructor
*
* The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver`
- * function as the first argument. This is similar to the native Promise implementation from ES6 Harmony,
+ * function as the first argument. This is similar to the native Promise implementation from ES6,
* see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise).
*
- * While the constructor-style use is supported, not all of the supporting methods from ES6 Harmony promises are
+ * While the constructor-style use is supported, not all of the supporting methods from ES6 promises are
* available yet.
*
* It can be used like so:
@@ -16627,7 +16816,7 @@ function $RootScopeProvider() {
dirty, ttl = TTL,
next, current, target = this,
watchLog = [],
- logIdx, logMsg, asyncTask;
+ logIdx, asyncTask;
beginPhase('$digest');
// Check for changes to browser url that happened in sync before the call to $digest
@@ -18412,6 +18601,10 @@ function $SceProvider() {
function $SnifferProvider() {
this.$get = ['$window', '$document', function($window, $document) {
var eventSupport = {},
+ // Chrome Packaged Apps are not allowed to access `history.pushState`. They can be detected by
+ // the presence of `chrome.app.runtime` (see https://developer.chrome.com/apps/api_index)
+ isChromePackagedApp = $window.chrome && $window.chrome.app && $window.chrome.app.runtime,
+ hasHistoryPushState = !isChromePackagedApp && $window.history && $window.history.pushState,
android =
toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
@@ -18456,7 +18649,7 @@ function $SnifferProvider() {
// so let's not use the history API also
// We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
// jshint -W018
- history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee),
+ history: !!(hasHistoryPushState && !(android < 4) && !boxee),
// jshint +W018
hasEvent: function(event) {
// IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
@@ -18482,7 +18675,7 @@ function $SnifferProvider() {
}];
}
-var $compileMinErr = minErr('$compile');
+var $templateRequestMinErr = minErr('$compile');
/**
* @ngdoc provider
@@ -18578,7 +18771,7 @@ function $TemplateRequestProvider() {
function handleError(resp) {
if (!ignoreRequestError) {
- throw $compileMinErr('tpload', 'Failed to load template: {0} (HTTP status: {1} {2})',
+ throw $templateRequestMinErr('tpload', 'Failed to load template: {0} (HTTP status: {1} {2})',
tpl, resp.status, resp.statusText);
}
return $q.reject(resp);
@@ -19500,7 +19693,7 @@ function currencyFilter($locale) {
* Formats a number as text.
*
* If the input is null or undefined, it will just be returned.
- * If the input is infinite (Infinity/-Infinity) the Infinity symbol '∞' is returned.
+ * If the input is infinite (Infinity or -Infinity), the Infinity symbol '∞' or '-∞' is returned, respectively.
* If the input is not a number an empty string is returned.
*
*
@@ -19636,18 +19829,37 @@ function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) {
var digit = digits[roundAt];
if (roundAt > 0) {
- digits.splice(roundAt);
+ // Drop fractional digits beyond `roundAt`
+ digits.splice(Math.max(parsedNumber.i, roundAt));
+
+ // Set non-fractional digits beyond `roundAt` to 0
+ for (var j = roundAt; j < digits.length; j++) {
+ digits[j] = 0;
+ }
} else {
// We rounded to zero so reset the parsedNumber
+ fractionLen = Math.max(0, fractionLen);
parsedNumber.i = 1;
- digits.length = roundAt = fractionSize + 1;
- for (var i=0; i < roundAt; i++) digits[i] = 0;
+ digits.length = Math.max(1, roundAt = fractionSize + 1);
+ digits[0] = 0;
+ for (var i = 1; i < roundAt; i++) digits[i] = 0;
}
- if (digit >= 5) digits[roundAt - 1]++;
+ if (digit >= 5) {
+ if (roundAt - 1 < 0) {
+ for (var k = 0; k > roundAt; k--) {
+ digits.unshift(0);
+ parsedNumber.i++;
+ }
+ digits.unshift(1);
+ parsedNumber.i++;
+ } else {
+ digits[roundAt - 1]++;
+ }
+ }
// Pad out with zeros to get the required fraction length
- for (; fractionLen < fractionSize; fractionLen++) digits.push(0);
+ for (; fractionLen < Math.max(0, fractionSize); fractionLen++) digits.push(0);
// Do any carrying, e.g. a digit was rounded up to 10
@@ -19719,7 +19931,7 @@ function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
// format the integer digits with grouping separators
var groups = [];
- if (digits.length > pattern.lgSize) {
+ if (digits.length >= pattern.lgSize) {
groups.unshift(digits.splice(-pattern.lgSize).join(''));
}
while (digits.length > pattern.gSize) {
@@ -19746,11 +19958,15 @@ function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
}
}
-function padNumber(num, digits, trim) {
+function padNumber(num, digits, trim, negWrap) {
var neg = '';
- if (num < 0) {
- neg = '-';
- num = -num;
+ if (num < 0 || (negWrap && num <= 0)) {
+ if (negWrap) {
+ num = -num + 1;
+ } else {
+ num = -num;
+ neg = '-';
+ }
}
num = '' + num;
while (num.length < digits) num = ZERO_CHAR + num;
@@ -19761,7 +19977,7 @@ function padNumber(num, digits, trim) {
}
-function dateGetter(name, size, offset, trim) {
+function dateGetter(name, size, offset, trim, negWrap) {
offset = offset || 0;
return function(date) {
var value = date['get' + name]();
@@ -19769,14 +19985,15 @@ function dateGetter(name, size, offset, trim) {
value += offset;
}
if (value === 0 && offset == -12) value = 12;
- return padNumber(value, size, trim);
+ return padNumber(value, size, trim, negWrap);
};
}
-function dateStrGetter(name, shortForm) {
+function dateStrGetter(name, shortForm, standAlone) {
return function(date, formats) {
var value = date['get' + name]();
- var get = uppercase(shortForm ? ('SHORT' + name) : name);
+ var propPrefix = (standAlone ? 'STANDALONE' : '') + (shortForm ? 'SHORT' : '');
+ var get = uppercase(propPrefix + name);
return formats[get][value];
};
@@ -19831,13 +20048,14 @@ function longEraGetter(date, formats) {
}
var DATE_FORMATS = {
- yyyy: dateGetter('FullYear', 4),
- yy: dateGetter('FullYear', 2, 0, true),
- y: dateGetter('FullYear', 1),
+ yyyy: dateGetter('FullYear', 4, 0, false, true),
+ yy: dateGetter('FullYear', 2, 0, true, true),
+ y: dateGetter('FullYear', 1, 0, false, true),
MMMM: dateStrGetter('Month'),
MMM: dateStrGetter('Month', true),
MM: dateGetter('Month', 2, 1),
M: dateGetter('Month', 1, 1),
+ LLLL: dateStrGetter('Month', false, true),
dd: dateGetter('Date', 2),
d: dateGetter('Date', 1),
HH: dateGetter('Hours', 2),
@@ -19863,7 +20081,7 @@ var DATE_FORMATS = {
GGGG: longEraGetter
};
-var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,
+var DATE_FORMATS_SPLIT = /((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,
NUMBER_STRING = /^\-?\d+$/;
/**
@@ -19883,6 +20101,7 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|
* * `'MMM'`: Month in year (Jan-Dec)
* * `'MM'`: Month in year, padded (01-12)
* * `'M'`: Month in year (1-12)
+ * * `'LLLL'`: Stand-alone month in year (January-December)
* * `'dd'`: Day in month, padded (01-31)
* * `'d'`: Day in month (1-31)
* * `'EEEE'`: Day in Week,(Sunday-Saturday)
@@ -21564,8 +21783,8 @@ var ngFormDirective = formDirectiveFactory(true);
ngModelMinErr: false,
*/
-// Regex code is obtained from SO: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
-var ISO_DATE_REGEXP = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/;
+// Regex code was initially obtained from SO prior to modification: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
+var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/;
// See valid URLs in RFC3987 (http://tools.ietf.org/html/rfc3987)
// Note: We are being more lenient, because browsers are too.
// 1. Scheme
@@ -21581,12 +21800,18 @@ var ISO_DATE_REGEXP = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-
var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
-var DATE_REGEXP = /^(\d{4})-(\d{2})-(\d{2})$/;
-var DATETIMELOCAL_REGEXP = /^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
-var WEEK_REGEXP = /^(\d{4})-W(\d\d)$/;
-var MONTH_REGEXP = /^(\d{4})-(\d\d)$/;
+var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
+var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+var WEEK_REGEXP = /^(\d{4,})-W(\d\d)$/;
+var MONTH_REGEXP = /^(\d{4,})-(\d\d)$/;
var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+var PARTIAL_VALIDATION_EVENTS = 'keydown wheel mousedown';
+var PARTIAL_VALIDATION_TYPES = createMap();
+forEach('date,datetime-local,month,time,week'.split(','), function(type) {
+ PARTIAL_VALIDATION_TYPES[type] = true;
+});
+
var inputType = {
/**
@@ -21942,7 +22167,7 @@ var inputType = {
}]);