diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 033053a633c0a5e92de378e4636413d9180ee3fe..ef94ee4a970b9ae178a63bb03cbe94e359ab5cc7 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "579dbf34b159c1709f1b63d593aba90925fa72ea" + "version": "1a4c7591220febb47a8af3cc2150c5483189bf6e" }, { "name": "ksonnet", @@ -28,7 +28,7 @@ "subdir": "" } }, - "version": "af494738e1709998696ffbce9296063a20c80692" + "version": "218206a13685626213f3836235e9a81a9384a01e" }, { "name": "grafonnet", @@ -38,7 +38,7 @@ "subdir": "grafonnet" } }, - "version": "3264a8ab6efa23d55da45ea3a3d3b39e86696c76" + "version": "69bc267211790a1c3f4ea6e6211f3e8ffe22f987" }, { "name": "grafana-builder", @@ -48,7 +48,7 @@ "subdir": "grafana-builder" } }, - "version": "76258e92c20a2bca74e7f2630c3f8d562919ec86" + "version": "2b9b14d0d91adf8781e5b2c9b62dc8cb180a9886" }, { "name": "grafana", @@ -58,7 +58,7 @@ "subdir": "grafana" } }, - "version": "c27d2792764867cdaf6484f067cc875cb8aef2f6" + "version": "7fadaf2274d5cbe4ac6fbaf8786e4b7ecf3c1713" }, { "name": "prometheus-operator", @@ -78,7 +78,7 @@ "subdir": "Documentation/etcd-mixin" } }, - "version": "53891cbf9716b942b4f9c5929bbd2781180bf8e0" + "version": "6075b9def1315242e66509439f1b92845cf47a90" } ] } diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 18133259c7f70b7996bd57dcce942b78036cff7e..269e3e0d402d532344d4aaa6ddcf51d6225f87a9 100644 --- a/manifests/grafana-deployment.yaml +++ b/manifests/grafana-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml index c5b925463bb232fe375bd45b7c49f12118967a64..cded9cd76751cf25ac5d9c3d2b97a8c76979e8e7 100644 --- a/manifests/prometheus-rules.yaml +++ b/manifests/prometheus-rules.yaml @@ -726,7 +726,7 @@ spec: components running. runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeversionmismatch expr: | - count(count by (gitVersion) (label_replace(kubernetes_build_info{job!="kube-dns"},"gitVersion","$1","gitVersion","(v[0-9]*.[0-9]*.[0-9]*).*"))) > 1 + count(count by (gitVersion) (label_replace(kubernetes_build_info{job!~"kube-dns|coredns"},"gitVersion","$1","gitVersion","(v[0-9]*.[0-9]*.[0-9]*).*"))) > 1 for: 1h labels: severity: warning