opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

make metricColumn functional

Browse Source
This commit is contained in:
Sven Klemm
2018-02-03 18:26:57 +01:00
parent 01a1737ddb
commit 382a525477
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/plugins/datasource/postgres/query_ctrl.ts
View File

@ -27,7 +27,9 @@ export class PostgresQueryCtrl extends QueryCtrl {
showHelp: boolean; showHelp: boolean;
schemaSegment: any; schemaSegment: any;
tableSegment: any; tableSegment: any;
whereSegment: any;
timeColumnSegment: any; timeColumnSegment: any;
metricColumnSegment: any;
selectMenu: any; selectMenu: any;
groupBySegment: any; groupBySegment: any;
@ -58,6 +60,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
} }
this.timeColumnSegment = uiSegmentSrv.newSegment(this.target.timeColumn); this.timeColumnSegment = uiSegmentSrv.newSegment(this.target.timeColumn);
this.metricColumnSegment = uiSegmentSrv.newSegment(this.target.metricColumn);
this.buildSelectMenu(); this.buildSelectMenu();
this.groupBySegment = this.uiSegmentSrv.newPlusButton(); this.groupBySegment = this.uiSegmentSrv.newPlusButton();
@ -122,11 +125,11 @@ export class PostgresQueryCtrl extends QueryCtrl {
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
} }
getColumnSegments() { getMetricColumnSegments() {
var columnQuery = "SELECT column_name FROM information_schema.columns WHERE "; var columnQuery = "SELECT column_name FROM information_schema.columns WHERE ";
columnQuery += " table_schema = '" + this.target.schema + "'"; columnQuery += " table_schema = '" + this.target.schema + "'";
columnQuery += " AND table_name = '" + this.target.table + "'"; columnQuery += " AND table_name = '" + this.target.table + "'";
columnQuery += " AND data_type IN ('bigint','integer','double precision','real');"; columnQuery += " AND data_type IN ('text','char','varchar');";
return this.datasource return this.datasource
.metricFindQuery(columnQuery) .metricFindQuery(columnQuery)
@ -145,7 +148,12 @@ export class PostgresQueryCtrl extends QueryCtrl {
} }
timeColumnChanged() { timeColumnChanged() {
this.target.time = this.timeColumnSegment.value; this.target.timeColumn = this.timeColumnSegment.value;
this.panelCtrl.refresh();
}
metricColumnChanged() {
this.target.metricColumn = this.metricColumnSegment.value;
this.panelCtrl.refresh(); this.panelCtrl.refresh();
} }