diff --git a/public/app/features/templating/constant_variable.ts b/public/app/features/templating/constant_variable.ts
index 9fe2acfdfb2..bf31dba96f9 100644
--- a/public/app/features/templating/constant_variable.ts
+++ b/public/app/features/templating/constant_variable.ts
@@ -18,7 +18,7 @@ export class ConstantVariable implements Variable {
current: {},
};
- /** @ngInject */
+ /** @ngInject **/
constructor(private model, private variableSrv) {
assignModelProperties(this, model, this.defaults);
}
diff --git a/public/app/features/templating/datasource_variable.ts b/public/app/features/templating/datasource_variable.ts
index 96776c31163..d43c0dd486d 100644
--- a/public/app/features/templating/datasource_variable.ts
+++ b/public/app/features/templating/datasource_variable.ts
@@ -10,6 +10,7 @@ export class DatasourceVariable implements Variable {
query: string;
options: any;
current: any;
+ refresh: any;
defaults = {
type: 'datasource',
@@ -20,11 +21,13 @@ export class DatasourceVariable implements Variable {
regex: '',
options: [],
query: '',
+ refresh: 1,
};
- /** @ngInject */
+ /** @ngInject **/
constructor(private model, private datasourceSrv, private variableSrv) {
assignModelProperties(this, model, this.defaults);
+ this.refresh = 1;
}
getModel() {
diff --git a/public/app/features/templating/editor_ctrl.ts b/public/app/features/templating/editor_ctrl.ts
index 3c0410e1316..489625c16f8 100644
--- a/public/app/features/templating/editor_ctrl.ts
+++ b/public/app/features/templating/editor_ctrl.ts
@@ -6,7 +6,7 @@ import {variableTypes} from './variable';
export class VariableEditorCtrl {
- /** @ngInject */
+ /** @ngInject **/
constructor(private $scope, private datasourceSrv, private variableSrv, templateSrv) {
$scope.variableTypes = variableTypes;
$scope.ctrl = {};
diff --git a/public/app/features/templating/interval_variable.ts b/public/app/features/templating/interval_variable.ts
index d53e44ae533..a1cfbf324c0 100644
--- a/public/app/features/templating/interval_variable.ts
+++ b/public/app/features/templating/interval_variable.ts
@@ -28,7 +28,7 @@ export class IntervalVariable implements Variable {
auto_count: 30,
};
- /** @ngInject */
+ /** @ngInject **/
constructor(private model, private timeSrv, private templateSrv, private variableSrv) {
assignModelProperties(this, model, this.defaults);
this.refresh = 2;
@@ -54,8 +54,8 @@ export class IntervalVariable implements Variable {
this.options.unshift({ text: 'auto', value: '$__auto_interval' });
}
- var interval = kbn.calculateInterval(this.timeSrv.timeRange(), this.auto_count, (this.auto_min ? ">"+this.auto_min : null));
- this.templateSrv.setGrafanaVariable('$__auto_interval', interval);
+ var res = kbn.calculateInterval(this.timeSrv.timeRange(), this.auto_count, (this.auto_min ? ">"+this.auto_min : null));
+ this.templateSrv.setGrafanaVariable('$__auto_interval', res.interval);
}
updateOptions() {
diff --git a/public/app/features/templating/query_variable.ts b/public/app/features/templating/query_variable.ts
index 96766d1bbfb..5ee9f0609bc 100644
--- a/public/app/features/templating/query_variable.ts
+++ b/public/app/features/templating/query_variable.ts
@@ -40,6 +40,7 @@ export class QueryVariable implements Variable {
tagValuesQuery: null,
};
+ /** @ngInject **/
constructor(private model, private datasourceSrv, private templateSrv, private variableSrv, private $q) {
// copy model properties to this instance
assignModelProperties(this, model, this.defaults);
diff --git a/public/app/features/templating/specs/variable_srv_init_specs.ts b/public/app/features/templating/specs/variable_srv_init_specs.ts
index 8cac63135ca..533c70dfc25 100644
--- a/public/app/features/templating/specs/variable_srv_init_specs.ts
+++ b/public/app/features/templating/specs/variable_srv_init_specs.ts
@@ -62,6 +62,7 @@ describe('VariableSrv init', function() {
options: [{text: "test", value: "test"}]
}];
scenario.urlParams["var-apps"] = "new";
+ scenario.metricSources = [];
});
it('should update current value', () => {
@@ -110,6 +111,30 @@ describe('VariableSrv init', function() {
});
});
+ describeInitScenario('when datasource variable is initialized', scenario => {
+ scenario.setup(() => {
+ scenario.variables = [{
+ type: 'datasource',
+ query: 'graphite',
+ name: 'test',
+ current: {value: 'backend4_pee', text: 'backend4_pee'},
+ regex: '/pee$/'
+ }
+ ];
+ scenario.metricSources = [
+ {name: 'backend1', meta: {id: 'influx'}},
+ {name: 'backend2_pee', meta: {id: 'graphite'}},
+ {name: 'backend3', meta: {id: 'graphite'}},
+ {name: 'backend4_pee', meta: {id: 'graphite'}},
+ ];
+ });
+
+ it('should update current value', function() {
+ var variable = ctx.variableSrv.variables[0];
+ expect(variable.options.length).to.be(2);
+ });
+ });
+
describeInitScenario('when template variable is present in url multiple times', scenario => {
scenario.setup(() => {
scenario.variables = [{
diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js
index f7784e2cb50..dadb8f23a89 100644
--- a/public/app/features/templating/templateSrv.js
+++ b/public/app/features/templating/templateSrv.js
@@ -43,6 +43,10 @@ function (angular, _, kbn) {
}
};
+ this.variableInitialized = function(variable) {
+ this._index[variable.name] = variable;
+ };
+
this.getAdhocFilters = function(datasourceName) {
var variable = this._adhocVariables[datasourceName];
if (variable) {
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
deleted file mode 100644
index a3db47fe3a9..00000000000
--- a/public/app/features/templating/templateValuesSrv.js
+++ /dev/null
@@ -1,417 +0,0 @@
-define([
- 'angular',
- 'lodash',
- 'jquery',
- 'app/core/utils/kbn',
-],
-function (angular, _, $, kbn) {
- 'use strict';
-
- var module = angular.module('grafana.services');
-
- module.service('templateValuesSrv', function($q, $rootScope, datasourceSrv, $location, templateSrv, timeSrv) {
- var self = this;
- this.variableLock = {};
-
- function getNoneOption() { return { text: 'None', value: '', isNone: true }; }
-
- // update time variant variables
- $rootScope.onAppEvent('refresh', function() {
-
- // look for interval variables
- var intervalVariable = _.find(self.variables, { type: 'interval' });
- if (intervalVariable) {
- self.updateAutoInterval(intervalVariable);
- }
-
- // update variables with refresh === 2
- var promises = self.variables
- .filter(function(variable) {
- return variable.refresh === 2;
- }).map(function(variable) {
- var previousOptions = variable.options.slice();
-
- return self.updateOptions(variable).then(function () {
- return self.variableUpdated(variable).then(function () {
- // check if current options changed due to refresh
- if (angular.toJson(previousOptions) !== angular.toJson(variable.options)) {
- $rootScope.appEvent('template-variable-value-updated');
- }
- });
- });
- });
-
- return $q.all(promises);
-
- }, $rootScope);
-
- this.init = function(dashboard) {
- this.dashboard = dashboard;
- this.variables = dashboard.templating.list;
- templateSrv.init(this.variables);
-
- var queryParams = $location.search();
- var promises = [];
-
- // use promises to delay processing variables that
- // depend on other variables.
- this.variableLock = {};
- _.forEach(this.variables, function(variable) {
- self.variableLock[variable.name] = $q.defer();
- });
-
- for (var i = 0; i < this.variables.length; i++) {
- var variable = this.variables[i];
- promises.push(this.processVariable(variable, queryParams));
- }
-
- return $q.all(promises);
- };
-
- this.processVariable = function(variable, queryParams) {
- var dependencies = [];
- var lock = self.variableLock[variable.name];
-
- // determine our dependencies.
- if (variable.type === "query") {
- _.forEach(this.variables, function(v) {
- // both query and datasource can contain variable
- if (templateSrv.containsVariable(variable.query, v.name) ||
- templateSrv.containsVariable(variable.datasource, v.name)) {
- dependencies.push(self.variableLock[v.name].promise);
- }
- });
- }
-
- return $q.all(dependencies).then(function() {
- var urlValue = queryParams['var-' + variable.name];
- if (urlValue !== void 0) {
- return self.setVariableFromUrl(variable, urlValue).then(lock.resolve);
- }
- else if (variable.refresh === 1 || variable.refresh === 2) {
- return self.updateOptions(variable).then(function() {
- if (_.isEmpty(variable.current) && variable.options.length) {
- self.setVariableValue(variable, variable.options[0]);
- }
- lock.resolve();
- });
- }
- else if (variable.type === 'interval') {
- self.updateAutoInterval(variable);
- lock.resolve();
- } else {
- lock.resolve();
- }
- }).finally(function() {
- delete self.variableLock[variable.name];
- });
- };
-
- this.setVariableFromUrl = function(variable, urlValue) {
- var promise = $q.when(true);
-
- if (variable.refresh) {
- promise = this.updateOptions(variable);
- }
-
- return promise.then(function() {
- var option = _.find(variable.options, function(op) {
- return op.text === urlValue || op.value === urlValue;
- });
-
- option = option || { text: urlValue, value: urlValue };
-
- self.updateAutoInterval(variable);
- return self.setVariableValue(variable, option, true);
- });
- };
-
- this.updateAutoInterval = function(variable) {
- if (!variable.auto) { return; }
-
- // add auto option if missing
- if (variable.options.length && variable.options[0].text !== 'auto') {
- variable.options.unshift({ text: 'auto', value: '$__auto_interval' });
- }
-
- var interval = kbn.calculateInterval(timeSrv.timeRange(), variable.auto_count, (variable.auto_min ? ">"+variable.auto_min : null));
- templateSrv.setGrafanaVariable('$__auto_interval', interval);
- };
-
- this.setVariableValue = function(variable, option) {
- variable.current = angular.copy(option);
-
- if (_.isArray(variable.current.text)) {
- variable.current.text = variable.current.text.join(' + ');
- }
-
- self.selectOptionsForCurrentValue(variable);
- templateSrv.updateTemplateData();
-
- return this.updateOptionsInChildVariables(variable);
- };
-
- this.variableUpdated = function(variable) {
- templateSrv.updateTemplateData();
- return self.updateOptionsInChildVariables(variable);
- };
-
- this.updateOptionsInChildVariables = function(updatedVariable) {
- // if there is a variable lock ignore cascading update because we are in a boot up scenario
- if (self.variableLock[updatedVariable.name]) {
- return $q.when();
- }
-
- var promises = _.map(self.variables, function(otherVariable) {
- if (otherVariable === updatedVariable) {
- return;
- }
- if (templateSrv.containsVariable(otherVariable.regex, updatedVariable.name) ||
- templateSrv.containsVariable(otherVariable.query, updatedVariable.name) ||
- templateSrv.containsVariable(otherVariable.datasource, updatedVariable.name)) {
- return self.updateOptions(otherVariable);
- }
- });
-
- return $q.all(promises);
- };
-
- this._updateNonQueryVariable = function(variable) {
- if (variable.type === 'datasource') {
- self.updateDataSourceVariable(variable);
- return;
- }
-
- if (variable.type === 'constant') {
- variable.options = [{text: variable.query, value: variable.query}];
- return;
- }
-
- if (variable.type === 'adhoc') {
- variable.current = {};
- variable.options = [];
- return;
- }
-
- // extract options in comma separated string
- variable.options = _.map(variable.query.split(/[,]+/), function(text) {
- return { text: text.trim(), value: text.trim() };
- });
-
- if (variable.type === 'interval') {
- self.updateAutoInterval(variable);
- return;
- }
-
- if (variable.type === 'custom' && variable.includeAll) {
- self.addAllOption(variable);
- }
- };
-
- this.updateDataSourceVariable = function(variable) {
- var options = [];
- var sources = datasourceSrv.getMetricSources({skipVariables: true});
- var regex;
-
- if (variable.regex) {
- regex = kbn.stringToJsRegex(templateSrv.replace(variable.regex));
- }
-
- for (var i = 0; i < sources.length; i++) {
- var source = sources[i];
- // must match on type
- if (source.meta.id !== variable.query) {
- continue;
- }
-
- if (regex && !regex.exec(source.name)) {
- continue;
- }
-
- options.push({text: source.name, value: source.name});
- }
-
- if (options.length === 0) {
- options.push({text: 'No data sources found', value: ''});
- }
-
- variable.options = options;
- };
-
- this.updateOptions = function(variable) {
- if (variable.type !== 'query') {
- self._updateNonQueryVariable(variable);
- return self.validateVariableSelectionState(variable);
- }
-
- return datasourceSrv.get(variable.datasource)
- .then(_.partial(this.updateOptionsFromMetricFindQuery, variable))
- .then(_.partial(this.updateTags, variable))
- .then(_.partial(this.validateVariableSelectionState, variable));
- };
-
- this.selectOptionsForCurrentValue = function(variable) {
- var i, y, value, option;
- var selected = [];
-
- for (i = 0; i < variable.options.length; i++) {
- option = variable.options[i];
- option.selected = false;
- if (_.isArray(variable.current.value)) {
- for (y = 0; y < variable.current.value.length; y++) {
- value = variable.current.value[y];
- if (option.value === value) {
- option.selected = true;
- selected.push(option);
- }
- }
- } else if (option.value === variable.current.value) {
- option.selected = true;
- selected.push(option);
- }
- }
-
- return selected;
- };
-
- this.validateVariableSelectionState = function(variable) {
- if (!variable.current) {
- if (!variable.options.length) { return $q.when(); }
- return self.setVariableValue(variable, variable.options[0], false);
- }
-
- if (_.isArray(variable.current.value)) {
- var selected = self.selectOptionsForCurrentValue(variable);
-
- // if none pick first
- if (selected.length === 0) {
- selected = variable.options[0];
- } else {
- selected = {
- value: _.map(selected, function(val) {return val.value;}),
- text: _.map(selected, function(val) {return val.text;}).join(' + '),
- };
- }
-
- return self.setVariableValue(variable, selected, false);
- } else {
- var currentOption = _.find(variable.options, {text: variable.current.text});
- if (currentOption) {
- return self.setVariableValue(variable, currentOption, false);
- } else {
- if (!variable.options.length) { return $q.when(null); }
- return self.setVariableValue(variable, variable.options[0]);
- }
- }
- };
-
- this.updateTags = function(variable, datasource) {
- if (variable.useTags) {
- return datasource.metricFindQuery(variable.tagsQuery).then(function (results) {
- variable.tags = [];
- for (var i = 0; i < results.length; i++) {
- variable.tags.push(results[i].text);
- }
- return datasource;
- });
- } else {
- delete variable.tags;
- }
-
- return datasource;
- };
-
- this.updateOptionsFromMetricFindQuery = function(variable, datasource) {
- return datasource.metricFindQuery(variable.query).then(function (results) {
- variable.options = self.metricNamesToVariableValues(variable, results);
- if (variable.includeAll) {
- self.addAllOption(variable);
- }
- if (!variable.options.length) {
- variable.options.push(getNoneOption());
- }
- return datasource;
- });
- };
-
- this.getValuesForTag = function(variable, tagKey) {
- return datasourceSrv.get(variable.datasource).then(function(datasource) {
- var query = variable.tagValuesQuery.replace('$tag', tagKey);
- return datasource.metricFindQuery(query).then(function (results) {
- return _.map(results, function(value) {
- return value.text;
- });
- });
- });
- };
-
- this.metricNamesToVariableValues = function(variable, metricNames) {
- var regex, options, i, matches;
- options = [];
-
- if (variable.regex) {
- regex = kbn.stringToJsRegex(templateSrv.replace(variable.regex));
- }
-
- for (i = 0; i < metricNames.length; i++) {
- var item = metricNames[i];
- var value = item.value || item.text;
- var text = item.text || item.value;
-
- if (_.isNumber(value)) {
- value = value.toString();
- }
-
- if (_.isNumber(text)) {
- text = text.toString();
- }
-
- if (regex) {
- matches = regex.exec(value);
- if (!matches) { continue; }
- if (matches.length > 1) {
- value = matches[1];
- text = value;
- }
- }
-
- options.push({text: text, value: value});
- }
-
- options = _.uniq(options, 'value');
- return this.sortVariableValues(options, variable.sort);
- };
-
- this.addAllOption = function(variable) {
- variable.options.unshift({text: 'All', value: "$__all"});
- };
-
- this.sortVariableValues = function(options, sortOrder) {
- if (sortOrder === 0) {
- return options;
- }
-
- var sortType = Math.ceil(sortOrder / 2);
- var reverseSort = (sortOrder % 2 === 0);
- if (sortType === 1) {
- options = _.sortBy(options, 'text');
- } else if (sortType === 2) {
- options = _.sortBy(options, function(opt) {
- var matches = opt.text.match(/.*?(\d+).*/);
- if (!matches) {
- return 0;
- } else {
- return parseInt(matches[1], 10);
- }
- });
- }
- if (reverseSort) {
- options = options.reverse();
- }
-
- return options;
- };
-
- });
-
-});
diff --git a/public/app/features/templating/variable_srv.ts b/public/app/features/templating/variable_srv.ts
index b7013d517f4..bb6f4f7cde3 100644
--- a/public/app/features/templating/variable_srv.ts
+++ b/public/app/features/templating/variable_srv.ts
@@ -8,7 +8,6 @@ import {Variable, variableTypes} from './variable';
export class VariableSrv {
dashboard: any;
variables: any;
- variableLock: any;
/** @ngInject */
constructor(private $rootScope, private $q, private $location, private $injector, private templateSrv) {
@@ -18,7 +17,6 @@ export class VariableSrv {
}
init(dashboard) {
- this.variableLock = {};
this.dashboard = dashboard;
// create working class models representing variables
@@ -30,13 +28,15 @@ export class VariableSrv {
// init variables
for (let variable of this.variables) {
- this.variableLock[variable.name] = this.$q.defer();
+ variable.initLock = this.$q.defer();
}
var queryParams = this.$location.search();
return this.$q.all(this.variables.map(variable => {
return this.processVariable(variable, queryParams);
- }));
+ })).then(() => {
+ this.templateSrv.updateTemplateData();
+ });
}
onDashboardRefresh() {
@@ -59,27 +59,27 @@ export class VariableSrv {
processVariable(variable, queryParams) {
var dependencies = [];
- var lock = this.variableLock[variable.name];
for (let otherVariable of this.variables) {
if (variable.dependsOn(otherVariable)) {
- dependencies.push(this.variableLock[otherVariable.name].promise);
+ dependencies.push(otherVariable.initLock.promise);
}
}
return this.$q.all(dependencies).then(() => {
var urlValue = queryParams['var-' + variable.name];
if (urlValue !== void 0) {
- return variable.setValueFromUrl(urlValue).then(lock.resolve);
+ return variable.setValueFromUrl(urlValue).then(variable.initLock.resolve);
}
if (variable.refresh === 1 || variable.refresh === 2) {
- return variable.updateOptions().then(lock.resolve);
+ return variable.updateOptions().then(variable.initLock.resolve);
}
- lock.resolve();
+ variable.initLock.resolve();
}).finally(() => {
- delete this.variableLock[variable.name];
+ this.templateSrv.variableInitialized(variable);
+ delete variable.initLock;
});
}
@@ -111,7 +111,7 @@ export class VariableSrv {
variableUpdated(variable) {
// if there is a variable lock ignore cascading update because we are in a boot up scenario
- if (this.variableLock[variable.name]) {
+ if (variable.initLock) {
return this.$q.when();
}
@@ -155,8 +155,7 @@ export class VariableSrv {
validateVariableSelectionState(variable) {
if (!variable.current) {
- if (!variable.options.length) { return this.$q.when(); }
- return variable.setValue(variable.options[0]);
+ variable.current = {};
}
if (_.isArray(variable.current.value)) {
diff --git a/public/app/plugins/app/testdata/dashboards/alerts.json b/public/app/plugins/app/testdata/dashboards/alerts.json
new file mode 100644
index 00000000000..159df0f458b
--- /dev/null
+++ b/public/app/plugins/app/testdata/dashboards/alerts.json
@@ -0,0 +1,287 @@
+{
+ "revision": 2,
+ "title": "TestData - Alerts",
+ "tags": [
+ "grafana-test"
+ ],
+ "style": "dark",
+ "timezone": "browser",
+ "editable": true,
+ "hideControls": false,
+ "sharedCrosshair": false,
+ "rows": [
+ {
+ "collapse": false,
+ "editable": true,
+ "height": 255.625,
+ "panels": [
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 60
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "TestData - Always OK",
+ "noDataState": "no_data",
+ "notifications": []
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "Grafana TestData",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 3,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 6,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "scenario": "random_walk",
+ "scenarioId": "csv_metric_values",
+ "stringInput": "1,20,90,30,5,0",
+ "target": ""
+ }
+ ],
+ "thresholds": [
+ {
+ "value": 60,
+ "op": "gt",
+ "fill": true,
+ "line": true,
+ "colorMode": "critical"
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Always OK",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": "",
+ "logBase": 1,
+ "max": "125",
+ "min": "0",
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "alert": {
+ "conditions": [
+ {
+ "evaluator": {
+ "params": [
+ 177
+ ],
+ "type": "gt"
+ },
+ "query": {
+ "params": [
+ "A",
+ "5m",
+ "now"
+ ]
+ },
+ "reducer": {
+ "params": [],
+ "type": "avg"
+ },
+ "type": "query"
+ }
+ ],
+ "enabled": true,
+ "frequency": "60s",
+ "handler": 1,
+ "name": "TestData - Always Alerting",
+ "noDataState": "no_data",
+ "notifications": []
+ },
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "Grafana TestData",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 4,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 6,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "scenario": "random_walk",
+ "scenarioId": "csv_metric_values",
+ "stringInput": "200,445,100,150,200,220,190",
+ "target": ""
+ }
+ ],
+ "thresholds": [
+ {
+ "colorMode": "critical",
+ "fill": true,
+ "line": true,
+ "op": "gt",
+ "value": 177
+ }
+ ],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Always Alerting",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": "",
+ "logBase": 1,
+ "max": null,
+ "min": "0",
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": "",
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "title": "New row"
+ }
+ ],
+ "time": {
+ "from": "now-6h",
+ "to": "now"
+ },
+ "timepicker": {
+ "refresh_intervals": [
+ "5s",
+ "10s",
+ "30s",
+ "1m",
+ "5m",
+ "15m",
+ "30m",
+ "1h",
+ "2h",
+ "1d"
+ ],
+ "time_options": [
+ "5m",
+ "15m",
+ "1h",
+ "6h",
+ "12h",
+ "24h",
+ "2d",
+ "7d",
+ "30d"
+ ]
+ },
+ "templating": {
+ "list": []
+ },
+ "annotations": {
+ "list": []
+ },
+ "schemaVersion": 13,
+ "version": 4,
+ "links": [],
+ "gnetId": null
+}
diff --git a/public/app/plugins/app/testdata/dashboards/graph_last_1h.json b/public/app/plugins/app/testdata/dashboards/graph_last_1h.json
new file mode 100644
index 00000000000..757dd48e50f
--- /dev/null
+++ b/public/app/plugins/app/testdata/dashboards/graph_last_1h.json
@@ -0,0 +1,483 @@
+{
+ "revision": 4,
+ "title": "TestData - Graph Panel Last 1h",
+ "tags": [
+ "grafana-test"
+ ],
+ "style": "dark",
+ "timezone": "browser",
+ "editable": true,
+ "hideControls": false,
+ "sharedCrosshair": false,
+ "rows": [
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "250px",
+ "panels": [
+ {
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "Grafana TestData",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 1,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 4,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "scenario": "random_walk",
+ "scenarioId": "no_data_points",
+ "target": ""
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "No Data Points Warning",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "Grafana TestData",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 2,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 4,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "scenario": "random_walk",
+ "scenarioId": "datapoints_outside_range",
+ "target": ""
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Datapoints Outside Range Warning",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "Grafana TestData",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 3,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 4,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "scenario": "random_walk",
+ "scenarioId": "random_walk",
+ "target": ""
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": null,
+ "timeShift": null,
+ "title": "Random walk series",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ }
+ ],
+ "title": "New row"
+ },
+ {
+ "collapse": false,
+ "editable": true,
+ "height": "250px",
+ "panels": [
+ {
+ "aliasColors": {},
+ "bars": false,
+ "datasource": "Grafana TestData",
+ "editable": true,
+ "error": false,
+ "fill": 1,
+ "id": 4,
+ "isNew": true,
+ "legend": {
+ "avg": false,
+ "current": false,
+ "max": false,
+ "min": false,
+ "show": true,
+ "total": false,
+ "values": false
+ },
+ "lines": true,
+ "linewidth": 2,
+ "links": [],
+ "nullPointMode": "connected",
+ "percentage": false,
+ "pointradius": 5,
+ "points": false,
+ "renderer": "flot",
+ "seriesOverrides": [],
+ "span": 8,
+ "stack": false,
+ "steppedLine": false,
+ "targets": [
+ {
+ "refId": "A",
+ "scenario": "random_walk",
+ "scenarioId": "random_walk",
+ "target": ""
+ }
+ ],
+ "thresholds": [],
+ "timeFrom": "2s",
+ "timeShift": null,
+ "title": "Millisecond res x-axis and tooltip",
+ "tooltip": {
+ "msResolution": false,
+ "shared": true,
+ "sort": 0,
+ "value_type": "cumulative"
+ },
+ "type": "graph",
+ "xaxis": {
+ "mode": "time",
+ "name": null,
+ "show": true,
+ "values": []
+ },
+ "yaxes": [
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ },
+ {
+ "format": "short",
+ "label": null,
+ "logBase": 1,
+ "max": null,
+ "min": null,
+ "show": true
+ }
+ ]
+ },
+ {
+ "title": "",
+ "error": false,
+ "span": 4,
+ "editable": true,
+ "type": "text",
+ "isNew": true,
+ "id": 6,
+ "mode": "markdown",
+ "content": "Just verify that the tooltip time has millisecond resolution ",
+ "links": []
+ }
+ ],
+ "title": "New row"
+ },
+ {
+ "title": "New row",
+ "height": 336,
+ "editable": true,
+ "collapse": false,
+ "panels": [
+ {
+ "title": "2 yaxis and axis lables",
+ "error": false,
+ "span": 7.99561403508772,
+ "editable": true,
+ "type": "graph",
+ "isNew": true,
+ "id": 5,
+ "targets": [
+ {
+ "target": "",
+ "refId": "A",
+ "scenarioId": "csv_metric_values",
+ "stringInput": "1,20,90,30,5,0"
+ },
+ {
+ "target": "",
+ "refId": "B",
+ "scenarioId": "csv_metric_values",
+ "stringInput": "2000,3000,4000,1000,3000,10000"
+ }
+ ],
+ "datasource": "Grafana TestData",
+ "renderer": "flot",
+ "yaxes": [
+ {
+ "label": "Perecent",
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "percent"
+ },
+ {
+ "label": "Pressure",
+ "show": true,
+ "logBase": 1,
+ "min": null,
+ "max": null,
+ "format": "short"
+ }
+ ],
+ "xaxis": {
+ "show": true,
+ "mode": "time",
+ "name": null,
+ "values": []
+ },
+ "lines": true,
+ "fill": 1,
+ "linewidth": 2,
+ "points": false,
+ "pointradius": 5,
+ "bars": false,
+ "stack": false,
+ "percentage": false,
+ "legend": {
+ "show": true,
+ "values": false,
+ "min": false,
+ "max": false,
+ "current": false,
+ "total": false,
+ "avg": false
+ },
+ "nullPointMode": "connected",
+ "steppedLine": false,
+ "tooltip": {
+ "value_type": "cumulative",
+ "shared": true,
+ "sort": 0,
+ "msResolution": false
+ },
+ "timeFrom": null,
+ "timeShift": null,
+ "aliasColors": {},
+ "seriesOverrides": [
+ {
+ "alias": "B-series",
+ "yaxis": 2
+ }
+ ],
+ "thresholds": [],
+ "links": []
+ },
+ {
+ "title": "",
+ "error": false,
+ "span": 4.00438596491228,
+ "editable": true,
+ "type": "text",
+ "isNew": true,
+ "id": 7,
+ "mode": "markdown",
+ "content": "Verify that axis labels look ok",
+ "links": []
+ }
+ ]
+ }
+ ],
+ "time": {
+ "from": "now-1h",
+ "to": "now"
+ },
+ "timepicker": {
+ "refresh_intervals": [
+ "5s",
+ "10s",
+ "30s",
+ "1m",
+ "5m",
+ "15m",
+ "30m",
+ "1h",
+ "2h",
+ "1d"
+ ],
+ "time_options": [
+ "5m",
+ "15m",
+ "1h",
+ "6h",
+ "12h",
+ "24h",
+ "2d",
+ "7d",
+ "30d"
+ ]
+ },
+ "templating": {
+ "list": []
+ },
+ "annotations": {
+ "list": []
+ },
+ "refresh": false,
+ "schemaVersion": 13,
+ "version": 3,
+ "links": [],
+ "gnetId": null
+}
diff --git a/public/app/plugins/app/testdata/datasource/datasource.ts b/public/app/plugins/app/testdata/datasource/datasource.ts
new file mode 100644
index 00000000000..e0846d99ab6
--- /dev/null
+++ b/public/app/plugins/app/testdata/datasource/datasource.ts
@@ -0,0 +1,62 @@
+///
+
+import _ from 'lodash';
+import angular from 'angular';
+
+class TestDataDatasource {
+
+ /** @ngInject */
+ constructor(private backendSrv, private $q) {}
+
+ query(options) {
+ var queries = _.filter(options.targets, item => {
+ return item.hide !== true;
+ }).map(item => {
+ return {
+ refId: item.refId,
+ scenarioId: item.scenarioId,
+ intervalMs: options.intervalMs,
+ maxDataPoints: options.maxDataPoints,
+ stringInput: item.stringInput,
+ jsonInput: angular.fromJson(item.jsonInput),
+ };
+ });
+
+ if (queries.length === 0) {
+ return this.$q.when({data: []});
+ }
+
+ return this.backendSrv.post('/api/tsdb/query', {
+ from: options.range.from.valueOf().toString(),
+ to: options.range.to.valueOf().toString(),
+ queries: queries,
+ }).then(res => {
+ var data = [];
+
+ if (res.results) {
+ _.forEach(res.results, queryRes => {
+ for (let series of queryRes.series) {
+ data.push({
+ target: series.name,
+ datapoints: series.points
+ });
+ }
+ });
+ }
+
+ return {data: data};
+ });
+ }
+
+ annotationQuery(options) {
+ return this.backendSrv.get('/api/annotations', {
+ from: options.range.from.valueOf(),
+ to: options.range.to.valueOf(),
+ limit: options.limit,
+ type: options.type,
+ });
+ }
+
+}
+
+export {TestDataDatasource};
diff --git a/public/app/plugins/app/testdata/datasource/module.ts b/public/app/plugins/app/testdata/datasource/module.ts
new file mode 100644
index 00000000000..309b7443836
--- /dev/null
+++ b/public/app/plugins/app/testdata/datasource/module.ts
@@ -0,0 +1,22 @@
+///
+
+import {TestDataDatasource} from './datasource';
+import {TestDataQueryCtrl} from './query_ctrl';
+
+class TestDataAnnotationsQueryCtrl {
+ annotation: any;
+
+ constructor() {
+ }
+
+ static template = '
test data
';
+}
+
+
+export {
+ TestDataDatasource,
+ TestDataDatasource as Datasource,
+ TestDataQueryCtrl as QueryCtrl,
+ TestDataAnnotationsQueryCtrl as AnnotationsQueryCtrl,
+};
+
diff --git a/public/app/plugins/app/testdata/datasource/plugin.json b/public/app/plugins/app/testdata/datasource/plugin.json
new file mode 100644
index 00000000000..4d66253d78e
--- /dev/null
+++ b/public/app/plugins/app/testdata/datasource/plugin.json
@@ -0,0 +1,20 @@
+{
+ "type": "datasource",
+ "name": "Grafana TestDataDB",
+ "id": "grafana-testdata-datasource",
+
+ "metrics": true,
+ "alerting": true,
+ "annotations": true,
+
+ "info": {
+ "author": {
+ "name": "Grafana Project",
+ "url": "http://grafana.org"
+ },
+ "logos": {
+ "small": "",
+ "large": ""
+ }
+ }
+}
diff --git a/public/app/plugins/app/testdata/datasource/query_ctrl.ts b/public/app/plugins/app/testdata/datasource/query_ctrl.ts
new file mode 100644
index 00000000000..6b0ad93f26c
--- /dev/null
+++ b/public/app/plugins/app/testdata/datasource/query_ctrl.ts
@@ -0,0 +1,35 @@
+///
+
+import _ from 'lodash';
+
+import {TestDataDatasource} from './datasource';
+import {QueryCtrl} from 'app/plugins/sdk';
+
+export class TestDataQueryCtrl extends QueryCtrl {
+ static templateUrl = 'partials/query.editor.html';
+
+ scenarioList: any;
+ scenario: any;
+
+ /** @ngInject **/
+ constructor($scope, $injector, private backendSrv) {
+ super($scope, $injector);
+
+ this.target.scenarioId = this.target.scenarioId || 'random_walk';
+ this.scenarioList = [];
+ }
+
+ $onInit() {
+ return this.backendSrv.get('/api/tsdb/testdata/scenarios').then(res => {
+ this.scenarioList = res;
+ this.scenario = _.find(this.scenarioList, {id: this.target.scenarioId});
+ });
+ }
+
+ scenarioChanged() {
+ this.scenario = _.find(this.scenarioList, {id: this.target.scenarioId});
+ this.target.stringInput = this.scenario.stringInput;
+ this.refresh();
+ }
+}
+
diff --git a/public/app/plugins/app/testdata/module.ts b/public/app/plugins/app/testdata/module.ts
new file mode 100644
index 00000000000..dee1679637a
--- /dev/null
+++ b/public/app/plugins/app/testdata/module.ts
@@ -0,0 +1,36 @@
+///
+
+export class ConfigCtrl {
+ static template = '';
+
+ appEditCtrl: any;
+
+ constructor(private backendSrv) {
+ this.appEditCtrl.setPreUpdateHook(this.initDatasource.bind(this));
+ }
+
+ initDatasource() {
+ return this.backendSrv.get('/api/datasources').then(res => {
+ var found = false;
+ for (let ds of res) {
+ if (ds.type === "grafana-testdata-datasource") {
+ found = true;
+ }
+ }
+
+ if (!found) {
+ var dsInstance = {
+ name: 'Grafana TestData',
+ type: 'grafana-testdata-datasource',
+ access: 'direct',
+ jsonData: {}
+ };
+
+ return this.backendSrv.post('/api/datasources', dsInstance);
+ }
+
+ return Promise.resolve();
+ });
+ }
+}
+
diff --git a/public/app/plugins/app/testdata/partials/query.editor.html b/public/app/plugins/app/testdata/partials/query.editor.html
new file mode 100644
index 00000000000..a39582d5397
--- /dev/null
+++ b/public/app/plugins/app/testdata/partials/query.editor.html
@@ -0,0 +1,22 @@
+
+
+
+
diff --git a/public/app/plugins/app/testdata/plugin.json b/public/app/plugins/app/testdata/plugin.json
new file mode 100644
index 00000000000..6742ad04ecb
--- /dev/null
+++ b/public/app/plugins/app/testdata/plugin.json
@@ -0,0 +1,32 @@
+{
+ "type": "app",
+ "name": "Grafana TestData",
+ "id": "testdata",
+
+ "info": {
+ "description": "Grafana test data app",
+ "author": {
+ "name": "Grafana Project",
+ "url": "http://grafana.org"
+ },
+ "version": "1.0.13",
+ "updated": "2016-09-26"
+ },
+
+ "includes": [
+ {
+ "type": "dashboard",
+ "name": "TestData - Graph Last 1h",
+ "path": "dashboards/graph_last_1h.json"
+ },
+ {
+ "type": "dashboard",
+ "name": "TestData - Alerts",
+ "path": "dashboards/alerts.json"
+ }
+ ],
+
+ "dependencies": {
+ "grafanaVersion": "4.x.x"
+ }
+}
diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index 0889c078082..9f98a794da4 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -216,11 +216,6 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
});
};
- function escapeForJson(value) {
- var luceneQuery = JSON.stringify(value);
- return luceneQuery.substr(1, luceneQuery.length - 2);
- }
-
this.getFields = function(query) {
return this._get('/_mapping').then(function(result) {
var typeMap = {
@@ -285,7 +280,6 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
var header = this.getQueryHeader('count', range.from, range.to);
var esQuery = angular.toJson(this.queryBuilder.getTermsQuery(queryDef));
- esQuery = esQuery.replace("$lucene_query", escapeForJson(queryDef.query));
esQuery = esQuery.replace(/\$timeFrom/g, range.from.valueOf());
esQuery = esQuery.replace(/\$timeTo/g, range.to.valueOf());
esQuery = header + '\n' + esQuery + '\n';
diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index d256c6d1438..4be5404a950 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -221,12 +221,6 @@ function (queryDef) {
"size": 0,
"query": {
"filtered": {
- "query": {
- "query_string": {
- "analyze_wildcard": true,
- "query": '$lucene_query',
- }
- },
"filter": {
"bool": {
"must": [{"range": this.getRangeFilter()}]
@@ -235,6 +229,16 @@ function (queryDef) {
}
}
};
+
+ if (queryDef.query) {
+ query.query.filtered.query = {
+ "query_string": {
+ "analyze_wildcard": true,
+ "query": queryDef.query,
+ }
+ };
+ }
+
query.aggs = {
"1": {
"terms": {
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 58799778acd..3ae030e4423 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -9,6 +9,8 @@ class GrafanaDatasource {
return this.backendSrv.get('/api/metrics/test', {
from: options.range.from.valueOf(),
to: options.range.to.valueOf(),
+ scenario: 'random_walk',
+ interval: options.intervalMs,
maxDataPoints: options.maxDataPoints
});
}
diff --git a/public/app/plugins/datasource/graphite/lexer.ts b/public/app/plugins/datasource/graphite/lexer.ts
index 1835921d40b..760f0fe2573 100644
--- a/public/app/plugins/datasource/graphite/lexer.ts
+++ b/public/app/plugins/datasource/graphite/lexer.ts
@@ -134,13 +134,7 @@ for (var i = 0; i < 128; i++) {
i >= 97 && i <= 122; // a-z
}
-var identifierPartTable = [];
-
-for (var i2 = 0; i2 < 128; i2++) {
- identifierPartTable[i2] =
- identifierStartTable[i2] || // $, _, A-Z, a-z
- i2 >= 48 && i2 <= 57; // 0-9
-}
+var identifierPartTable = identifierStartTable;
export function Lexer(expression) {
this.input = expression;
@@ -423,256 +417,260 @@ Lexer.prototype = {
if (char === '-') {
value += char;
index += 1;
- char = this.peek(index);
- }
+ char = this.peek(index);
+ }
- // Numbers must start either with a decimal digit or a point.
- if (char !== "." && !isDecimalDigit(char)) {
- return null;
- }
+ // Numbers must start either with a decimal digit or a point.
+ if (char !== "." && !isDecimalDigit(char)) {
+ return null;
+ }
- if (char !== ".") {
- value += this.peek(index);
- index += 1;
- char = this.peek(index);
+ if (char !== ".") {
+ value += this.peek(index);
+ index += 1;
+ char = this.peek(index);
- if (value === "0") {
- // Base-16 numbers.
- if (char === "x" || char === "X") {
- index += 1;
- value += char;
-
- while (index < length) {
- char = this.peek(index);
- if (!isHexDigit(char)) {
- break;
- }
- value += char;
- index += 1;
- }
-
- if (value.length <= 2) { // 0x
- return {
- type: 'number',
- value: value,
- isMalformed: true,
- pos: this.char
- };
- }
-
- if (index < length) {
- char = this.peek(index);
- if (isIdentifierStart(char)) {
- return null;
- }
- }
-
- return {
- type: 'number',
- value: value,
- base: 16,
- isMalformed: false,
- pos: this.char
- };
- }
-
- // Base-8 numbers.
- if (isOctalDigit(char)) {
- index += 1;
- value += char;
- bad = false;
-
- while (index < length) {
- char = this.peek(index);
-
- // Numbers like '019' (note the 9) are not valid octals
- // but we still parse them and mark as malformed.
-
- if (isDecimalDigit(char)) {
- bad = true;
- } else if (!isOctalDigit(char)) {
- break;
- }
- value += char;
- index += 1;
- }
-
- if (index < length) {
- char = this.peek(index);
- if (isIdentifierStart(char)) {
- return null;
- }
- }
-
- return {
- type: 'number',
- value: value,
- base: 8,
- isMalformed: false
- };
- }
-
- // Decimal numbers that start with '0' such as '09' are illegal
- // but we still parse them and return as malformed.
-
- if (isDecimalDigit(char)) {
- index += 1;
- value += char;
- }
- }
-
- while (index < length) {
- char = this.peek(index);
- if (!isDecimalDigit(char)) {
- break;
- }
+ if (value === "0") {
+ // Base-16 numbers.
+ if (char === "x" || char === "X") {
+ index += 1;
value += char;
- index += 1;
- }
- }
-
- // Decimal digits.
-
- if (char === ".") {
- value += char;
- index += 1;
-
- while (index < length) {
- char = this.peek(index);
- if (!isDecimalDigit(char)) {
- break;
- }
- value += char;
- index += 1;
- }
- }
-
- // Exponent part.
-
- if (char === "e" || char === "E") {
- value += char;
- index += 1;
- char = this.peek(index);
-
- if (char === "+" || char === "-") {
- value += this.peek(index);
- index += 1;
- }
-
- char = this.peek(index);
- if (isDecimalDigit(char)) {
- value += char;
- index += 1;
while (index < length) {
char = this.peek(index);
- if (!isDecimalDigit(char)) {
+ if (!isHexDigit(char)) {
break;
}
value += char;
index += 1;
}
- } else {
- return null;
- }
- }
- if (index < length) {
- char = this.peek(index);
- if (!this.isPunctuator(char)) {
- return null;
- }
- }
+ if (value.length <= 2) { // 0x
+ return {
+ type: 'number',
+ value: value,
+ isMalformed: true,
+ pos: this.char
+ };
+ }
- return {
- type: 'number',
- value: value,
- base: 10,
- pos: this.char,
- isMalformed: !isFinite(+value)
- };
- },
+ if (index < length) {
+ char = this.peek(index);
+ if (isIdentifierStart(char)) {
+ return null;
+ }
+ }
- isPunctuator: function (ch1) {
- switch (ch1) {
- case ".":
- case "(":
- case ")":
- case ",":
- case "{":
- case "}":
- return true;
- }
-
- return false;
- },
-
- scanPunctuator: function () {
- var ch1 = this.peek();
-
- if (this.isPunctuator(ch1)) {
- return {
- type: ch1,
- value: ch1,
- pos: this.char
- };
- }
-
- return null;
- },
-
- /*
- * Extract a string out of the next sequence of characters and/or
- * lines or return 'null' if its not possible. Since strings can
- * span across multiple lines this method has to move the char
- * pointer.
- *
- * This method recognizes pseudo-multiline JavaScript strings:
- *
- * var str = "hello\
- * world";
- */
- scanStringLiteral: function () {
- /*jshint loopfunc:true */
- var quote = this.peek();
-
- // String must start with a quote.
- if (quote !== "\"" && quote !== "'") {
- return null;
- }
-
- var value = "";
-
- this.skip();
-
- while (this.peek() !== quote) {
- if (this.peek() === "") { // End Of Line
return {
- type: 'string',
+ type: 'number',
value: value,
- isUnclosed: true,
- quote: quote,
+ base: 16,
+ isMalformed: false,
pos: this.char
};
}
- var char = this.peek();
- var jump = 1; // A length of a jump, after we're done
- // parsing this character.
+ // Base-8 numbers.
+ if (isOctalDigit(char)) {
+ index += 1;
+ value += char;
+ bad = false;
- value += char;
- this.skip(jump);
+ while (index < length) {
+ char = this.peek(index);
+
+ // Numbers like '019' (note the 9) are not valid octals
+ // but we still parse them and mark as malformed.
+
+ if (isDecimalDigit(char)) {
+ bad = true;
+ } if (!isOctalDigit(char)) {
+ // if the char is a non punctuator then its not a valid number
+ if (!this.isPunctuator(char)) {
+ return null;
+ }
+ break;
+ }
+ value += char;
+ index += 1;
+ }
+
+ if (index < length) {
+ char = this.peek(index);
+ if (isIdentifierStart(char)) {
+ return null;
+ }
+ }
+
+ return {
+ type: 'number',
+ value: value,
+ base: 8,
+ isMalformed: bad
+ };
+ }
+
+ // Decimal numbers that start with '0' such as '09' are illegal
+ // but we still parse them and return as malformed.
+
+ if (isDecimalDigit(char)) {
+ index += 1;
+ value += char;
+ }
}
- this.skip();
+ while (index < length) {
+ char = this.peek(index);
+ if (!isDecimalDigit(char)) {
+ break;
+ }
+ value += char;
+ index += 1;
+ }
+ }
+
+ // Decimal digits.
+
+ if (char === ".") {
+ value += char;
+ index += 1;
+
+ while (index < length) {
+ char = this.peek(index);
+ if (!isDecimalDigit(char)) {
+ break;
+ }
+ value += char;
+ index += 1;
+ }
+ }
+
+ // Exponent part.
+
+ if (char === "e" || char === "E") {
+ value += char;
+ index += 1;
+ char = this.peek(index);
+
+ if (char === "+" || char === "-") {
+ value += this.peek(index);
+ index += 1;
+ }
+
+ char = this.peek(index);
+ if (isDecimalDigit(char)) {
+ value += char;
+ index += 1;
+
+ while (index < length) {
+ char = this.peek(index);
+ if (!isDecimalDigit(char)) {
+ break;
+ }
+ value += char;
+ index += 1;
+ }
+ } else {
+ return null;
+ }
+ }
+
+ if (index < length) {
+ char = this.peek(index);
+ if (!this.isPunctuator(char)) {
+ return null;
+ }
+ }
+
+ return {
+ type: 'number',
+ value: value,
+ base: 10,
+ pos: this.char,
+ isMalformed: !isFinite(+value)
+ };
+ },
+
+ isPunctuator: function (ch1) {
+ switch (ch1) {
+ case ".":
+ case "(":
+ case ")":
+ case ",":
+ case "{":
+ case "}":
+ return true;
+ }
+
+ return false;
+ },
+
+ scanPunctuator: function () {
+ var ch1 = this.peek();
+
+ if (this.isPunctuator(ch1)) {
return {
- type: 'string',
- value: value,
- isUnclosed: false,
- quote: quote,
+ type: ch1,
+ value: ch1,
pos: this.char
};
- },
+ }
- };
+ return null;
+ },
+
+ /*
+ * Extract a string out of the next sequence of characters and/or
+ * lines or return 'null' if its not possible. Since strings can
+ * span across multiple lines this method has to move the char
+ * pointer.
+ *
+ * This method recognizes pseudo-multiline JavaScript strings:
+ *
+ * var str = "hello\
+ * world";
+ */
+ scanStringLiteral: function () {
+ /*jshint loopfunc:true */
+ var quote = this.peek();
+
+ // String must start with a quote.
+ if (quote !== "\"" && quote !== "'") {
+ return null;
+ }
+
+ var value = "";
+
+ this.skip();
+
+ while (this.peek() !== quote) {
+ if (this.peek() === "") { // End Of Line
+ return {
+ type: 'string',
+ value: value,
+ isUnclosed: true,
+ quote: quote,
+ pos: this.char
+ };
+ }
+
+ var char = this.peek();
+ var jump = 1; // A length of a jump, after we're done
+ // parsing this character.
+
+ value += char;
+ this.skip(jump);
+ }
+
+ this.skip();
+ return {
+ type: 'string',
+ value: value,
+ isUnclosed: false,
+ quote: quote,
+ pos: this.char
+ };
+ },
+
+};
diff --git a/public/app/plugins/datasource/graphite/parser.ts b/public/app/plugins/datasource/graphite/parser.ts
index bfafdda7815..5c5c618d227 100644
--- a/public/app/plugins/datasource/graphite/parser.ts
+++ b/public/app/plugins/datasource/graphite/parser.ts
@@ -100,10 +100,7 @@ Parser.prototype = {
},
metricExpression: function() {
- if (!this.match('templateStart') &&
- !this.match('identifier') &&
- !this.match('number') &&
- !this.match('{')) {
+ if (!this.match('templateStart') && !this.match('identifier') && !this.match('number') && !this.match('{')) {
return null;
}
diff --git a/public/app/plugins/datasource/graphite/plugin.json b/public/app/plugins/datasource/graphite/plugin.json
index c47c49e05fa..76242fd883c 100644
--- a/public/app/plugins/datasource/graphite/plugin.json
+++ b/public/app/plugins/datasource/graphite/plugin.json
@@ -8,6 +8,7 @@
],
"metrics": true,
+ "alerting": true,
"annotations": true,
"info": {
@@ -20,4 +21,4 @@
"large": "img/graphite_logo.png"
}
}
-}
\ No newline at end of file
+}
diff --git a/public/app/plugins/datasource/graphite/specs/lexer_specs.ts b/public/app/plugins/datasource/graphite/specs/lexer_specs.ts
index 1f4be736536..e68c17099fe 100644
--- a/public/app/plugins/datasource/graphite/specs/lexer_specs.ts
+++ b/public/app/plugins/datasource/graphite/specs/lexer_specs.ts
@@ -62,6 +62,14 @@ describe('when lexing graphite expression', function() {
expect(tokens[4].type).to.be('identifier');
});
+ it('should tokenize metric expression with segment that start with number', function() {
+ var lexer = new Lexer("metric.001-server");
+ var tokens = lexer.tokenize();
+ expect(tokens[0].type).to.be('identifier');
+ expect(tokens[2].type).to.be('identifier');
+ expect(tokens.length).to.be(3);
+ });
+
it('should tokenize func call with numbered metric and number arg', function() {
var lexer = new Lexer("scale(metric.10, 15)");
var tokens = lexer.tokenize();
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index eedf9c1badd..941591791ef 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -113,7 +113,6 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
throw response.error;
}
delete self.lastErrors.query;
-
_.each(response.data.data.result, function(metricData) {
result.push(self.transformMetricData(metricData, activeTargets[index], start, end));
});
@@ -124,6 +123,10 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
};
this.performTimeSeriesQuery = function(query, start, end) {
+ if (start > end) {
+ throw { message: 'Invalid time range' };
+ }
+
var url = '/api/v1/query_range?query=' + encodeURIComponent(query.expr) + '&start=' + start + '&end=' + end + '&step=' + query.step;
return this._request('GET', url, query.requestId);
};
diff --git a/public/app/plugins/datasource/prometheus/plugin.json b/public/app/plugins/datasource/prometheus/plugin.json
index f39f8691661..54fd1129b8b 100644
--- a/public/app/plugins/datasource/prometheus/plugin.json
+++ b/public/app/plugins/datasource/prometheus/plugin.json
@@ -8,6 +8,7 @@
],
"metrics": true,
+ "alerting": true,
"annotations": true,
"info": {
diff --git a/public/app/plugins/panel/graph/tab_axes.html b/public/app/plugins/panel/graph/axes_editor.html
similarity index 58%
rename from public/app/plugins/panel/graph/tab_axes.html
rename to public/app/plugins/panel/graph/axes_editor.html
index e85e266dd7d..4c89b5b8b73 100644
--- a/public/app/plugins/panel/graph/tab_axes.html
+++ b/public/app/plugins/panel/graph/axes_editor.html
@@ -40,6 +40,32 @@