Skip to content

Commit 6915bd7

Browse files
committed
chore(charts): change controller match labels
1 parent ff70cce commit 6915bd7

2 files changed

Lines changed: 47 additions & 17 deletions

File tree

charts/victoriametrics/templates/victoriametrics/networkpolicy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
kubernetes.io/metadata.name: {{.Release.Namespace}}
1616
podSelector:
1717
matchLabels:
18-
app: drycc-controller-api
18+
app: drycc-controller
1919
- from:
2020
- namespaceSelector:
2121
matchLabels:

charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-configmap.yaml

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,40 @@ data:
2323
kubernetes_sd_configs:
2424
- role: node
2525
relabel_configs:
26-
- target_label: __address__
27-
replacement: drycc-controller-api:80
26+
- target_label: __param_scheme
27+
replacement: https
28+
- target_label: __param_host
29+
replacement: kubernetes.default.svc
30+
- target_label: __param_port
31+
replacement: 443
2832
- source_labels: [__meta_kubernetes_node_name]
2933
regex: (.+)
30-
target_label: __metrics_path__
31-
replacement: /v2/nodes/$1/proxy/metrics
34+
target_label: __param_path
35+
replacement: /api/v1/nodes/$1/proxy/metrics
36+
- target_label: __address__
37+
replacement: drycc-controller-metric:8000
38+
- target_label: __metrics_path__
39+
replacement: /v2/metrics
3240
- job_name: "controller-nodes-cadvisor"
3341
scheme: http
3442
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
3543
kubernetes_sd_configs:
3644
- role: node
3745
relabel_configs:
38-
- target_label: __address__
39-
replacement: drycc-controller-api:80
46+
- target_label: __param_scheme
47+
replacement: https
48+
- target_label: __param_host
49+
replacement: kubernetes.default.svc
50+
- target_label: __param_port
51+
replacement: 443
4052
- source_labels: [__meta_kubernetes_node_name]
4153
regex: (.+)
42-
target_label: __metrics_path__
43-
replacement: /v2/nodes/$1/proxy/metrics/cadvisor
54+
target_label: __param_path
55+
replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
56+
- target_label: __address__
57+
replacement: drycc-controller-metric:8000
58+
- target_label: __metrics_path__
59+
replacement: /v2/metrics
4460
- job_name: "kubernetes-apiservers"
4561
kubernetes_sd_configs:
4662
- role: endpoints
@@ -163,11 +179,14 @@ data:
163179
separator: ;
164180
regex: "true;true"
165181
action: drop
166-
- source_labels:
167-
[__meta_kubernetes_service_annotation_prometheus_io_scheme]
168-
action: replace
169-
target_label: __scheme__
182+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
170183
regex: (https?)
184+
replacement: $1
185+
target_label: __scheme__
186+
- source_labels: [__scheme__]
187+
regex: ^$
188+
replacement: http
189+
target_label: __scheme__
171190
- source_labels:
172191
[__meta_kubernetes_service_annotation_prometheus_io_path]
173192
action: replace
@@ -214,11 +233,14 @@ data:
214233
[__meta_kubernetes_service_annotation_prometheus_io_scrape_slow]
215234
action: keep
216235
regex: true
217-
- source_labels:
218-
[__meta_kubernetes_service_annotation_prometheus_io_scheme]
219-
action: replace
220-
target_label: __scheme__
236+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
221237
regex: (https?)
238+
replacement: $1
239+
target_label: __scheme__
240+
- source_labels: [__scheme__]
241+
regex: ^$
242+
replacement: http
243+
target_label: __scheme__
222244
- source_labels:
223245
[__meta_kubernetes_service_annotation_prometheus_io_path]
224246
action: replace
@@ -286,6 +308,14 @@ data:
286308
- source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
287309
action: keep
288310
regex: true
311+
- source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
312+
regex: (https?)
313+
replacement: $1
314+
target_label: __scheme__
315+
- source_labels: [__scheme__]
316+
regex: ^$
317+
replacement: http
318+
target_label: __scheme__
289319
- source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
290320
action: replace
291321
target_label: __metrics_path__

0 commit comments

Comments
 (0)