Skip to content

Commit 391eb7c

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

31 files changed

+116
-106
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-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: ""

‎charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubernetes-views-global.yaml‎

Lines changed: 5 additions & 5 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 "{\"qryType\":1,\"query\":\"label_values(kube_node_info, %s)\",\"refId\":\"PrometheusVariableQueryEditor-VariableQuery\"}" $clusterLabel) ".*" $multicluster }}
30+
query: {{ ternary (printf "{\"query\":\"label_values(kube_node_info, %s)\",\"refId\":\"PrometheusVariableQueryEditor-VariableQuery\",\"qryType\":1}" $clusterLabel) ".*" $multicluster }}
3131
definition: {{ ternary (printf "label_values(kube_node_info, %s)" $clusterLabel) ".*" $multicluster }}
3232
hide: {{ ternary 0 2 $multicluster }}
3333
current: {}
@@ -1123,7 +1123,7 @@ panels:
11231123
- datasource:
11241124
type: {{ $defaultDatasource }}
11251125
uid: ${datasource}
1126-
expr: {{ printf "sum(rate(container_cpu_usage_seconds_total{image!=\"\",%s=~\"$cluster\"}[$__rate_interval])) by(namespace,%s) + on(namespace) sum((rate(windows_container_cpu_usage_seconds_total{container_id!=\"\",%s=~\"$cluster\"}[$__rate_interval]) * on(container_id) group_left(container,pod,namespace) max(kube_pod_container_info{container_id!=\"\",%s=~\"$cluster\"}) by(container,container_id,pod,namespace,%s)) or (kube_namespace_created{%s=~\"$cluster\"} * 0)) by(namespace,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
1126+
expr: {{ printf "sum(rate(container_cpu_usage_seconds_total{image!=\"\",%s=~\"$cluster\"}[$__rate_interval])) by(namespace,%s) + on(namespace,%s) sum((rate(windows_container_cpu_usage_seconds_total{container_id!=\"\",%s=~\"$cluster\"}[$__rate_interval]) * on(container_id,%s) group_left(container,pod,namespace) max(kube_pod_container_info{container_id!=\"\",%s=~\"$cluster\"}) by(container,container_id,pod,namespace,%s)) or (kube_namespace_created{%s=~\"$cluster\"} * 0)) by(namespace,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
11271127
editorMode: code
11281128
exemplar: true
11291129
format: time_series
@@ -1207,7 +1207,7 @@ panels:
12071207
- datasource:
12081208
type: {{ $defaultDatasource }}
12091209
uid: ${datasource}
1210-
expr: {{ printf "sum(container_memory_working_set_bytes{image!=\"\",%s=~\"$cluster\"}) by(namespace,%s) + on(namespace) sum((windows_container_memory_usage_commit_bytes{container_id!=\"\",%s=~\"$cluster\"} * on(container_id) group_left(container,pod,namespace) max(kube_pod_container_info{container_id!=\"\",%s=~\"$cluster\"}) by(container,container_id,pod,namespace,%s)) or (kube_namespace_created{%s=~\"$cluster\"} * 0)) by(namespace,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
1210+
expr: {{ printf "sum(container_memory_working_set_bytes{image!=\"\",%s=~\"$cluster\"}) by(namespace,%s) + on(namespace,%s) sum((windows_container_memory_usage_commit_bytes{container_id!=\"\",%s=~\"$cluster\"} * on(container_id,%s) group_left(container,pod,namespace) max(kube_pod_container_info{container_id!=\"\",%s=~\"$cluster\"}) by(container,container_id,pod,namespace,%s)) or (kube_namespace_created{%s=~\"$cluster\"} * 0)) by(namespace,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
12111211
editorMode: code
12121212
exemplar: true
12131213
interval: $resolution
@@ -2225,7 +2225,7 @@ panels:
22252225
- datasource:
22262226
type: {{ $defaultDatasource }}
22272227
uid: ${datasource}
2228-
expr: {{ printf "sum(rate(container_network_receive_bytes_total{%s=~\"$cluster\"}[$__rate_interval])) by(namespace,%s) + on(namespace) sum((rate(windows_container_network_receive_bytes_total{container_id!=\"\",%s=~\"$cluster\"}[$__rate_interval]) * on(container_id) group_left(container,pod,namespace) max(kube_pod_container_info{container_id!=\"\",%s=~\"$cluster\"}) by(container,container_id,pod,namespace,%s)) or (kube_namespace_created{%s=~\"$cluster\"} * 0)) by(namespace,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
2228+
expr: {{ printf "sum(rate(container_network_receive_bytes_total{%s=~\"$cluster\"}[$__rate_interval])) by(namespace,%s) + on(namespace,%s) sum((rate(windows_container_network_receive_bytes_total{container_id!=\"\",%s=~\"$cluster\"}[$__rate_interval]) * on(container_id,%s) group_left(container,pod,namespace) max(kube_pod_container_info{container_id!=\"\",%s=~\"$cluster\"}) by(container,container_id,pod,namespace,%s)) or (kube_namespace_created{%s=~\"$cluster\"} * 0)) by(namespace,%s)" $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
22292229
editorMode: code
22302230
exemplar: true
22312231
interval: $resolution
@@ -2235,7 +2235,7 @@ panels:
22352235
- datasource:
22362236
type: {{ $defaultDatasource }}
22372237
uid: ${datasource}
2238-
expr: {{ printf "0 - (sum(rate(container_network_transmit_bytes_total{%s=~\"$cluster\"}[$__rate_interval])) by(namespace,%s) + on(namespace) sum((rate(windows_container_network_transmit_bytes_total{container_id!=\"\",%s=~\"$cluster\"}[$__rate_interval]) * on(container_id) group_left(container,pod,namespace) max(kube_pod_container_info{container_id!=\"\",%s=~\"$cluster\"}) by(container,container_id,pod,namespace,%s)) or (kube_namespace_created{%s=~\"$cluster\"} * 0)) by(namespace,%s))" $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
2238+
expr: {{ printf "0 - (sum(rate(container_network_transmit_bytes_total{%s=~\"$cluster\"}[$__rate_interval])) by(namespace,%s) + on(namespace,%s) sum((rate(windows_container_network_transmit_bytes_total{container_id!=\"\",%s=~\"$cluster\"}[$__rate_interval]) * on(container_id,%s) group_left(container,pod,namespace) max(kube_pod_container_info{container_id!=\"\",%s=~\"$cluster\"}) by(container,container_id,pod,namespace,%s)) or (kube_namespace_created{%s=~\"$cluster\"} * 0)) by(namespace,%s))" $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel $clusterLabel }}
22392239
editorMode: code
22402240
hide: false
22412241
interval: $resolution

‎charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubernetes-views-nodes.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ templating:
8484
uid: ${datasource}
8585
type: query
8686
query:
87-
query: {{ printf "label_values(node_uname_info{nodename=~\"(?i:($node)(.[a-z0-9.]+)?)\",%s=~\"$cluster\"}, instance)" $clusterLabel }}
87+
query: {{ printf "label_values(node_uname_info{nodename=~\"(?i:($node)(\\\\.[a-z0-9.-]+)?)\",%s=~\"$cluster\"}, instance)" $clusterLabel }}
8888
refId: StandardVariableQuery
89-
definition: {{ printf "label_values(node_uname_info{nodename=~\"(?i:($node)(.[a-z0-9.]+)?)\",%s=~\"$cluster\"}, instance)" $clusterLabel }}
89+
definition: {{ printf "label_values(node_uname_info{nodename=~\"(?i:($node)(\\\\.[a-z0-9.-]+)?)\",%s=~\"$cluster\"}, instance)" $clusterLabel }}
9090
hide: 2
9191
current: {}
9292
options: []
@@ -2947,5 +2947,5 @@ time:
29472947
to: now
29482948
timepicker: {}
29492949
uid: k8s_views_nodes
2950-
version: 38
2950+
version: 39
29512951
weekStart: ""

‎charts/victoria-metrics-k8s-stack/files/dashboards/generated/kubernetes-views-pods.yaml‎

Lines changed: 1 addition & 1 deletion
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 "{\"refId\":\"PrometheusVariableQueryEditor-VariableQuery\",\"qryType\":1,\"query\":\"label_values(kube_node_info, %s)\"}" $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:

0 commit comments

Comments
 (0)