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
b483d42d
Unverified
Commit
b483d42d
authored
Jan 11, 2018
by
Dan Cech
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix issue with metric find & functions being loaded multiple times
parent
60ba6ee6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
public/app/plugins/datasource/graphite/datasource.ts
+3
-1
public/app/plugins/datasource/graphite/query_ctrl.ts
+1
-1
No files found.
public/app/plugins/datasource/graphite/datasource.ts
View file @
b483d42d
...
@@ -429,7 +429,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
...
@@ -429,7 +429,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
url
:
'/functions'
,
url
:
'/functions'
,
};
};
return
self
self
.
funcDefs
=
self
.
doGraphiteRequest
(
httpOptions
)
.
doGraphiteRequest
(
httpOptions
)
.
then
(
results
=>
{
.
then
(
results
=>
{
if
(
results
.
status
!==
200
||
typeof
results
.
data
!==
'object'
)
{
if
(
results
.
status
!==
200
||
typeof
results
.
data
!==
'object'
)
{
...
@@ -530,6 +530,8 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
...
@@ -530,6 +530,8 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
self
.
funcDefs
=
gfunc
.
getFuncDefs
(
self
.
graphiteVersion
);
self
.
funcDefs
=
gfunc
.
getFuncDefs
(
self
.
graphiteVersion
);
return
self
.
funcDefs
;
return
self
.
funcDefs
;
});
});
return
self
.
funcDefs
;
};
};
this
.
testDatasource
=
function
()
{
this
.
testDatasource
=
function
()
{
...
...
public/app/plugins/datasource/graphite/query_ctrl.ts
View file @
b483d42d
...
@@ -106,7 +106,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
...
@@ -106,7 +106,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
}
}
getAltSegments
(
index
,
prefix
)
{
getAltSegments
(
index
,
prefix
)
{
var
query
=
'*'
+
prefix
+
'*'
;
var
query
=
prefix
&&
prefix
.
length
>
0
?
'*'
+
prefix
+
'*'
:
'*'
;
if
(
index
>
0
)
{
if
(
index
>
0
)
{
query
=
this
.
queryModel
.
getSegmentPathUpTo
(
index
)
+
'.'
+
query
;
query
=
this
.
queryModel
.
getSegmentPathUpTo
(
index
)
+
'.'
+
query
;
}
}
...
...
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