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
6ace01fb
Unverified
Commit
6ace01fb
authored
Aug 21, 2018
by
Marcus Efraimsson
Committed by
GitHub
Aug 21, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12893 from grafana/davkal/12889-explore-fix-rate-filter
Explore: Fix label filtering for rate queries
parents
dc608483
dd796bfb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
+2
-1
public/app/plugins/datasource/prometheus/datasource.ts
+1
-1
public/app/plugins/datasource/prometheus/specs/datasource.test.ts
+1
-0
No files found.
public/app/plugins/datasource/prometheus/datasource.ts
View file @
6ace01fb
...
...
@@ -39,7 +39,7 @@ export function addLabelToQuery(query: string, key: string, value: string): stri
// Add empty selector to bare metric name
let
previousWord
;
query
=
query
.
replace
(
/
(\w
+
)\b(?![\(
{=",
])
/g
,
(
match
,
word
,
offset
)
=>
{
query
=
query
.
replace
(
/
(\w
+
)\b(?![\(
\]
{=",
])
/g
,
(
match
,
word
,
offset
)
=>
{
// Check if inside a selector
const
nextSelectorStart
=
query
.
slice
(
offset
).
indexOf
(
'{'
);
const
nextSelectorEnd
=
query
.
slice
(
offset
).
indexOf
(
'}'
);
...
...
public/app/plugins/datasource/prometheus/specs/datasource.test.ts
View file @
6ace01fb
...
...
@@ -375,6 +375,7 @@ describe('PrometheusDatasource', () => {
expect(addLabelToQuery('
foo
{
instance
=
"my-host.com:9100"
}
', '
bar
', '
baz
')).toBe(
'
foo
{
bar
=
"baz"
,
instance
=
"my-host.com:9100"
}
'
);
expect(addLabelToQuery('
rate
(
metric
[
1
m
])
', '
foo
', '
bar
')).toBe('
rate
(
metric
{
foo
=
"bar"
}[
1
m
])
');
});
});
...
...
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