From df60804937ee77c5b3f00905d4aee530ee72f2db Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Tue, 5 Mar 2019 15:03:15 +0100 Subject: [PATCH] use default min interval of 1m for sql datasources --- public/app/plugins/datasource/mssql/datasource.ts | 2 +- public/app/plugins/datasource/mysql/datasource.ts | 2 +- public/app/plugins/datasource/postgres/datasource.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts index 303cd0471d7..9343e0f3860 100644 --- a/public/app/plugins/datasource/mssql/datasource.ts +++ b/public/app/plugins/datasource/mssql/datasource.ts @@ -12,7 +12,7 @@ export class MssqlDatasource { this.name = instanceSettings.name; this.id = instanceSettings.id; this.responseParser = new ResponseParser(this.$q); - this.interval = (instanceSettings.jsonData || {}).timeInterval; + this.interval = (instanceSettings.jsonData || {}).timeInterval || '1m'; } interpolateVariable(value, variable) { diff --git a/public/app/plugins/datasource/mysql/datasource.ts b/public/app/plugins/datasource/mysql/datasource.ts index f0381d53b70..a864d42fcc4 100644 --- a/public/app/plugins/datasource/mysql/datasource.ts +++ b/public/app/plugins/datasource/mysql/datasource.ts @@ -15,7 +15,7 @@ export class MysqlDatasource { this.id = instanceSettings.id; this.responseParser = new ResponseParser(this.$q); this.queryModel = new MysqlQuery({}); - this.interval = (instanceSettings.jsonData || {}).timeInterval; + this.interval = (instanceSettings.jsonData || {}).timeInterval || '1m'; } interpolateVariable = (value, variable) => { diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts index 13948c5d793..be27cdd37b6 100644 --- a/public/app/plugins/datasource/postgres/datasource.ts +++ b/public/app/plugins/datasource/postgres/datasource.ts @@ -17,7 +17,7 @@ export class PostgresDatasource { this.jsonData = instanceSettings.jsonData; this.responseParser = new ResponseParser(this.$q); this.queryModel = new PostgresQuery({}); - this.interval = (instanceSettings.jsonData || {}).timeInterval; + this.interval = (instanceSettings.jsonData || {}).timeInterval || '1m'; } interpolateVariable = (value, variable) => {