Skip to content

Commit 3f556d0

Browse files
zanhsiehzanhsieh
authored
Merge branch 'main' into main
Signed-off-by: MH <zanhsieh@gmail.com>
2 parents 67373cd + 46a257f commit 3f556d0

54 files changed

Lines changed: 154 additions & 93 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/renovate-custom-hooks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Used App:
2222
# https://github.com/organizations/prometheus-community/settings/apps/helm-charts-renovate-helper.
2323
# Ref: https://github.com/prometheus-community/helm-charts/issues/5213.
24-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
24+
- uses: actions/create-github-app-token@30bf6253fa41bdc8d1501d202ad15287582246b4 # v2.0.3
2525
id: app-token
2626
with:
2727
app-id: 1179738

‎charts/alertmanager-snmp-notifier/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ home: https://github.com/maxwo/snmp_notifier
55
sources:
66
- https://github.com/maxwo/snmp_notifier
77
type: application
8-
version: 0.4.1
8+
version: 0.5.0
99
# renovate: github-releases=maxwo/snmp_notifier
10-
appVersion: v1.6.0
10+
appVersion: v1.6.2
1111
keywords:
1212
- monitoring
1313
maintainers:

‎charts/kube-prometheus-stack/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ name: kube-prometheus-stack
3131
sources:
3232
- https://github.com/prometheus-community/helm-charts
3333
- https://github.com/prometheus-operator/kube-prometheus
34-
version: 71.0.0
34+
version: 71.2.0
3535
# Please do not add a renovate hint here, since appVersion updates involves manual tasks
3636
appVersion: v0.82.0
3737
kubeVersion: ">=1.19.0-0"
@@ -59,11 +59,11 @@ dependencies:
5959
repository: https://prometheus-community.github.io/helm-charts
6060
condition: kubeStateMetrics.enabled
6161
- name: prometheus-node-exporter
62-
version: "4.45.*"
62+
version: "4.46.0"
6363
repository: https://prometheus-community.github.io/helm-charts
6464
condition: nodeExporter.enabled
6565
- name: grafana
66-
version: "8.13.*"
66+
version: "8.14.*"
6767
repository: https://grafana.github.io/helm-charts
6868
condition: grafana.enabled
6969
- name: prometheus-windows-exporter

