Commit 5548aa7c by Torkel Ödegaard Committed by GitHub

Merge pull request #15799 from grafana/15614_fix

use default min interval of 1m for sql datasources
parents 281d9f60 df608049
...@@ -12,7 +12,7 @@ export class MssqlDatasource { ...@@ -12,7 +12,7 @@ export class MssqlDatasource {
this.name = instanceSettings.name; this.name = instanceSettings.name;
this.id = instanceSettings.id; this.id = instanceSettings.id;
this.responseParser = new ResponseParser(this.$q); this.responseParser = new ResponseParser(this.$q);
this.interval = (instanceSettings.jsonData || {}).timeInterval; this.interval = (instanceSettings.jsonData || {}).timeInterval || '1m';
} }
interpolateVariable(value, variable) { interpolateVariable(value, variable) {
......
...@@ -15,7 +15,7 @@ export class MysqlDatasource { ...@@ -15,7 +15,7 @@ export class MysqlDatasource {
this.id = instanceSettings.id; this.id = instanceSettings.id;
this.responseParser = new ResponseParser(this.$q); this.responseParser = new ResponseParser(this.$q);
this.queryModel = new MysqlQuery({}); this.queryModel = new MysqlQuery({});
this.interval = (instanceSettings.jsonData || {}).timeInterval; this.interval = (instanceSettings.jsonData || {}).timeInterval || '1m';
} }
interpolateVariable = (value, variable) => { interpolateVariable = (value, variable) => {
......
...@@ -17,7 +17,7 @@ export class PostgresDatasource { ...@@ -17,7 +17,7 @@ export class PostgresDatasource {
this.jsonData = instanceSettings.jsonData; this.jsonData = instanceSettings.jsonData;
this.responseParser = new ResponseParser(this.$q); this.responseParser = new ResponseParser(this.$q);
this.queryModel = new PostgresQuery({}); this.queryModel = new PostgresQuery({});
this.interval = (instanceSettings.jsonData || {}).timeInterval; this.interval = (instanceSettings.jsonData || {}).timeInterval || '1m';
} }
interpolateVariable = (value, variable) => { interpolateVariable = (value, variable) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment