mimirtool: use strings replacer in dashboards queries analyzer #8062
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cristiangreco
force-pushed
the
cristian/analyze-grafana-metrics-replacer
branch
from
d66c72d to
359a62f
Compare
When parsing queries from grafana dashboards, use a replacer with a list of variables rather than a regex matcher. The regex matcher works ok with ranges and subqueries, but is not working when the variables are used in other parts of the query (e.g. with `offset`). This PR switches back to using a list of variables to be replaced, partially reverting the changes from #6657, but uses a `strings.Replacer` for better readability.
cristiangreco
force-pushed
the
cristian/analyze-grafana-metrics-replacer
branch
from
359a62f to
6d5ed2b
Compare
colega
reviewed
May 6, 2024
pkg/mimirtool/analyze/grafana.go
Outdated
Comment on lines
28
to
29
| variableRangeQueryRangeRegex = regexp.MustCompile(`\[\$?\w+?]`) | ||
| variableSubqueryRangeRegex = regexp.MustCompile(`\[\$?\w+:\$?\w+?]`) |
There was a problem hiding this comment.
I'm not sure about removing these. I think they're there to cover the case of non-standard variable created by user (like $time_interval or whatever they'd want to create).
Unfortunately there's no test for that, but I'd also create one.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
When parsing queries from grafana dashboards, use a replacer with a list of variables rather than a regex matcher.
The regex matcher works ok with ranges and subqueries, but is not working when the variables are used in other parts of the query (e.g. with
offset).This PR switches back to using a list of variables to be replaced, partially reverting the changes from #6657, but uses a
strings.Replacerfor better readability.Which issue(s) this PR fixes or relates to
n.a.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.