‎charts/kube-prometheus-stack/files/dashboards/k8s-coredns.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@
566566
"datasource": {
567567
"uid": "$datasource"
568568
},
569-
"expr": "histogram_quantile(0.99, sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto))",
569+
"expr": "histogram_quantile(0.99, (sum(rate(coredns_dns_request_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (proto))) or (sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto)))",
570570
"interval": "",
571571
"intervalFactor": 2,
572572
"legendFormat": "{{ proto }}:99 ",
@@ -577,7 +577,7 @@
577577
"datasource": {
578578
"uid": "$datasource"
579579
},
580-
"expr": "histogram_quantile(0.90, sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto))",
580+
"expr": "histogram_quantile(0.90, (sum(rate(coredns_dns_request_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (proto))) or (sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto)))",
581581
"intervalFactor": 2,
582582
"legendFormat": "{{ proto }}:90",
583583
"refId": "B",
@@ -587,7 +587,7 @@
587587
"datasource": {
588588
"uid": "$datasource"
589589
},
590-
"expr": "histogram_quantile(0.50, sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto))",
590+
"expr": "histogram_quantile(0.50, (sum(rate(coredns_dns_request_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (proto))) or (sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto)))",
591591
"intervalFactor": 2,
592592
"legendFormat": "{{ proto }}:50",
593593
"refId": "C",
@@ -685,7 +685,7 @@
685685
"datasource": {
686686
"uid": "$datasource"
687687
},
688-
"expr": "histogram_quantile(0.99, sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto))",
688+
"expr": "histogram_quantile(0.99, (sum(rate(coredns_dns_request_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto)))",
689689
"format": "time_series",
690690
"interval": "",
691691
"intervalFactor": 2,
@@ -697,7 +697,7 @@
697697
"datasource": {
698698
"uid": "$datasource"
699699
},
700-
"expr": "histogram_quantile(0.90, sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto))",
700+
"expr": "histogram_quantile(0.90, (sum(rate(coredns_dns_request_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto)))",
701701
"format": "time_series",
702702
"interval": "",
703703
"intervalFactor": 2,
@@ -709,7 +709,7 @@
709709
"datasource": {
710710
"uid": "$datasource"
711711
},
712-
"expr": "histogram_quantile(0.50, sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto))",
712+
"expr": "histogram_quantile(0.50, (sum(rate(coredns_dns_request_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_request_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto)))",
713713
"format": "time_series",
714714
"interval": "",
715715
"intervalFactor": 2,
@@ -908,7 +908,7 @@
908908
"datasource": {
909909
"uid": "$datasource"
910910
},
911-
"expr": "histogram_quantile(0.99, sum(rate(coredns_dns_request_duration_seconds_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by (le, job))",
911+
"expr": "histogram_quantile(0.99, (sum(rate(coredns_dns_request_duration_seconds{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by (job)) or (sum(rate(coredns_dns_request_duration_seconds_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by (le, job)))",
912912
"format": "time_series",
913913
"intervalFactor": 2,
914914
"legendFormat": "99%",
@@ -919,7 +919,7 @@
919919
"datasource": {
920920
"uid": "$datasource"
921921
},
922-
"expr": "histogram_quantile(0.90, sum(rate(coredns_dns_request_duration_seconds_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by (le))",
922+
"expr": "histogram_quantile(0.90, (sum(rate(coredns_dns_request_duration_seconds{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by ()) or (sum(rate(coredns_dns_request_duration_seconds_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by (le)))",
923923
"format": "time_series",
924924
"intervalFactor": 2,
925925
"legendFormat": "90%",
@@ -930,7 +930,7 @@
930930
"datasource": {
931931
"uid": "$datasource"
932932
},
933-
"expr": "histogram_quantile(0.50, sum(rate(coredns_dns_request_duration_seconds_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by (le))",
933+
"expr": "histogram_quantile(0.50, (sum(rate(coredns_dns_request_duration_seconds{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by ()) or (sum(rate(coredns_dns_request_duration_seconds_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\"}[5m])) by (le)))",
934934
"format": "time_series",
935935
"intervalFactor": 2,
936936
"legendFormat": "50%",
@@ -1066,7 +1066,7 @@
10661066
"datasource": {
10671067
"uid": "$datasource"
10681068
},
1069-
"expr": "histogram_quantile(0.99, sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto)) ",
1069+
"expr": "histogram_quantile(0.99, (sum(rate(coredns_dns_response_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto))) ",
10701070
"interval": "",
10711071
"intervalFactor": 2,
10721072
"legendFormat": "{{ proto }}:99%",
@@ -1077,7 +1077,7 @@
10771077
"datasource": {
10781078
"uid": "$datasource"
10791079
},
1080-
"expr": "histogram_quantile(0.90, sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto)) ",
1080+
"expr": "histogram_quantile(0.90, (sum(rate(coredns_dns_response_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto))) ",
10811081
"interval": "",
10821082
"intervalFactor": 2,
10831083
"legendFormat": "{{ proto }}:90%",
@@ -1088,7 +1088,7 @@
10881088
"datasource": {
10891089
"uid": "$datasource"
10901090
},
1091-
"expr": "histogram_quantile(0.50, sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto)) ",
1091+
"expr": "histogram_quantile(0.50, (sum(rate(coredns_dns_response_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"udp\"}[5m])) by (le,proto))) ",
10921092
"hide": false,
10931093
"intervalFactor": 2,
10941094
"legendFormat": "{{ proto }}:50%",
@@ -1188,7 +1188,7 @@
11881188
"datasource": {
11891189
"uid": "$datasource"
11901190
},
1191-
"expr": "histogram_quantile(0.99, sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto)) ",
1191+
"expr": "histogram_quantile(0.99, (sum(rate(coredns_dns_response_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto))) ",
11921192
"format": "time_series",
11931193
"intervalFactor": 2,
11941194
"legendFormat": "{{ proto }}:99%",
@@ -1199,7 +1199,7 @@
11991199
"datasource": {
12001200
"uid": "$datasource"
12011201
},
1202-
"expr": "histogram_quantile(0.90, sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto)) ",
1202+
"expr": "histogram_quantile(0.90, (sum(rate(coredns_dns_response_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto))) ",
12031203
"format": "time_series",
12041204
"intervalFactor": 2,
12051205
"legendFormat": "{{ proto }}:90%",
@@ -1210,7 +1210,7 @@
12101210
"datasource": {
12111211
"uid": "$datasource"
12121212
},
1213-
"expr": "histogram_quantile(0.50, sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le, proto)) ",
1213+
"expr": "histogram_quantile(0.50, (sum(rate(coredns_dns_response_size_bytes{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (proto)) or (sum(rate(coredns_dns_response_size_bytes_bucket{job=~\"$job\",cluster=~\"$cluster\",instance=~\"$instance\",proto=\"tcp\"}[5m])) by (le,proto))) ",
12141214
"format": "time_series",
12151215
"intervalFactor": 2,
12161216
"legendFormat": "{{ proto }}:50%",

