mirror of
https://github.com/grafana/grafana.git
synced 2025-08-03 06:12:20 +08:00
d1c9760fa8
* add postgresql datasource * add rest of files for postgres datasource * fix timeseries query, remove unused code * consistent naming, refactoring * s/mysql/postgres/ * s/mysql/postgres/ * couple more tests * tests for more datatypes * fix macros for postgres * add __timeSec macro * add frontend for postgres datasource * adjust documentation * fix formatting * add proper plugin description * merge editor changes from mysql * port changes from mysql datasource * set proper defaultQuery for postgres * add time_sec to timeseries query accept int for value for timeseries query * revert allowing time_sec and handle int or float values as unix timestamp for "time" column * fix tslint error * handle decimal values in timeseries query * allow setting sslmode for postgres datasource * use type switch for handling data types * fix value for timeseries query * refactor timeseries queries to make them more flexible * remove debug statement from inner loop in type conversion * use plain for loop in getTypedRowData * fix timeseries queries * adjust postgres datasource to tsdb refactoring * adjust postgres datasource to frontend changes * update lib/pq to latest version * move type conversion to getTypedRowData * handle address types cidr, inet and macaddr * adjust response parser and docs for annotations * convert unknown types to string * add documentation for postgres datasource * add another example query with metric column * set more helpful default query * update help text in query editor * handle NULL in value column of timeseries query * add __timeGroup macro * add test for __timeGroup macro * document __timeGroup and set proper default query for annotations * fix typos in docs * add postgres to list of datasources * add postgres to builtInPlugins * mysql: refactoring as prep for merging postgres Refactors out the initialization of the xorm engine and the query logic for an sql data source. * mysql: rename refactoring + test update * postgres:refactor to use SqlEngine(same as mysql) Refactored to use a common base class with the MySql data source. Other changes from the original PR: - Changed time column to be time_sec to allow other time units in the future and to be the same as MySQL - Changed integration test to test the main Query method rather than the private transformToTable method - Changed the __timeSec macro name to __timeEpoch - Renamed PostgresExecutor to PostgresQueryEndpoint Fixes #9209 (the original PR) * postgres: encrypt password on config page With some other cosmetic changes to the config page: - placeholder texts - reset button for the password after it has been encrypted. - default value for the sslmode field. * postgres: change back col name to time from time_sec * postgres mysql: remove annotation title Title has been removed from annotations * postgres: fix images for docs page * postgres mysql: fix specs
69 lines
2.6 KiB
HTML
69 lines
2.6 KiB
HTML
<query-editor-row query-ctrl="ctrl" can-collapse="false">
|
|
<div class="gf-form-inline">
|
|
<div class="gf-form gf-form--grow">
|
|
<code-editor content="ctrl.target.rawSql" datasource="ctrl.datasource" on-change="ctrl.panelCtrl.refresh()" data-mode="sql">
|
|
</code-editor>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="gf-form-inline">
|
|
<div class="gf-form">
|
|
<label class="gf-form-label query-keyword">Format as</label>
|
|
<div class="gf-form-select-wrapper">
|
|
<select class="gf-form-input gf-size-auto" ng-model="ctrl.target.format" ng-options="f.value as f.text for f in ctrl.formats" ng-change="ctrl.refresh()"></select>
|
|
</div>
|
|
</div>
|
|
<div class="gf-form">
|
|
<label class="gf-form-label query-keyword" ng-click="ctrl.showHelp = !ctrl.showHelp">
|
|
Show Help
|
|
<i class="fa fa-caret-down" ng-show="ctrl.showHelp"></i>
|
|
<i class="fa fa-caret-right" ng-hide="ctrl.showHelp"></i>
|
|
</label>
|
|
</div>
|
|
<div class="gf-form" ng-show="ctrl.lastQueryMeta">
|
|
<label class="gf-form-label query-keyword" ng-click="ctrl.showLastQuerySQL = !ctrl.showLastQuerySQL">
|
|
Generated SQL
|
|
<i class="fa fa-caret-down" ng-show="ctrl.showLastQuerySQL"></i>
|
|
<i class="fa fa-caret-right" ng-hide="ctrl.showLastQuerySQL"></i>
|
|
</label>
|
|
</div>
|
|
<div class="gf-form gf-form--grow">
|
|
<div class="gf-form-label gf-form-label--grow"></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="gf-form" ng-show="ctrl.showLastQuerySQL">
|
|
<pre class="gf-form-pre">{{ctrl.lastQueryMeta.sql}}</pre>
|
|
</div>
|
|
|
|
<div class="gf-form" ng-show="ctrl.showHelp">
|
|
<pre class="gf-form-pre alert alert-info">Time series:
|
|
- return column named time_sec (UTC in seconds), use UNIX_TIMESTAMP(column)
|
|
- return column named value for the time point value
|
|
- return column named metric to represent the series name
|
|
|
|
Table:
|
|
- return any set of columns
|
|
|
|
Macros:
|
|
- $__time(column) -> UNIX_TIMESTAMP(column) as time_sec
|
|
- $__timeFilter(column) -> UNIX_TIMESTAMP(time_date_time) ≥ 1492750877 AND UNIX_TIMESTAMP(time_date_time) ≤ 1492750877
|
|
- $__unixEpochFilter(column) -> time_unix_epoch > 1492750877 AND time_unix_epoch < 1492750877
|
|
- $__timeGroup(column,'5m') -> (extract(epoch from "dateColumn")/extract(epoch from '5m'::interval))::int
|
|
|
|
Or build your own conditionals using these macros which just return the values:
|
|
- $__timeFrom() -> FROM_UNIXTIME(1492750877)
|
|
- $__timeTo() -> FROM_UNIXTIME(1492750877)
|
|
- $__unixEpochFrom() -> 1492750877
|
|
- $__unixEpochTo() -> 1492750877
|
|
</pre>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="gf-form" ng-show="ctrl.lastQueryError">
|
|
<pre class="gf-form-pre alert alert-error">{{ctrl.lastQueryError}}</pre>
|
|
</div>
|
|
|
|
</query-editor-row>
|