easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #234 from minhdanh/fix-kubemismatchversion-incorrect-release-0.1

Browse Source 
Fix KubeMismatchVersion false positive alert on Kubernetes < 1.14
This commit is contained in:
Frederic Branczyk
2019-09-24 10:54:35 +02:00
committed by GitHub
parent 72edf488bd 01ad823019
commit 5e1758c453
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "jsonnet/kube-prometheus" "subdir": "jsonnet/kube-prometheus"
} }
}, },
"version": "579dbf34b159c1709f1b63d593aba90925fa72ea" "version": "1a4c7591220febb47a8af3cc2150c5483189bf6e"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "af494738e1709998696ffbce9296063a20c80692" "version": "218206a13685626213f3836235e9a81a9384a01e"
}, },
{ {
"name": "grafonnet", "name": "grafonnet",
@@ -38,7 +38,7 @@
"subdir": "grafonnet" "subdir": "grafonnet"
} }
}, },
"version": "3264a8ab6efa23d55da45ea3a3d3b39e86696c76" "version": "69bc267211790a1c3f4ea6e6211f3e8ffe22f987"
}, },
{ {
"name": "grafana-builder", "name": "grafana-builder",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "76258e92c20a2bca74e7f2630c3f8d562919ec86" "version": "2b9b14d0d91adf8781e5b2c9b62dc8cb180a9886"
}, },
{ {
"name": "grafana", "name": "grafana",
@@ -58,7 +58,7 @@
"subdir": "grafana" "subdir": "grafana"
} }
}, },
"version": "c27d2792764867cdaf6484f067cc875cb8aef2f6" "version": "7fadaf2274d5cbe4ac6fbaf8786e4b7ecf3c1713"
}, },
{ {
"name": "prometheus-operator", "name": "prometheus-operator",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "53891cbf9716b942b4f9c5929bbd2781180bf8e0" "version": "6075b9def1315242e66509439f1b92845cf47a90"
} }
] ]
} }

2
manifests/grafana-deployment.yaml
View File

@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:

2
manifests/prometheus-rules.yaml
View File

@@ -726,7 +726,7 @@ spec:
components running. components running.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeversionmismatch runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeversionmismatch
expr: | 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 for: 1h
labels: labels:
severity: warning severity: warning