Support UTF-8 label matchers: Add test for PromQL braces when parsing lists of matchers#3507
Merged
gotjosh merged 3 commits intoprometheus:mainfrom Sep 12, 2023
Conversation
4 tasks
grobinson-grafana
force-pushed
the
grobinson/add-test-for-promql-matchers
branch
2 times, most recently
from
e6827e7 to
7785118
Compare
Signed-off-by: George Robinson <george.robinson@grafana.com>
Collaborator
Author
|
@gotjosh could you restart |
Member
|
I don't think this is what I meant with #3453 (comment) My understanding is that the support of This is assuming that if we're all done with the parser today we'd have no actual coverage for this scenario - if you have any other ideas or I'm just completely off please feel free to tell me so. |
Signed-off-by: George Robinson <george.robinson@grafana.com>
Collaborator
Author
|
As discussed offline, we are going to replace the unit test with acceptance tests. I've just pushed that commit this morning, and so a second review would be great whenever convenient! 🙂 |
Signed-off-by: George Robinson <george.robinson@grafana.com>
| silence2 := Silence(0, 4).Match("foo").Comment("test foo") | ||
| silence1 := Silence(0, 4).Match("test1", "severity=warn").Comment("test1") | ||
| silence2 := Silence(0, 4).Match("alertname=test2", "severity=warn").Comment("test2") | ||
| silence3 := Silence(0, 4).Match("{alertname=test3}", "severity=warn").Comment("test3") |
Collaborator
Author
There was a problem hiding this comment.
@gotjosh here I create a silence with the following labels:
alertname="{alertname=test3}"
severity=warn
We will be able to then see this behaviour break when we use the new fallback parser as without the additional check we talked about in #3453 (comment), it will create a silence with the following labels instead:
alertname=test3
severity=warn
qinxx108
pushed a commit
to qinxx108/alertmanager
that referenced
this pull request
Sep 13, 2023
…#3507) * Add test for PromQL braces when parsing lists of matchers Signed-off-by: George Robinson <george.robinson@grafana.com> * Use acceptance tests Signed-off-by: George Robinson <george.robinson@grafana.com> * Add test creating silence with braces Signed-off-by: George Robinson <george.robinson@grafana.com> --------- Signed-off-by: George Robinson <george.robinson@grafana.com> Signed-off-by: Yijie Qin <qinyijie@amazon.com>
grobinson-grafana
changed the title
qinxx108
pushed a commit
to qinxx108/alertmanager
that referenced
this pull request
Sep 14, 2023
…#3507) * Add test for PromQL braces when parsing lists of matchers Signed-off-by: George Robinson <george.robinson@grafana.com> * Use acceptance tests Signed-off-by: George Robinson <george.robinson@grafana.com> * Add test creating silence with braces Signed-off-by: George Robinson <george.robinson@grafana.com> --------- Signed-off-by: George Robinson <george.robinson@grafana.com> Signed-off-by: Yijie Qin <qinyijie@amazon.com>
alexweav
pushed a commit
to grafana/prometheus-alertmanager
that referenced
this pull request
Oct 27, 2023
…#3507) * Add test for PromQL braces when parsing lists of matchers Signed-off-by: George Robinson <george.robinson@grafana.com> * Use acceptance tests Signed-off-by: George Robinson <george.robinson@grafana.com> * Add test creating silence with braces Signed-off-by: George Robinson <george.robinson@grafana.com> --------- Signed-off-by: George Robinson <george.robinson@grafana.com>
alexweav
pushed a commit
to grafana/prometheus-alertmanager
that referenced
this pull request
Oct 27, 2023
…#3507) * Add test for PromQL braces when parsing lists of matchers Signed-off-by: George Robinson <george.robinson@grafana.com> * Use acceptance tests Signed-off-by: George Robinson <george.robinson@grafana.com> * Add test creating silence with braces Signed-off-by: George Robinson <george.robinson@grafana.com> --------- Signed-off-by: George Robinson <george.robinson@grafana.com>
SuperQ
added a commit
that referenced
this pull request
Oct 16, 2024
* [CHANGE] Deprecate and remove api/v1/ #2970 * [CHANGE] Remove unused feature flags #3676 * [CHANGE] Newlines in smtp password file are now ignored #3681 * [CHANGE] Change compat metrics to counters #3686 * [CHANGE] Do not register compat metrics in amtool #3713 * [CHANGE] Remove metrics from compat package #3714 * [CHANGE] Mark muted alerts #3793 * [FEATURE] Add metric for inhibit rules #3681 * [FEATURE] Support UTF-8 label matchers #3453, #3507, #3523, #3483, #3567, #3568, #3569, #3571, #3595, #3604, #3619, #3658, #3659, #3662, #3668, 3572 * [FEATURE] Add counter to track alerts dropped outside of time_intervals #3565 * [FEATURE] Add date and tz functions to templates #3812 * [FEATURE] Add limits for silences #3852 * [FEATURE] Add time helpers for templates #3863 * [FEATURE] Add auto GOMAXPROCS #3837 * [FEATURE] Add auto GOMEMLIMIT #3895 * [FEATURE] Add Jira receiver integration #3590 * [ENHANCEMENT] Add the receiver name to notification metrics #3045 * [ENHANCEMENT] Add the route ID to uuid #3372 * [ENHANCEMENT] Add duration to the notify success message #3559 * [ENHANCEMENT] Implement webhook_url_file for discord and msteams #3555 * [ENHANCEMENT] Add debug logs for muted alerts #3558 * [ENHANCEMENT] API: Allow the Silences API to use their own 400 response #3610 * [ENHANCEMENT] Add summary to msteams notification #3616 * [ENHANCEMENT] Add context reasons to notifications failed counter #3631 * [ENHANCEMENT] Add optional native histogram support to latency metrics #3737 * [ENHANCEMENT] Enable setting ThreadId for Telegram notifications #3638 * [ENHANCEMENT] Allow webex roomID from template #3801 * [BUGFIX] Add missing integrations to notify metrics #3480 * [BUGFIX] Add missing ttl in pushhover #3474 * [BUGFIX] Fix scheme required for webhook url in amtool #3409 * [BUGFIX] Remove duplicate integration from metrics #3516 * [BUGFIX] Reflect Discord's max length message limits #3597 * [BUGFIX] Fix nil error in warn logs about incompatible matchers #3683 * [BUGFIX] Fix a small number of inconsistencies in compat package logging #3718 * [BUGFIX] Fix log line in featurecontrol #3719 * [BUGFIX] Fix panic in acceptance tests #3592 * [BUGFIX] Fix flaky test TestClusterJoinAndReconnect/TestTLSConnection #3722 * [BUGFIX] Fix crash on errors when url_file is used #3800 * [BUGFIX] Fix race condition in dispatch.go #3826 * [BUGFIX] Fix race conditions in the memory alerts store #3648 * [BUGFIX] Hide config.SecretURL when the URL is incorrect. #3887 * [BUGFIX] Fix invalid silence causes incomplete updates #3898 * [BUGFIX] Fix leaking of Silences matcherCache entries #3930 * [BUGFIX] Close SMTP submission correctly to handle errors #4006 Signed-off-by: SuperQ <superq@gmail.com>
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This pull request has been added to address the discussion #3453 (comment). Should be merged before #3483.