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

Merge remote-tracking branch 'upstream/master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-07-30 15:23:56 +02:00
parent ace999b13f e648ed197f
commit 6613f11499
15 changed files with 168 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/postgres/partials/query.editor.html
View File

@@ -132,7 +132,10 @@
<pre class="gf-form-pre alert alert-info">Time series:
- return column named <i>time</i> (UTC in seconds or timestamp)
- return column(s) with numeric datatype as values
- (Optional: return column named <i>metric</i> to represent the series name. If no column named metric is found the column name of the value column is used as series name)
Optional:
- return column named <i>metric</i> to represent the series name.
- If multiple value columns are returned the metric column is used as prefix.
- If no column named metric is found the column name of the value column is used as series name
Table:
- return any set of columns