Feat/integration updates #1130
Merged
Feat/integration updates #1130
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
…at/integration-updates # Conflicts: # charts/k8s-monitoring/docs/examples/meta-monitoring/alloy-singleton.alloy # charts/k8s-monitoring/docs/examples/meta-monitoring/output.yaml
…at/integration-updates
petewall
approved these changes
Jan 16, 2025
Comment on lines
20
to
45
| {{- if .namespaces }} | ||
| {{- $labelList = append $labelList "__meta_kubernetes_namespace" -}} | ||
| {{- $valueList = append $valueList (printf "(%s)" (join "|" .namespaces)) -}} | ||
| {{- $valueList = append $valueList (printf "(?:%s)" (join "|" .namespaces)) -}} | ||
| {{- end }} | ||
| {{- range $k, $v := .labelSelectors }} | ||
| {{- if kindIs "slice" $v }} | ||
| {{- $labelList = append $labelList (include "pod_label" $k) -}} | ||
| {{- $valueList = append $valueList (printf "(%s)" (join "|" $v)) -}} | ||
| {{- $valueList = append $valueList (printf "(?:%s)" (join "|" $v)) -}} | ||
| {{- else }} | ||
| {{- $labelList = append $labelList (include "pod_label" $k) -}} | ||
| {{- $valueList = append $valueList $v -}} | ||
| {{- $valueList = append $valueList (printf "(?:%s)" $v) -}} | ||
| {{- end }} | ||
| {{- end }} | ||
| rule { | ||
| source_labels = {{ $labelList | sortAlpha | toJson }} | ||
| source_labels = {{ $labelList | toJson }} | ||
| separator = ";" | ||
| regex = {{ $valueList | sortAlpha | join ";" | quote }} | ||
| regex = {{ $valueList | join ";" | quote }} | ||
| target_label = "job" | ||
| replacement = "integrations/grafana" | ||
| } | ||
| rule { | ||
| source_labels = {{ $labelList | sortAlpha | toJson }} | ||
| source_labels = {{ $labelList | toJson }} | ||
| separator = ";" | ||
| regex = {{ $valueList | sortAlpha | join ";" | quote }} | ||
| regex = {{ $valueList | join ";" | quote }} | ||
| target_label = "instance" | ||
| replacement = {{ $instance.name | quote }} |
There was a problem hiding this comment.
We gotta do something about predictable layout for this. We had the sortAlpha in there before because it wasn't deterministic and it failed autotests pretty regularly.
Maybe instead of range $k, $v := .labelSelectors we do something more like range $key := (keys .labelSelectors | sort)?
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.
No description provided.