IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

mysql: added default query template

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-04-21 16:28:01 +02:00
parent ea53e7221e
commit b22b3e5bb9
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/sqlstore/sql_test_data.go
View File

@ -61,11 +61,6 @@ func InsertSqlTestData(cmd *m.InsertSqlTestDataCommand) error {
sqlRandomWalk("server2", "frontend", 100, 1.123, sess) sqlRandomWalk("server2", "frontend", 100, 1.123, sess)
sqlRandomWalk("server3", "frontend", 100, 1.123, sess) sqlRandomWalk("server3", "frontend", 100, 1.123, sess)
sqlRandomWalk("server1", "backend", 100, 1.123, sess)
sqlRandomWalk("server2", "backend", 100, 1.123, sess)
sqlRandomWalk("server3", "backend", 100, 1.123, sess)
sqlRandomWalk("db-server1", "backend", 100, 1.123, sess)
return err return err
}) })
} }

15
public/app/plugins/datasource/mysql/module.ts
View File

@ -9,12 +9,23 @@ export interface MysqlQuery {
refId: string; refId: string;
format: string; format: string;
alias: string; alias: string;
rawSql: string;
} }
export interface QueryMeta { export interface QueryMeta {
sql: string; sql: string;
} }
var defaulQuery = `SELECT
UNIX_TIMESTAMP(<time_column>) as time_sec,
<value column> as value,
<series name column> as metric
FROM <table name>
WHERE $__timeFilter(time_column)
ORDER BY <time_column> ASC
`;
class MysqlQueryCtrl extends QueryCtrl { class MysqlQueryCtrl extends QueryCtrl {
static templateUrl = 'partials/query.editor.html'; static templateUrl = 'partials/query.editor.html';
@ -35,6 +46,10 @@ class MysqlQueryCtrl extends QueryCtrl {
{text: 'Table', value: 'table'}, {text: 'Table', value: 'table'},
]; ];
if (!this.target.rawSql) {
this.target.rawSql = defaulQuery;
}
this.panelCtrl.events.on('data-received', this.onDataReceived.bind(this), $scope); this.panelCtrl.events.on('data-received', this.onDataReceived.bind(this), $scope);
this.panelCtrl.events.on('data-error', this.onDataError.bind(this), $scope); this.panelCtrl.events.on('data-error', this.onDataError.bind(this), $scope);
} }