Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
373389c9
Commit
373389c9
authored
Dec 06, 2017
by
Sven Klemm
Committed by
Daniel Lee
Dec 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
treat any text column in timeseries query as metric name unless column (#9985)
named metric is present
parent
48d9d0d3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
1 deletions
+14
-1
pkg/tsdb/postgres/postgres.go
+14
-1
No files found.
pkg/tsdb/postgres/postgres.go
View file @
373389c9
...
...
@@ -142,8 +142,13 @@ func (e PostgresQueryEndpoint) getTypedRowData(rows *core.Rows) (tsdb.RowValues,
func
(
e
PostgresQueryEndpoint
)
transformToTimeSeries
(
query
*
tsdb
.
Query
,
rows
*
core
.
Rows
,
result
*
tsdb
.
QueryResult
)
error
{
pointsBySeries
:=
make
(
map
[
string
]
*
tsdb
.
TimeSeries
)
seriesByQueryOrder
:=
list
.
New
()
columnNames
,
err
:=
rows
.
Columns
()
if
err
!=
nil
{
return
err
}
columnTypes
,
err
:=
rows
.
ColumnTypes
()
if
err
!=
nil
{
return
err
}
...
...
@@ -153,13 +158,21 @@ func (e PostgresQueryEndpoint) transformToTimeSeries(query *tsdb.Query, rows *co
timeIndex
:=
-
1
metricIndex
:=
-
1
// check columns of resultset
// check columns of resultset: a column named time is mandatory
// the first text column is treated as metric name unless a column named metric is present
for
i
,
col
:=
range
columnNames
{
switch
col
{
case
"time"
:
timeIndex
=
i
case
"metric"
:
metricIndex
=
i
default
:
if
metricIndex
==
-
1
{
switch
columnTypes
[
i
]
.
DatabaseTypeName
()
{
case
"UNKNOWN"
,
"TEXT"
,
"VARCHAR"
,
"CHAR"
:
metricIndex
=
i
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment