Skip to content

Commit 6c68900

Browse files
AndrewChubatiukAndrewChubatiuk
committed
k8s-stack: add groupLabels to group modifiers. fixes #2524 
1 parent 83c1f60 commit 6c68900

33 files changed

+372
-130
lines changed

‎charts/victoria-logs-single/files/dashboards/generated/vector-k8s-monitoring.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ templating:
1919
- name: cluster
2020
label: cluster
2121
type: {{ ternary "query" "constant" $multicluster }}
22-
query: {{ ternary (printf "{\"query\":\"label_values(vector_build_info, %s)\",\"refId\":\"PrometheusVariableQueryEditor-VariableQuery\",\"qryType\":1}" $clusterLabel) ".*" $multicluster }}
22+
query: {{ ternary (printf "{\"qryType\":1,\"query\":\"label_values(vector_build_info, %s)\",\"refId\":\"PrometheusVariableQueryEditor-VariableQuery\"}" $clusterLabel) ".*" $multicluster }}
2323
definition: {{ ternary (printf "label_values(vector_build_info, %s)" $clusterLabel) ".*" $multicluster }}
2424
hide: {{ ternary 0 2 $multicluster }}
2525
current: {}

‎charts/victoria-metrics-k8s-stack/CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Next release
22

3-
- TODO
3+
- patch all expression `on` and `by` modifiers. See [#2524](https://github.com/VictoriaMetrics/helm-charts/issues/2524).
4+
- updates operator to [v0.65.0](https://github.com/VictoriaMetrics/operator/releases/tag/v0.65.0) version.
45

56
## 0.62.2
67

‎charts/victoria-metrics-k8s-stack/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies:
44
version: 0.0.42
55
- name: victoria-metrics-operator
66
repository: https://victoriametrics.github.io/helm-charts
7-
version: 0.55.3
7+
version: 0.56.0
88
- name: kube-state-metrics
99
repository: https://prometheus-community.github.io/helm-charts
1010
version: 6.3.0
@@ -14,5 +14,5 @@ dependencies:
1414
- name: grafana
1515
repository: https://grafana.github.io/helm-charts
1616
version: 10.1.4
17-
digest: sha256:813af24cb3b7b2d5b161238bf425471cd679b51a8ad79a167affb8659bb57520
18-
generated: "2025-10-30T16:49:59.899592+02:00"
17+
digest: sha256:91710d53d874885767421eae56c698bade651dcdd2eb7fa0a13f91161b6813f1
18+
generated: "2025-11-01T09:33:56.880665+02:00"

‎charts/victoria-metrics-k8s-stack/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies:
3737
version: "0.0.*"
3838
repository: https://victoriametrics.github.io/helm-charts
3939
- name: victoria-metrics-operator
40-
version: "0.55.*"
40+
version: "0.56.*"
4141
repository: https://victoriametrics.github.io/helm-charts
4242
condition: victoria-metrics-operator.enabled
4343
- name: kube-state-metrics

‎charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubernetes-system-api-server.yaml‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,24 @@ templating:
6969
value: 5m
7070
queryValue: ""
7171
skipUrlSync: false
72+
- name: job
73+
multi: true
74+
datasource:
75+
type: {{ $defaultDatasource }}
76+
uid: ${datasource}
77+
type: query
78+
query:
79+
qryType: 1
80+
query: {{ printf "label_values(apiserver_request_total{%s=~\"$cluster\"}, job)" $clusterLabel }}
81+
refId: PrometheusVariableQueryEditor-VariableQuery
82+
definition: {{ printf "label_values(apiserver_request_total{%s=~\"$cluster\"}, job)" $clusterLabel }}
83+
hide: 0
84+
current: {}
85+
options: []
86+
refresh: 1
87+
regex: ""
88+
skipUrlSync: false
89+
sort: 1
7290
editable: false
7391
timezone: {{ default "utc" ($Values.defaultDashboards).defaultTimezone }}
7492
tags:
@@ -123,7 +141,7 @@ panels:
123141
- datasource:
124142
type: {{ $defaultDatasource }}
125143
uid: ${datasource}
126-
expr: {{ printf "up{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}" $clusterLabel }}
144+
expr: {{ printf "up{%s=~\"$cluster\",job=~\"$job\"}" $clusterLabel }}
127145
exemplar: true
128146
interval: ""
129147
legendFormat: '{{`{{`}} instance {{`}}`}}'
@@ -418,7 +436,7 @@ panels:
418436
- datasource:
419437
type: {{ $defaultDatasource }}
420438
uid: ${datasource}
421-
expr: {{ printf "sum(rate(apiserver_request_duration_seconds_sum{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(instance,%s) / sum(rate(apiserver_request_duration_seconds_count{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(instance,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
439+
expr: {{ printf "sum(rate(apiserver_request_duration_seconds_sum{%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(instance,%s) / sum(rate(apiserver_request_duration_seconds_count{%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(instance,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
422440
exemplar: true
423441
interval: $resolution
424442
legendFormat: '{{`{{`}} instance {{`}}`}}'
@@ -487,7 +505,7 @@ panels:
487505
- datasource:
488506
type: {{ $defaultDatasource }}
489507
uid: ${datasource}
490-
expr: {{ printf "sum(rate(apiserver_request_duration_seconds_sum{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(verb,%s) / sum(rate(apiserver_request_duration_seconds_count{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(verb,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
508+
expr: {{ printf "sum(rate(apiserver_request_duration_seconds_sum{%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(verb,%s) / sum(rate(apiserver_request_duration_seconds_count{%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(verb,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
491509
exemplar: true
492510
interval: $resolution
493511
legendFormat: '{{`{{`}} verb {{`}}`}}'
@@ -556,7 +574,7 @@ panels:
556574
- datasource:
557575
type: {{ $defaultDatasource }}
558576
uid: ${datasource}
559-
expr: {{ printf "sum(rate(apiserver_request_total{code=~\"5..\",job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(instance,%s) / sum(rate(apiserver_request_total{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(instance,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
577+
expr: {{ printf "sum(rate(apiserver_request_total{code=~\"5..\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(instance,%s) / sum(rate(apiserver_request_total{%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(instance,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
560578
exemplar: true
561579
interval: $resolution
562580
legendFormat: '{{`{{`}} instance {{`}}`}}'
@@ -625,7 +643,7 @@ panels:
625643
- datasource:
626644
type: {{ $defaultDatasource }}
627645
uid: ${datasource}
628-
expr: {{ printf "sum(rate(apiserver_request_total{code=~\"5..\",job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(verb,%s) / sum(rate(apiserver_request_total{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(verb,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
646+
expr: {{ printf "sum(rate(apiserver_request_total{code=~\"5..\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(verb,%s) / sum(rate(apiserver_request_total{%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(verb,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
629647
exemplar: true
630648
interval: $resolution
631649
legendFormat: '{{`{{`}} verb {{`}}`}}'
@@ -763,7 +781,7 @@ panels:
763781
- datasource:
764782
type: {{ $defaultDatasource }}
765783
uid: ${datasource}
766-
expr: {{ printf "sum(rate(workqueue_depth{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])) by(instance,%s)" $clusterLabel $clusterLabel }}
784+
expr: {{ printf "sum(rate(workqueue_depth{%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(instance,%s)" $clusterLabel $clusterLabel }}
767785
exemplar: true
768786
interval: $resolution
769787
legendFormat: '{{`{{`}} instance {{`}}`}}'
@@ -832,7 +850,7 @@ panels:
832850
- datasource:
833851
type: {{ $defaultDatasource }}
834852
uid: ${datasource}
835-
expr: {{ printf "rate(process_cpu_seconds_total{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}[$__rate_interval])" $clusterLabel }}
853+
expr: {{ printf "rate(process_cpu_seconds_total{%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])" $clusterLabel }}
836854
exemplar: true
837855
interval: $resolution
838856
legendFormat: '{{`{{`}} instance {{`}}`}}'
@@ -902,7 +920,7 @@ panels:
902920
- datasource:
903921
type: {{ $defaultDatasource }}
904922
uid: ${datasource}
905-
expr: {{ printf "process_resident_memory_bytes{job=~\"kubernetes-apiservers|apiserver\",%s=~\"$cluster\"}" $clusterLabel }}
923+
expr: {{ printf "process_resident_memory_bytes{%s=~\"$cluster\",job=~\"$job\"}" $clusterLabel }}
906924
exemplar: true
907925
interval: $resolution
908926
legendFormat: '{{`{{`}} instance {{`}}`}}'
@@ -1005,5 +1023,5 @@ time:
10051023
to: now
10061024
timepicker: {}
10071025
uid: k8s_system_apisrv
1008-
version: 19
1026+
version: 20
10091027
weekStart: ""

‎charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubernetes-system-coredns.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ templating:
2727
type: {{ $defaultDatasource }}
2828
uid: ${datasource}
2929
type: {{ ternary "query" "constant" $multicluster }}
30-
query: {{ ternary (printf "{\"query\":\"label_values(kube_node_info, %s)\",\"refId\":\"PrometheusVariableQueryEditor-VariableQuery\",\"qryType\":1}" $clusterLabel) ".*" $multicluster }}
30+
query: {{ ternary (printf "{\"qryType\":1,\"query\":\"label_values(kube_node_info, %s)\",\"refId\":\"PrometheusVariableQueryEditor-VariableQuery\"}" $clusterLabel) ".*" $multicluster }}
3131
definition: {{ ternary (printf "label_values(kube_node_info, %s)" $clusterLabel) ".*" $multicluster }}
3232
hide: {{ ternary 0 2 $multicluster }}
3333
current:
@@ -388,7 +388,7 @@ panels:
388388
- datasource:
389389
type: {{ $defaultDatasource }}
390390
uid: ${datasource}
391-
expr: {{ printf "sum(rate(coredns_dns_requests_total{instance=~\"$instance\",proto=\"$protocol\",%s=~\"$cluster\"}[$__rate_interval])) by(%s)" $clusterLabel $clusterLabel }}
391+
expr: {{ printf "sum(rate(coredns_dns_requests_total{instance=~\"$instance\",proto=\"$protocol\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(%s)" $clusterLabel $clusterLabel }}
392392
exemplar: true
393393
interval: $resolution
394394
legendFormat: total $protocol requests
@@ -459,7 +459,7 @@ panels:
459459
- datasource:
460460
type: {{ $defaultDatasource }}
461461
uid: ${datasource}
462-
expr: {{ printf "sum(rate(coredns_dns_request_size_bytes_sum{instance=~\"$instance\",proto=\"$protocol\",%s=~\"$cluster\"}[$__rate_interval])) by(proto,%s) / sum(rate(coredns_dns_request_size_bytes_count{instance=~\"$instance\",proto=\"$protocol\",%s=~\"$cluster\"}[$__rate_interval])) by(proto,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
462+
expr: {{ printf "sum(rate(coredns_dns_request_size_bytes_sum{instance=~\"$instance\",proto=\"$protocol\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(proto,%s) / sum(rate(coredns_dns_request_size_bytes_count{instance=~\"$instance\",proto=\"$protocol\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(proto,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
463463
exemplar: true
464464
interval: $resolution
465465
legendFormat: average $protocol packet size
@@ -530,7 +530,7 @@ panels:
530530
- datasource:
531531
type: {{ $defaultDatasource }}
532532
uid: ${datasource}
533-
expr: {{ printf "sum(rate(coredns_dns_requests_total{instance=~\"$instance\",%s=~\"$cluster\"}[$__rate_interval])) by(type,%s)" $clusterLabel $clusterLabel }}
533+
expr: {{ printf "sum(rate(coredns_dns_requests_total{instance=~\"$instance\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(type,%s)" $clusterLabel $clusterLabel }}
534534
exemplar: true
535535
interval: $resolution
536536
legendFormat: '{{`{{`}} type {{`}}`}}'
@@ -601,7 +601,7 @@ panels:
601601
- datasource:
602602
type: {{ $defaultDatasource }}
603603
uid: ${datasource}
604-
expr: {{ printf "sum(rate(coredns_dns_responses_total{instance=~\"$instance\",%s=~\"$cluster\"}[$__rate_interval])) by(rcode,%s)" $clusterLabel $clusterLabel }}
604+
expr: {{ printf "sum(rate(coredns_dns_responses_total{instance=~\"$instance\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(rcode,%s)" $clusterLabel $clusterLabel }}
605605
exemplar: true
606606
interval: $resolution
607607
legendFormat: '{{`{{`}} rcode {{`}}`}}'
@@ -672,7 +672,7 @@ panels:
672672
- datasource:
673673
type: {{ $defaultDatasource }}
674674
uid: ${datasource}
675-
expr: {{ printf "sum(rate(coredns_proxy_request_duration_seconds_count{proxy_name=\"forward\",%s=~\"$cluster\"}[$__rate_interval])) by(%s)" $clusterLabel $clusterLabel }}
675+
expr: {{ printf "sum(rate(coredns_proxy_request_duration_seconds_count{proxy_name=\"forward\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(%s)" $clusterLabel $clusterLabel }}
676676
exemplar: true
677677
interval: $resolution
678678
legendFormat: total forward requests
@@ -743,7 +743,7 @@ panels:
743743
- datasource:
744744
type: {{ $defaultDatasource }}
745745
uid: ${datasource}
746-
expr: {{ printf "sum(rate(coredns_proxy_request_duration_seconds_count{proxy_name=\"forward\",rcode=~\"SERVFAIL|REFUSED\",%s=~\"$cluster\"}[$__rate_interval])) by(rcode,%s)" $clusterLabel $clusterLabel }}
746+
expr: {{ printf "sum(rate(coredns_proxy_request_duration_seconds_count{proxy_name=\"forward\",rcode=~\"SERVFAIL|REFUSED\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(rcode,%s)" $clusterLabel $clusterLabel }}
747747
exemplar: true
748748
interval: $resolution
749749
legendFormat: '{{`{{`}} rcode {{`}}`}}'
@@ -814,15 +814,15 @@ panels:
814814
- datasource:
815815
type: {{ $defaultDatasource }}
816816
uid: ${datasource}
817-
expr: {{ printf "sum(rate(coredns_cache_hits_total{instance=~\"$instance\",%s=~\"$cluster\"}[$__rate_interval])) by(type,%s)" $clusterLabel $clusterLabel }}
817+
expr: {{ printf "sum(rate(coredns_cache_hits_total{instance=~\"$instance\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(type,%s)" $clusterLabel $clusterLabel }}
818818
exemplar: true
819819
interval: $resolution
820820
legendFormat: '{{`{{`}} type {{`}}`}}'
821821
refId: A
822822
- datasource:
823823
type: {{ $defaultDatasource }}
824824
uid: ${datasource}
825-
expr: {{ printf "sum(rate(coredns_cache_misses_total{instance=~\"$instance\",%s=~\"$cluster\"}[$__rate_interval])) by(type,%s)" $clusterLabel $clusterLabel }}
825+
expr: {{ printf "sum(rate(coredns_cache_misses_total{instance=~\"$instance\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(type,%s)" $clusterLabel $clusterLabel }}
826826
exemplar: true
827827
interval: $resolution
828828
legendFormat: misses
@@ -893,7 +893,7 @@ panels:
893893
- datasource:
894894
type: {{ $defaultDatasource }}
895895
uid: ${datasource}
896-
expr: {{ printf "sum(coredns_cache_entries{%s=~\"$cluster\"}) by(type,%s)" $clusterLabel $clusterLabel }}
896+
expr: {{ printf "sum(coredns_cache_entries{%s=~\"$cluster\",job=~\"$job\"}) by(type,%s)" $clusterLabel $clusterLabel }}
897897
exemplar: true
898898
interval: ""
899899
legendFormat: '{{`{{`}} type {{`}}`}}'
@@ -964,7 +964,7 @@ panels:
964964
- datasource:
965965
type: {{ $defaultDatasource }}
966966
uid: ${datasource}
967-
expr: {{ printf "sum(increase(coredns_dns_request_duration_seconds_bucket{instance=~\"$instance\",%s=~\"$cluster\"}[$__rate_interval])) by(le,%s)" $clusterLabel $clusterLabel }}
967+
expr: {{ printf "sum(increase(coredns_dns_request_duration_seconds_bucket{instance=~\"$instance\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(le,%s)" $clusterLabel $clusterLabel }}
968968
editorMode: code
969969
format: heatmap
970970
legendFormat: '{{`{{`}}le{{`}}`}}'
@@ -1023,7 +1023,7 @@ panels:
10231023
- datasource:
10241024
type: {{ $defaultDatasource }}
10251025
uid: ${datasource}
1026-
expr: {{ printf "sum(increase(coredns_dns_request_size_bytes_bucket{instance=~\"$instance\",le!=\"0\",%s=~\"$cluster\"}[$__rate_interval])) by(le,%s)" $clusterLabel $clusterLabel }}
1026+
expr: {{ printf "sum(increase(coredns_dns_request_size_bytes_bucket{instance=~\"$instance\",le!=\"0\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(le,%s)" $clusterLabel $clusterLabel }}
10271027
editorMode: code
10281028
format: heatmap
10291029
legendFormat: '{{`{{`}}le{{`}}`}}'
@@ -1082,7 +1082,7 @@ panels:
10821082
- datasource:
10831083
type: {{ $defaultDatasource }}
10841084
uid: ${datasource}
1085-
expr: {{ printf "sum(increase(coredns_dns_response_size_bytes_bucket{instance=~\"$instance\",le!=\"0\",%s=~\"$cluster\"}[$__rate_interval])) by(le,%s)" $clusterLabel $clusterLabel }}
1085+
expr: {{ printf "sum(increase(coredns_dns_response_size_bytes_bucket{instance=~\"$instance\",le!=\"0\",%s=~\"$cluster\",job=~\"$job\"}[$__rate_interval])) by(le,%s)" $clusterLabel $clusterLabel }}
10861086
editorMode: code
10871087
format: heatmap
10881088
legendFormat: '{{`{{`}}le{{`}}`}}'
@@ -1174,5 +1174,5 @@ time:
11741174
to: now
11751175
timepicker: {}
11761176
uid: k8s_system_coredns
1177-
version: 21
1177+
version: 22
11781178
weekStart: ""

0 commit comments

Comments
 (0)