Test and fix custom labels support in mixin #1697
Merged
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
pracucci
commented
Apr 13, 2022
| @@ -1,10 +1,10 @@ | |||
| { | |||
| prometheusAlerts+:: | |||
| { _config:: $._config + $._group_config } + | |||
There was a problem hiding this comment.
Moved here so I can extend _config in alert-utils.libsonnet.
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
osg-grafana
reviewed
Apr 13, 2022
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com> Signed-off-by: Marco Pracucci <marco@pracucci.com>
pracucci
force-pushed
the
add-mixin-tests
branch
from
196938a
to
de4c989
Compare
replay
reviewed
Apr 14, 2022
replay
reviewed
Apr 14, 2022
replay
approved these changes
Apr 14, 2022
|
I will wait next week before merging, both to give the opportunity to other engineers to review it and not deploy these alerts changes right before Easter. |
|
I double checked the compiled alerts, manually tested few alerts and changes LGTM. Going to merge it. |
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
We just merged #1651 which adds support to customise the cluster label. We already had config options to customise the instance (eg. pod) and node labels.
However, are we relatively confident the labels customization is applied everywhere? It's very difficult to spot during code reviews, so I though if we could add any test. In this PR I'm proposing to introduce a basic test (in bash) checking if, after renaming cluster/instance/node labels, they're still used somewhere.
Thanks to these tests, I've spot several issues that I'm fixing in this PR too. In theory this PR should be a noop when mixin is compiled with default config, but you will see diff in
operations/mimir-mixin-compiled/alerts.yaml. Reason is that fix these issues I changed the usage of hardcodedinstancelabel with the configured one which ispod. At Grafana Labs,instanceandpodlabels can be used interchangeably, because they both identify the pod.Which issue(s) this PR fixes or relates to
N/A
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]