fix: cluster_id label override in mixins #12570
Closed
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
QuentinBisson
force-pushed
the
fix-cluster-id-label-in-mixins
branch
from
8b55e43 to
7b47792
Compare
1 task
|
@MichelHollands could you take a look? |
QuentinBisson
force-pushed
the
fix-cluster-id-label-in-mixins
branch
from
577f488 to
7c39caa
Compare
QuentinBisson
force-pushed
the
fix-cluster-id-label-in-mixins
branch
from
7c39caa to
9b9ceb2
Compare
QuentinBisson
commented
Apr 11, 2024
| for: 5m | ||
| labels: | ||
| severity: warning | ||
| - name: loki_alerts |
There was a problem hiding this comment.
Extra spaces are added when regenerating
QuentinBisson
commented
Apr 11, 2024
| @@ -63,7 +63,7 @@ | |||
| "steppedLine": false, | |||
| "targets": [ | |||
| { | |||
| "expr": "sum(go_goroutines{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\"})", | |||
| "expr": "sum(go_goroutines{cluster=~\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\"})", | |||
There was a problem hiding this comment.
Replacing all cluster=\"$cluster\" with cluster=~\"$cluster\" to be the same on all clusters
QuentinBisson
force-pushed
the
fix-cluster-id-label-in-mixins
branch
from
9b9ceb2 to
7764cd2
Compare
QuentinBisson
commented
Apr 11, 2024
| 'cluster="$cluster", ', | ||
| $._config.per_cluster_label + '=~"$cluster", ' | ||
| ), | ||
| 'cluster_job_route', |
There was a problem hiding this comment.
This relabel the recording rules
QuentinBisson
force-pushed
the
fix-cluster-id-label-in-mixins
branch
from
0cf2ff2 to
0dd0dbd
Compare
Signed-off-by: QuentinBisson <[email protected]>
QuentinBisson
force-pushed
the
fix-cluster-id-label-in-mixins
branch
2 times, most recently
from
3796595 to
0d14a14
Compare
QuentinBisson
force-pushed
the
fix-cluster-id-label-in-mixins
branch
3 times, most recently
from
5812d70 to
7c98704
Compare
Signed-off-by: QuentinBisson <[email protected]>
QuentinBisson
force-pushed
the
fix-cluster-id-label-in-mixins
branch
from
e5769dc to
1d92e27
Compare
|
Closing as this got too complicated for no reason |
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 / why we need it:
Follow up of #12567
This PR fixes the compilation of mixins when
per_cluster_labelis used. Without this, a lot of the existing cluster labels are not changedThis PR also adds the multi-cluster to canaries
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)docs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR