Support metrics relabelings in service monitor #10095
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
The service monitor CRD allows configuring metric relabeling rules which are applied when the metrics are scraped. Support configuring metric relabeling configs in the helm chart.
adutra
reviewed
Dec 17, 2024
There was a problem hiding this comment.
@rohanag12 do you mind adding a unit test as well? Could be a new file, servicemonitor_test.yaml, with e.g. the below contents:
release:
name: nessie
namespace: nessie-ns
capabilities:
apiVersions:
- monitoring.coreos.com/v1
templates:
- servicemonitor.yaml
tests:
- it: should create ServiceMonitor if enabled
set: { serviceMonitor: { enabled: true } }
asserts: [ { containsDocument: { kind: ServiceMonitor, apiVersion: monitoring.coreos.com/v1, name: nessie, namespace: nessie-ns } } ]
- it: should not create ServiceMonitor if disabled
set: { serviceMonitor: { enabled: false } }
asserts: [ { containsDocument: { kind: ServiceMonitor, apiVersion: monitoring.coreos.com/v1, name: nessie, namespace: nessie-ns }, not: true } ]
- it: should add metrics relabelings
set:
serviceMonitor:
enabled: true
metricRelabelings:
- source_labels: [ __meta_kubernetes_namespace ]
separator: ;
regex: (.*)
target_label: namespace
replacement: $1
action: replace
asserts:
- equal:
path: spec.endpoints[ 0].metricRelabelings
value:
- source_labels: [ __meta_kubernetes_namespace ]
separator: ;
regex: (.*)
target_label: namespace
replacement: $1
action: replaceThanks!
| @@ -713,6 +713,8 @@ serviceMonitor: | |||
| labels: | |||
| {} | |||
| # release: prometheus | |||
| # -- Relabeling rules to apply to metrics. Ref https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config. | |||
| metricRelabelings: [] | |||
There was a problem hiding this comment.
Let's add an example here to help users understand the syntax:
Suggested change
| metricRelabelings: [] | |
| metricRelabelings: [] | |
| # - source_labels: [ __meta_kubernetes_namespace ] | |
| # separator: ; | |
| # regex: (.*) | |
| # target_label: namespace | |
| # replacement: $1 | |
| # action: replace |
adutra
approved these changes
Dec 27, 2024
|
@rohanag12 I went ahead and pushed my suggestions. Thanks for your contribution! |
Thank you! |
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.
The service monitor CRD allows configuring metric relabeling rules which are applied when the metrics are scraped. Support configuring metric relabeling configs in the helm chart.