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 pull request #12679 from svenklemm/postgres-metric-prefix

Browse Source 
Use metric column as prefix when returning multiple value columns
This commit is contained in:
Marcus Efraimsson
2018-07-30 14:50:11 +02:00
committed by GitHub
parent e4983cba2f 8a22129177
commit e648ed197f
13 changed files with 166 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/mssql/partials/query.editor.html
View File

@@ -39,9 +39,11 @@
<div class="gf-form" ng-show="ctrl.showHelp">
<pre class="gf-form-pre alert alert-info">Time series:
- return column named time (in UTC), as a unix time stamp or any sql native date data type. You can use the macros below.
- optional: return column named metric to represent the series names.
- any other columns returned will be the time point values.
- if multiple value columns are present and a metric column is provided. the series name will be the combination of "MetricName - ValueColumnName".
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

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

@@ -40,7 +40,10 @@
<pre class="gf-form-pre alert alert-info">Time series:
- return column named time or time_sec (in UTC), as a unix time stamp or any sql native date data type. You can use the macros below.
- 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

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

@@ -40,7 +40,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