IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 04:59:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

autodetect timescaledb when version >= 9.6

Browse Source
This commit is contained in:
Sven Klemm 2018-08-15 10:41:06 +02:00
parent 2d12801186
commit a2f4441f9d
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/plugins/datasource/postgres/config_ctrl.ts
View File

@ -11,21 +11,27 @@ export class PostgresConfigCtrl {
this.datasourceSrv = datasourceSrv;
this.current.jsonData.sslmode = this.current.jsonData.sslmode || 'verify-full';
this.current.jsonData.postgresVersion = this.current.jsonData.postgresVersion || 903;
this.autoDetectPostgresVersion();
this.autoDetectFeatures();
}
autoDetectPostgresVersion() {
autoDetectFeatures() {
if (!this.current.id) {
return;
}
this.datasourceSrv
.loadDatasource(this.current.name)
.then(ds => {
return ds.getVersion();
})
.then(version => {
this.datasourceSrv.loadDatasource(this.current.name).then(ds => {
return ds.getVersion().then(version => {
version = Number(version[0].text);
// timescaledb is only available for 9.6+
if (version >= 906) {
ds.getTimescaleDBVersion().then(version => {
if (version.length === 1) {
this.current.jsonData.timescaledb = true;
}
});
}
let major = Math.trunc(version / 100);
let minor = version % 100;
let name = String(major);
@ -37,6 +43,7 @@ export class PostgresConfigCtrl {
}
this.current.jsonData.postgresVersion = version;
});
});
}
// the value portion is derived from postgres server_version_num/100

4
public/app/plugins/datasource/postgres/datasource.ts
View File

@ -128,6 +128,10 @@ export class PostgresDatasource {
return this.metricFindQuery("SELECT current_setting('server_version_num')::int/100", {});
}
getTimescaleDBVersion() {
return this.metricFindQuery("SELECT extversion FROM pg_extension WHERE extname = 'timescaledb'", {});
}
testDatasource() {
return this.metricFindQuery('SELECT 1', {})
.then(res => {