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
c3f1d1a6
Commit
c3f1d1a6
authored
May 13, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(influxdb): fixes extra semi colon due to hidden series
closes #5005
parent
ac674bd4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
CHANGELOG.md
+1
-0
public/app/plugins/datasource/influxdb/datasource.ts
+7
-3
No files found.
CHANGELOG.md
View file @
c3f1d1a6
...
...
@@ -3,6 +3,7 @@
*
**Templating**
: Fixed issue mixing row repeat and panel repeats, fixes
[
#4988
](
https://github.com/grafana/grafana/issues/4988
)
*
**Templating**
: Fixed issue detecting dependencies in nested variables, fixes
[
#4987
](
https://github.com/grafana/grafana/issues/4987
)
, fixes
[
#4986
](
https://github.com/grafana/grafana/issues/4986
)
*
**Graph**
: Fixed broken PNG rendering in graph panel, fixes
[
#5025
](
https://github.com/grafana/grafana/issues/5025
)
*
**Influxdb**
: Fixes crash when hiding middle serie, fixes
[
#5005
](
https://github.com/grafana/grafana/issues/5005
)
# 3.0.1 Stable (2016-05-11)
...
...
public/app/plugins/datasource/influxdb/datasource.ts
View file @
c3f1d1a6
...
...
@@ -45,7 +45,7 @@ export default class InfluxDatasource {
var
i
,
y
;
var
allQueries
=
_
.
map
(
options
.
targets
,
(
target
)
=>
{
if
(
target
.
hide
)
{
return
[]
;
}
if
(
target
.
hide
)
{
return
""
;
}
queryTargets
.
push
(
target
);
...
...
@@ -54,8 +54,12 @@ export default class InfluxDatasource {
var
query
=
queryModel
.
render
(
true
);
query
=
query
.
replace
(
/
\$
interval/g
,
(
target
.
interval
||
options
.
interval
));
return
query
;
}).
join
(
";"
);
}).
reduce
((
acc
,
current
)
=>
{
if
(
current
!==
""
)
{
acc
+=
";"
+
current
;
}
return
acc
;
});
// replace grafana variables
allQueries
=
allQueries
.
replace
(
/
\$
timeFilter/g
,
timeFilter
);
...
...
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