Skip to content

Commit 5cd8222

Browse files
nschadnschad
authored
ServiceMonitors: add options to configure metric- and relabelings (grafana#165)
* add honorLabels=true and options to configure metric- and relabelings Signed-off-by: ShuzZzle <[email protected]> * add CHANGELOG Signed-off-by: ShuzZzle <[email protected]> * remove honorLabels=true Signed-off-by: ShuzZzle <[email protected]>
1 parent 5665986 commit 5cd8222

12 files changed

+103
-0
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* [CHANGE] Removed dnssrvnoa resolution from block memcached (probably oversight) and moved back to simple dns resolution #164
55
* [FEATURE] Support dynamic configuration of Ruler and AlertManager using sidecar #150
66
* [ENHANCEMENT] Enable/Disable security & container security context #158
7+
* [ENHANCEMENT] ServiceMonitors: add options to configure metricRelabelings and relabelings #165
78
* [BUGFIX] Fixed the default label used in pod affinity expression #162
89
* [BUGFIX] Fix label and annotation overrides for services (thanks @kwangil-ha) #164
910
* [BUGFIX] Fix store gateway service name regression introduced in (#144) #166

‎templates/alertmanager/alertmanager-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.alertmanager.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.alertmanager.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.alertmanager.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.alertmanager.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.alertmanager.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.alertmanager.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/compactor/compactor-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.compactor.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.compactor.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.compactor.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.compactor.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.compactor.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.compactor.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/configs/configs-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.configs.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.configs.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.configs.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.configs.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.configs.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.configs.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/distributor/distributor-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.distributor.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.distributor.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.distributor.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.distributor.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.distributor.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.distributor.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/ingester/ingester-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.ingester.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.ingester.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.ingester.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.ingester.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.ingester.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.ingester.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/querier/querier-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.querier.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.querier.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.querier.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.querier.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.querier.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.querier.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/query-frontend/query-frontend-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.query_frontend.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.query_frontend.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.query_frontend.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.query_frontend.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.query_frontend.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.query_frontend.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/ruler/ruler-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.ruler.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.ruler.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.ruler.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.ruler.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.ruler.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.ruler.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/store-gateway/store-gateway-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.store_gateway.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.store_gateway.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.store_gateway.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.store_gateway.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.store_gateway.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.store_gateway.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎templates/table-manager/table-manager-servicemonitor.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@ spec:
2727
{{- if .Values.table_manager.serviceMonitor.scrapeTimeout }}
2828
scrapeTimeout: {{ .Values.table_manager.serviceMonitor.scrapeTimeout }}
2929
{{- end }}
30+
{{- if .Values.table_manager.serviceMonitor.relabelings }}
31+
relabelings:
32+
{{- toYaml .Values.table_manager.serviceMonitor.relabelings | nindent 4 }}
33+
{{- end }}
34+
{{- if .Values.table_manager.serviceMonitor.metricRelabelings }}
35+
metricRelabelings:
36+
{{- toYaml .Values.table_manager.serviceMonitor.metricRelabelings | nindent 4 }}
37+
{{- end }}
3038
{{- end }}

‎values.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ alertmanager:
184184
serviceMonitor:
185185
enabled: false
186186
additionalLabels: {}
187+
relabelings: []
188+
metricRelabelings: []
187189

188190
resources: {}
189191
# limits:
@@ -372,6 +374,8 @@ distributor:
372374
serviceMonitor:
373375
enabled: false
374376
additionalLabels: {}
377+
relabelings: []
378+
metricRelabelings: []
375379

376380
resources: {}
377381
# limits:
@@ -466,6 +470,8 @@ ingester:
466470
serviceMonitor:
467471
enabled: false
468472
additionalLabels: {}
473+
relabelings: []
474+
metricRelabelings: []
469475

470476
resources: {}
471477
# limits:
@@ -600,6 +606,8 @@ ruler:
600606
serviceMonitor:
601607
enabled: false
602608
additionalLabels: {}
609+
relabelings: []
610+
metricRelabelings: []
603611

604612
resources: {}
605613
# limits:
@@ -734,6 +742,8 @@ querier:
734742
serviceMonitor:
735743
enabled: false
736744
additionalLabels: {}
745+
relabelings: []
746+
metricRelabelings: []
737747

738748
resources: {}
739749
# limits:
@@ -822,6 +832,8 @@ query_frontend:
822832
serviceMonitor:
823833
enabled: false
824834
additionalLabels: {}
835+
relabelings: []
836+
metricRelabelings: []
825837

826838
resources: {}
827839
# limits:
@@ -909,6 +921,8 @@ table_manager:
909921
serviceMonitor:
910922
enabled: false
911923
additionalLabels: {}
924+
relabelings: []
925+
metricRelabelings: []
912926

913927
resources: {}
914928
# limits:
@@ -986,6 +1000,8 @@ configs:
9861000
serviceMonitor:
9871001
enabled: false
9881002
additionalLabels: {}
1003+
relabelings: []
1004+
metricRelabelings: []
9891005

9901006
resources: {}
9911007
# limits:
@@ -1075,6 +1091,8 @@ nginx:
10751091
serviceMonitor:
10761092
enabled: false
10771093
additionalLabels: {}
1094+
relabelings: []
1095+
metricRelabelings: []
10781096

10791097
resources: {}
10801098
# limits:
@@ -1151,6 +1169,8 @@ store_gateway:
11511169
serviceMonitor:
11521170
enabled: false
11531171
additionalLabels: {}
1172+
relabelings: []
1173+
metricRelabelings: []
11541174

11551175
resources: {}
11561176
# limits:
@@ -1275,6 +1295,8 @@ compactor:
12751295
serviceMonitor:
12761296
enabled: false
12771297
additionalLabels: {}
1298+
relabelings: []
1299+
metricRelabelings: []
12781300

12791301
resources: {}
12801302
# limits:

0 commit comments

Comments
 (0)