Skip to content

Commit 7b91347

Browse files
danfromtitandanfromtitan
authored
Bug/support tls service monitors (grafana#216)
* add service monitors extraEndpointSpec support Signed-off-by: Dan Constantinescu <dconstantinescu@blackberry.com>
1 parent cf51a8b commit 7b91347

File tree

13 files changed

+64
-0
lines changed

13 files changed

+64
-0
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* [ENHANCEMENT] Use FQDN for memcached addresses #175
1515
* [ENHANCEMENT] Optionally generate endpoints for `X-Scope-OrgID` injection (multi-tenancy) #180
1616
* [ENHANCEMENT] Optionally configure Basic Auth within Nginx #205
17+
* [ENHANCEMENT] Add extraEndpointSpec to all servicemonitors for specifying things like TLS #216
1718
* [BUGFIX] Fix whitespace in runtime-config annotations, introduced in #209, fixed in #212
1819
* [BUGFIX] Correcting nginx config for auth orgs to right proxy_pass #192
1920

‎README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ Kubernetes: `^1.19.0-0`
132132
| alertmanager.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
133133
| alertmanager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
134134
| alertmanager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
135+
| alertmanager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
135136
| alertmanager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
136137
| alertmanager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
137138
| alertmanager.&ZeroWidthSpace;sidecar.&ZeroWidthSpace;defaultFolderName | string | `nil` | |
@@ -198,6 +199,7 @@ Kubernetes: `^1.19.0-0`
198199
| compactor.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
199200
| compactor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
200201
| compactor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
202+
| compactor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
201203
| compactor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
202204
| compactor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
203205
| compactor.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `60` | |
@@ -306,6 +308,7 @@ Kubernetes: `^1.19.0-0`
306308
| configs.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
307309
| configs.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
308310
| configs.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
311+
| configs.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
309312
| configs.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
310313
| configs.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
311314
| configs.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `10` | |
@@ -359,6 +362,7 @@ Kubernetes: `^1.19.0-0`
359362
| distributor.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
360363
| distributor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
361364
| distributor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
365+
| distributor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
362366
| distributor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
363367
| distributor.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
364368
| distributor.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `10` | |
@@ -420,6 +424,7 @@ Kubernetes: `^1.19.0-0`
420424
| ingester.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
421425
| ingester.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
422426
| ingester.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
427+
| ingester.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
423428
| ingester.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
424429
| ingester.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
425430
| ingester.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `60` | |
@@ -536,6 +541,7 @@ Kubernetes: `^1.19.0-0`
536541
| nginx.&ZeroWidthSpace;service.&ZeroWidthSpace;type | string | `"ClusterIP"` | |
537542
| nginx.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
538543
| nginx.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
544+
| nginx.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
539545
| nginx.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
540546
| nginx.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
541547
| nginx.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `10` | |
@@ -584,6 +590,7 @@ Kubernetes: `^1.19.0-0`
584590
| querier.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
585591
| querier.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
586592
| querier.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
593+
| querier.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
587594
| querier.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
588595
| querier.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
589596
| querier.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `10` | |
@@ -626,6 +633,7 @@ Kubernetes: `^1.19.0-0`
626633
| query_frontend.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
627634
| query_frontend.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
628635
| query_frontend.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
636+
| query_frontend.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
629637
| query_frontend.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
630638
| query_frontend.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
631639
| query_frontend.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `10` | |
@@ -666,6 +674,7 @@ Kubernetes: `^1.19.0-0`
666674
| ruler.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
667675
| ruler.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
668676
| ruler.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
677+
| ruler.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
669678
| ruler.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
670679
| ruler.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
671680
| ruler.&ZeroWidthSpace;sidecar.&ZeroWidthSpace;defaultFolderName | string | `nil` | |
@@ -735,6 +744,7 @@ Kubernetes: `^1.19.0-0`
735744
| store_gateway.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
736745
| store_gateway.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
737746
| store_gateway.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
747+
| store_gateway.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
738748
| store_gateway.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
739749
| store_gateway.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
740750
| store_gateway.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `60` | |
@@ -774,6 +784,7 @@ Kubernetes: `^1.19.0-0`
774784
| table_manager.&ZeroWidthSpace;service.&ZeroWidthSpace;labels | object | `{}` | |
775785
| table_manager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;additionalLabels | object | `{}` | |
776786
| table_manager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;enabled | bool | `false` | |
787+
| table_manager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;extraEndpointSpec | object | `{}` | |
777788
| table_manager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;metricRelabelings | list | `[]` | |
778789
| table_manager.&ZeroWidthSpace;serviceMonitor.&ZeroWidthSpace;relabelings | list | `[]` | |
779790
| table_manager.&ZeroWidthSpace;startupProbe.&ZeroWidthSpace;failureThreshold | int | `10` | |

‎templates/alertmanager/alertmanager-servicemonitor.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ spec:
3636
metricRelabelings:
3737
{{- toYaml .Values.alertmanager.serviceMonitor.metricRelabelings | nindent 4 }}
3838
{{- end }}
39+
{{- with .Values.alertmanager.serviceMonitor.extraEndpointSpec }}
40+
{{- toYaml . | nindent 4 }}
41+
{{- end }}
3942
{{- end }}

‎templates/compactor/compactor-servicemonitor.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ spec:
3636
metricRelabelings:
3737
{{- toYaml .Values.compactor.serviceMonitor.metricRelabelings | nindent 4 }}
3838
{{- end }}
39+
{{- with .Values.compactor.serviceMonitor.extraEndpointSpec }}
40+
{{- toYaml . | nindent 4 }}
41+
{{- end }}
3942
{{- end }}

‎templates/configs/configs-servicemonitor.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ spec:
3636
metricRelabelings:
3737
{{- toYaml .Values.configs.serviceMonitor.metricRelabelings | nindent 4 }}
3838
{{- end }}
39+
{{- with .Values.configs.serviceMonitor.extraEndpointSpec }}
40+
{{- toYaml . | nindent 4 }}
41+
{{- end }}
3942
{{- end }}

‎templates/distributor/distributor-servicemonitor.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ spec:
3636
metricRelabelings:
3737
{{- toYaml .Values.distributor.serviceMonitor.metricRelabelings | nindent 4 }}
3838
{{- end }}
39+
{{- with .Values.distributor.serviceMonitor.extraEndpointSpec }}
40+
{{- toYaml . | nindent 4 }}
41+
{{- end }}
3942
{{- end }}

‎templates/ingester/ingester-servicemonitor.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ spec:
3636
metricRelabelings:
3737
{{- toYaml .Values.ingester.serviceMonitor.metricRelabelings | nindent 4 }}
3838
{{- end }}
39+
{{- with .Values.ingester.serviceMonitor.extraEndpointSpec }}
40+
{{- toYaml . | nindent 4 }}
41+
{{- end }}
3942
{{- end }}

‎templates/querier/querier-servicemonitor.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ spec:
3636
metricRelabelings:
3737
{{- toYaml .Values.querier.serviceMonitor.metricRelabelings | nindent 4 }}
3838
{{- end }}
39+
{{- with .Values.querier.serviceMonitor.extraEndpointSpec }}
40+
{{- toYaml . | nindent 4 }}
41+
{{- end }}
3942
{{- end }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ spec:
3636
metricRelabelings:
3737
{{- toYaml .Values.query_frontend.serviceMonitor.metricRelabelings | nindent 4 }}
3838
{{- end }}
39+
{{- with .Values.query_frontend.serviceMonitor.extraEndpointSpec }}
40+
{{- toYaml . | nindent 4 }}
41+
{{- end }}
3942
{{- end }}

‎templates/ruler/ruler-servicemonitor.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ spec:
3636
metricRelabelings:
3737
{{- toYaml .Values.ruler.serviceMonitor.metricRelabelings | nindent 4 }}
3838
{{- end }}
39+
{{- with .Values.ruler.serviceMonitor.extraEndpointSpec }}
40+
{{- toYaml . | nindent 4 }}
41+
{{- end }}
3942
{{- end }}

0 commit comments

Comments
 (0)