|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
diff -turN charts/kube-prometheus-stack/charts/grafana/templates/_pod.tpl charts/kube-prometheus-stack.zdt/charts/grafana/templates/_pod.tpl
|
|
|
|
|
--- charts/kube-prometheus-stack/charts/grafana/templates/_pod.tpl 2021-04-22 00:36:35.000000000 +0200
|
|
|
|
|
+++ charts/kube-prometheus-stack.zdt/charts/grafana/templates/_pod.tpl 2021-04-25 11:16:06.807876896 +0200
|
|
|
|
|
@@ -197,11 +197,16 @@
|
|
|
|
|
diff -tubr charts/kube-prometheus-stack/charts/grafana/templates/_pod.tpl charts/kube-prometheus-stack.zdt/charts/grafana/templates/_pod.tpl
|
|
|
|
|
--- charts/kube-prometheus-stack/charts/grafana/templates/_pod.tpl 2021-06-26 19:54:57.000000000 +0200
|
|
|
|
|
+++ charts/kube-prometheus-stack.zdt/charts/grafana/templates/_pod.tpl 2021-07-01 13:31:20.750609396 +0200
|
|
|
|
|
@@ -198,11 +198,16 @@
|
|
|
|
|
- name: FOLDER_ANNOTATION
|
|
|
|
|
value: "{{ .Values.sidecar.dashboards.folderAnnotation }}"
|
|
|
|
|
{{- end }}
|
|
|
|
@ -18,9 +18,21 @@ diff -turN charts/kube-prometheus-stack/charts/grafana/templates/_pod.tpl charts
|
|
|
|
|
{{- end}}
|
|
|
|
|
- name: {{ .Chart.Name }}
|
|
|
|
|
{{- if .Values.image.sha }}
|
|
|
|
|
diff -turN charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml charts/kube-prometheus-stack.zdt/templates/prometheus/rules-1.14/etcd.yaml
|
|
|
|
|
--- charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml 2021-04-22 00:36:35.000000000 +0200
|
|
|
|
|
+++ charts/kube-prometheus-stack.zdt/templates/prometheus/rules-1.14/etcd.yaml 2021-04-25 11:10:33.021207900 +0200
|
|
|
|
|
diff -tubr charts/kube-prometheus-stack/charts/kube-state-metrics/values.yaml charts/kube-prometheus-stack.zdt/charts/kube-state-metrics/values.yaml
|
|
|
|
|
--- charts/kube-prometheus-stack/charts/kube-state-metrics/values.yaml 2021-06-26 19:54:57.000000000 +0200
|
|
|
|
|
+++ charts/kube-prometheus-stack.zdt/charts/kube-state-metrics/values.yaml 2021-07-01 13:33:01.713947294 +0200
|
|
|
|
|
@@ -162,7 +162,7 @@
|
|
|
|
|
- statefulsets
|
|
|
|
|
- storageclasses
|
|
|
|
|
- validatingwebhookconfigurations
|
|
|
|
|
- - verticalpodautoscalers
|
|
|
|
|
+ #- verticalpodautoscalers
|
|
|
|
|
- volumeattachments
|
|
|
|
|
|
|
|
|
|
# Enabling kubeconfig will pass the --kubeconfig argument to the container
|
|
|
|
|
diff -tubr charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml charts/kube-prometheus-stack.zdt/templates/prometheus/rules-1.14/etcd.yaml
|
|
|
|
|
--- charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml 2021-06-26 19:54:57.000000000 +0200
|
|
|
|
|
+++ charts/kube-prometheus-stack.zdt/templates/prometheus/rules-1.14/etcd.yaml 2021-07-01 13:31:20.750609396 +0200
|
|
|
|
|
@@ -54,34 +54,6 @@
|
|
|
|
|
{{- if .Values.defaultRules.additionalRuleLabels }}
|
|
|
|
|
{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
|
|
|
|
@ -56,10 +68,10 @@ diff -turN charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yam
|
|
|
|
|
- alert: etcdGRPCRequestsSlow
|
|
|
|
|
annotations:
|
|
|
|
|
message: 'etcd cluster "{{`{{`}} $labels.job {{`}}`}}": gRPC requests to {{`{{`}} $labels.grpc_method {{`}}`}} are taking {{`{{`}} $value {{`}}`}}s on etcd instance {{`{{`}} $labels.instance {{`}}`}}.'
|
|
|
|
|
diff -turN charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml charts/kube-prometheus-stack.zdt/templates/prometheus/rules-1.14/node-exporter.yaml
|
|
|
|
|
--- charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml 2021-04-22 00:36:35.000000000 +0200
|
|
|
|
|
+++ charts/kube-prometheus-stack.zdt/templates/prometheus/rules-1.14/node-exporter.yaml 2021-04-25 11:10:33.021207900 +0200
|
|
|
|
|
@@ -30,7 +30,7 @@
|
|
|
|
|
diff -tubr charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml charts/kube-prometheus-stack.zdt/templates/prometheus/rules-1.14/node-exporter.yaml
|
|
|
|
|
--- charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml 2021-06-26 19:54:57.000000000 +0200
|
|
|
|
|
+++ charts/kube-prometheus-stack.zdt/templates/prometheus/rules-1.14/node-exporter.yaml 2021-07-01 13:31:20.753942729 +0200
|
|
|
|
|
@@ -31,7 +31,7 @@
|
|
|
|
|
summary: Filesystem is predicted to run out of space within the next 24 hours.
|
|
|
|
|
expr: |-
|
|
|
|
|
(
|
|
|
|
@ -68,7 +80,7 @@ diff -turN charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exp
|
|
|
|
|
and
|
|
|
|
|
predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 24*60*60) < 0
|
|
|
|
|
and
|
|
|
|
|
@@ -48,7 +48,7 @@
|
|
|
|
|
@@ -50,7 +50,7 @@
|
|
|
|
|
summary: Filesystem is predicted to run out of space within the next 4 hours.
|
|
|
|
|
expr: |-
|
|
|
|
|
(
|
|
|
|
@ -77,10 +89,3 @@ diff -turN charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exp
|
|
|
|
|
and
|
|
|
|
|
predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 4*60*60) < 0
|
|
|
|
|
and
|
|
|
|
|
@@ -259,4 +259,4 @@
|
|
|
|
|
{{- if .Values.defaultRules.additionalRuleLabels }}
|
|
|
|
|
{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
|
|
|
|
|
{{- end }}
|
|
|
|
|
-{{- end }}
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
+{{- end }}
|