‎charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ def new_representer(dumper, data):
2929

3030
refs = {
3131
# renovate: git-refs=https://github.com/prometheus-operator/kube-prometheus branch=main
32-
'ref.kube-prometheus': '696ce89f1f4d9107bd3a3b026178b320bac03b8e',
32+
'ref.kube-prometheus': '29bdfe458eec8a85cfcccf36a3657f15c8be543d',
3333
# renovate: git-refs=https://github.com/kubernetes-monitoring/kubernetes-mixin branch=master
34-
'ref.kubernetes-mixin': 'aad557d746a4e05d028a2ce542f61dde3b13c621',
34+
'ref.kubernetes-mixin': '8ea074c438febb8880e5539a1f035eb651a64b37',
3535
# renovate: git-refs=https://github.com/etcd-io/etcd branch=main
36-
'ref.etcd': '21a976e9e254f3938f2ced3eb96310449ccf8bef',
36+
'ref.etcd': '4ad65d9d7c8bd07dbb56553905712d6841a403a7',
3737
}
3838

3939
# Source files list

‎charts/kube-prometheus-stack/hack/sync_prometheus_rules.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ def new_representer(dumper, data):
2929

3030
refs = {
3131
# renovate: git-refs=https://github.com/prometheus-operator/kube-prometheus branch=main
32-
'ref.kube-prometheus': '696ce89f1f4d9107bd3a3b026178b320bac03b8e',
32+
'ref.kube-prometheus': '29bdfe458eec8a85cfcccf36a3657f15c8be543d',
3333
# renovate: git-refs=https://github.com/kubernetes-monitoring/kubernetes-mixin branch=master
34-
'ref.kubernetes-mixin': 'aad557d746a4e05d028a2ce542f61dde3b13c621',
34+
'ref.kubernetes-mixin': '8ea074c438febb8880e5539a1f035eb651a64b37',
3535
# renovate: git-refs=https://github.com/etcd-io/etcd branch=main
36-
'ref.etcd': '21a976e9e254f3938f2ced3eb96310449ccf8bef',
36+
'ref.etcd': '4ad65d9d7c8bd07dbb56553905712d6841a403a7',
3737
}
3838

3939
# Source files list

‎charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/alertmanager-overview.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- /*
2-
Generated from 'alertmanager-overview' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/696ce89f1f4d9107bd3a3b026178b320bac03b8e/manifests/grafana-dashboardDefinitions.yaml
2+
Generated from 'alertmanager-overview' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/29bdfe458eec8a85cfcccf36a3657f15c8be543d/manifests/grafana-dashboardDefinitions.yaml
33
Do not change in-place! In order to change this file first read following link:
44
https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
55
*/ -}}

‎charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- /*
2-
Generated from 'apiserver' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/696ce89f1f4d9107bd3a3b026178b320bac03b8e/manifests/grafana-dashboardDefinitions.yaml
2+
Generated from 'apiserver' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/29bdfe458eec8a85cfcccf36a3657f15c8be543d/manifests/grafana-dashboardDefinitions.yaml
33
Do not change in-place! In order to change this file first read following link:
44
https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
55
*/ -}}

‎charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- /*
2-
Generated from 'cluster-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/696ce89f1f4d9107bd3a3b026178b320bac03b8e/manifests/grafana-dashboardDefinitions.yaml
2+
Generated from 'cluster-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/29bdfe458eec8a85cfcccf36a3657f15c8be543d/manifests/grafana-dashboardDefinitions.yaml
33
Do not change in-place! In order to change this file first read following link:
44
https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
55
*/ -}}

‎charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- /*
2-
Generated from 'controller-manager' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/696ce89f1f4d9107bd3a3b026178b320bac03b8e/manifests/grafana-dashboardDefinitions.yaml
2+
Generated from 'controller-manager' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/29bdfe458eec8a85cfcccf36a3657f15c8be543d/manifests/grafana-dashboardDefinitions.yaml
33
Do not change in-place! In order to change this file first read following link:
44
https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack
55
*/ -}}

0 commit comments

Comments
 (0)