Skip to content

Commit 84cd17b

Browse files
raptorsunraptorsun
committed
expose /api/v1/labels end point for Thanos query.
1 parent f70f93a commit 84cd17b

File tree

13 files changed

+22
-19
lines changed

13 files changed

+22
-19
lines changed

‎CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- [#1291](https://github.com/openshift/cluster-monitoring-operator/pull/1291) Drop high caredinality cAdvisor metrics via [kube-prometheus #1250](https://github.com/prometheus-operator/kube-prometheus/pull/1250)
88
- [#1270](https://github.com/openshift/cluster-monitoring-operator/pull/1270) Show a message in the degraded condition when Platform Monitoring Prometheus runs without persistent storage.
99
- [#1241](https://github.com/openshift/cluster-monitoring-operator/pull/1241) Allow configuring additional Alertmanagers in User Workload Prometheus and Thanos Ruler.
10+
- [#1299](https://github.com/openshift/cluster-monitoring-operator/pull/1299) Expose expose /api/v1/labels endpoint for Thanos query.
1011

1112
## 4.8
1213

@@ -15,7 +16,7 @@
1516
- [#1087](https://github.com/openshift/cluster-monitoring-operator/pull/1087) Remove ThanosQueryInstantLatencyHigh and ThanosQueryRangeLatencyHigh alerts.
1617
- [#1090](https://github.com/openshift/cluster-monitoring-operator/pull/1090) Decrease alert severity to "warning" for all Thanos sidecar alerts.
1718
- [#1090](https://github.com/openshift/cluster-monitoring-operator/pull/1090) Increase "for" duration to 1 hour for all Thanos sidecar alerts.
18-
- [#1093](https://github.com/openshift/cluster-monitoring-operator/pull/1093) Bump kube-state-metrics to major new release v2.0.0-rc.1. This changes a lot of metrics and flags, see kube-state-metrics CHANGELOG for full changes.
19+
- [#1093](https://github.com/openshift/cluster-monitoring-operator/pull/1093) Bump kube-state-metrics to major new release v2.0.0-rc.1. This changes a lot of metrics and flags, see kube-state-metrics CHANGELOG for full changes.
1920
- [#1126](https://github.com/openshift/cluster-monitoring-operator/pull/1126) Remove deprecated techPreviewUserWorkload field from CMO's configmap.
2021
- [#1136](https://github.com/openshift/cluster-monitoring-operator/pull/1136) Add recording rule for builds by strategy
2122
- [#1210](https://github.com/openshift/cluster-monitoring-operator/pull/1210) Bump Grafana version to 7.5.5

‎assets/alertmanager/alertmanager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
7575
- --logtostderr=true
7676
- --v=10
77-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
77+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
7878
name: kube-rbac-proxy
7979
ports:
8080
- containerPort: 9092

‎assets/kube-state-metrics/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
- --tls-cert-file=/etc/tls/private/tls.crt
6767
- --tls-private-key-file=/etc/tls/private/tls.key
6868
- --client-ca-file=/etc/tls/client/client-ca.crt
69-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
69+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
7070
name: kube-rbac-proxy-main
7171
ports:
7272
- containerPort: 8443
@@ -92,7 +92,7 @@ spec:
9292
- --tls-cert-file=/etc/tls/private/tls.crt
9393
- --tls-private-key-file=/etc/tls/private/tls.key
9494
- --client-ca-file=/etc/tls/client/client-ca.crt
95-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
95+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
9696
name: kube-rbac-proxy-self
9797
ports:
9898
- containerPort: 9443

‎assets/node-exporter/daemonset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
valueFrom:
7070
fieldRef:
7171
fieldPath: status.podIP
72-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
72+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
7373
name: kube-rbac-proxy
7474
ports:
7575
- containerPort: 9100

‎assets/openshift-state-metrics/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- --upstream=http://127.0.0.1:8081/
2626
- --tls-cert-file=/etc/tls/private/tls.crt
2727
- --tls-private-key-file=/etc/tls/private/tls.key
28-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
28+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
2929
name: kube-rbac-proxy-main
3030
ports:
3131
- containerPort: 8443
@@ -45,7 +45,7 @@ spec:
4545
- --upstream=http://127.0.0.1:8082/
4646
- --tls-cert-file=/etc/tls/private/tls.crt
4747
- --tls-private-key-file=/etc/tls/private/tls.key
48-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
48+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
4949
name: kube-rbac-proxy-self
5050
ports:
5151
- containerPort: 9443

‎assets/prometheus-k8s/prometheus.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ spec:
8585
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
8686
- --logtostderr=true
8787
- --v=10
88-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
88+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
8989
name: kube-rbac-proxy
9090
ports:
9191
- containerPort: 9092
@@ -124,7 +124,7 @@ spec:
124124
valueFrom:
125125
fieldRef:
126126
fieldPath: status.podIP
127-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
127+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
128128
name: kube-rbac-proxy-thanos
129129
ports:
130130
- containerPort: 10902

‎assets/prometheus-operator-user-workload/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
- --upstream=http://127.0.0.1:8080/
5353
- --tls-cert-file=/etc/tls/private/tls.crt
5454
- --tls-private-key-file=/etc/tls/private/tls.key
55-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
55+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
5656
name: kube-rbac-proxy
5757
ports:
5858
- containerPort: 8443

‎assets/prometheus-operator/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
- --tls-private-key-file=/etc/tls/private/tls.key
6363
- --client-ca-file=/etc/tls/client/client-ca.crt
6464
- --upstream-ca-file=/etc/configmaps/operator-cert-ca-bundle/service-ca.crt
65-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
65+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
6666
name: kube-rbac-proxy
6767
ports:
6868
- containerPort: 8443

‎assets/prometheus-user-workload/prometheus.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- --tls-private-key-file=/etc/tls/private/tls.key
4848
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
4949
- --allow-paths=/metrics
50-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
50+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
5151
name: kube-rbac-proxy
5252
ports:
5353
- containerPort: 9091
@@ -73,7 +73,7 @@ spec:
7373
valueFrom:
7474
fieldRef:
7575
fieldPath: status.podIP
76-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
76+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
7777
name: kube-rbac-proxy-thanos
7878
ports:
7979
- containerPort: 10902

‎assets/telemeter-client/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
- --tls-cert-file=/etc/tls/private/tls.crt
8080
- --tls-private-key-file=/etc/tls/private/tls.key
8181
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
82-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
82+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
8383
name: kube-rbac-proxy
8484
ports:
8585
- containerPort: 8443

‎assets/thanos-querier/deployment.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ spec:
135135
- --tls-private-key-file=/etc/tls/private/tls.key
136136
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
137137
- --logtostderr=true
138-
- --allow-paths=/api/v1/query,/api/v1/query_range
139-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
138+
- --allow-paths="/api/v1/query,/api/v1/query_range,/api/v1/labels,/api/v1/label/*/values"
139+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
140140
name: kube-rbac-proxy
141141
ports:
142142
- containerPort: 9092
@@ -155,6 +155,7 @@ spec:
155155
- --insecure-listen-address=127.0.0.1:9095
156156
- --upstream=http://127.0.0.1:9090
157157
- --label=namespace
158+
- --enable-label-apis
158159
image: quay.io/prometheuscommunity/prom-label-proxy:v0.3.0
159160
name: prom-label-proxy
160161
resources:
@@ -171,7 +172,7 @@ spec:
171172
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
172173
- --logtostderr=true
173174
- --allow-paths=/api/v1/rules
174-
image: quay.io/brancz/kube-rbac-proxy:v0.9.0
175+
image: quay.io/brancz/kube-rbac-proxy:v0.11.0
175176
name: kube-rbac-proxy-rules
176177
ports:
177178
- containerPort: 9093

‎jsonnet/thanos-querier.libsonnet

+2-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ function(params)
472472
'--tls-private-key-file=/etc/tls/private/tls.key',
473473
'--tls-cipher-suites=' + cfg.tlsCipherSuites,
474474
'--logtostderr=true',
475-
'--allow-paths=/api/v1/query,/api/v1/query_range',
475+
'--allow-paths="/api/v1/query,/api/v1/query_range,/api/v1/labels,/api/v1/label/*/values"',
476476
],
477477
terminationMessagePolicy: 'FallbackToLogsOnError',
478478
volumeMounts: [
@@ -493,6 +493,7 @@ function(params)
493493
'--insecure-listen-address=127.0.0.1:9095',
494494
'--upstream=http://127.0.0.1:9090',
495495
'--label=namespace',
496+
'--enable-label-apis',
496497
],
497498
resources: {
498499
requests: {

‎jsonnet/versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repos:
1616
versions:
1717
alertmanager: 0.21.0
1818
grafana: 7.5.5
19-
kubeRbacProxy: 0.9.0
19+
kubeRbacProxy: 0.11.0
2020
kubeStateMetrics: 2.0.0
2121
nodeExporter: 1.1.2
2222
promLabelProxy: 0.3.0

0 commit comments

Comments
 (0)