Alerting: Fix ambiguous handling of equals in labels when bucketing Loki state history streams #65013
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
alexweav
added
type/bug
area/alerting
alexweav
commented
Mar 19, 2023
| @@ -248,7 +248,12 @@ func statesToStreams(rule history_model.RuleMeta, states []state.StateTransition | |||
| labels[RuleUIDLabel] = fmt.Sprint(rule.UID) | |||
| labels[GroupLabel] = fmt.Sprint(rule.Group) | |||
| labels[FolderUIDLabel] = fmt.Sprint(rule.NamespaceUID) | |||
| repr := labels.String() | |||
| lblJsn, err := json.Marshal(labels) | |||
There was a problem hiding this comment.
Choice of JSON as a stable representation was somewhat arbitrary.
- Hash of labels also works and is more compact. But, we're also relying on the labels being parseable later on, so we'd need to store the labels again separately, which undoes any memory savings.
data.LabelsFromString(...)already understands JSON, so no code changes needed on parse side.
gotjosh
approved these changes
Mar 20, 2023
alexweav
force-pushed
the
alexweav/handle-equals
branch
from
3f57c32
to
5d83ba6
Compare
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-65013-to-v9.4.x origin/v9.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x cc7e5ce62e314af09d59260ec385f531e88bf353
# Push it to GitHub
git push --set-upstream origin backport-65013-to-v9.4.x
git switch main
# Remove the local backport branch
git branch -D backport-65013-to-v9.4.xThen, create a pull request where the |
grafanabot
added
the
backport-failed
gotjosh
pushed a commit
that referenced
this pull request
Mar 27, 2023
…oki state history streams (#65013) * Use JSON instead of data.Labels string format as label repr * Drop debug log line
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 is this feature?
grafana-plugin-sdk'sdata.Labelstype is the canonical dataframe type for handling labels.Its
LabelsFromString()andString()methods break on labels containing=. The format it uses is ambiguous.We also can't use prometheus Labels format, its repr is also ambiguous around equals. Grafana's labels are a superset of Prometheus labels.
With this PR, we use a stable representation.
Why do we need this feature?
Allow equals to be used without issues.
Which issue(s) does this PR fix?:
Fixes #65012
Special notes for your reviewer: