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

Merge pull request #177 from minhdanh/fix-kubemismatchversion-incorrect

Browse Source 
Fix incorrect KubeVersionMismatch alert when `{job=coredns}`
This commit is contained in:
Frederic Branczyk
2019-08-07 16:01:20 +02:00
committed by GitHub
parent e7d1ada775 b5ebde0586
commit 4adb70b017
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "jsonnet/kube-prometheus" "subdir": "jsonnet/kube-prometheus"
} }
}, },
"version": "eb132e923ef07147131a62ed0e597cf0a90e984b" "version": "e7d1ada77544feda4c265c705e1afa7927f6e8ab"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "3596bcd93d15aad44a8403314c37c2ede04e3d8d" "version": "3cf3741fcb8aad72e0d4cb351ef3712a5df58d0f"
}, },
{ {
"name": "grafonnet", "name": "grafonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "8e77b50ee8aea319dac9964b2cc2183f3bc184d2" "version": "c6c1ff2725c07c55fa56e26f7edc451ce1643170"
}, },
{ {
"name": "grafana", "name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "149e5dc291a97eb41585fbd2b44ce00c4db684ad" "version": "0d85aa1b417a7c9646c42130b5d4df8a5aea2714"
}, },
{ {
"name": "prometheus", "name": "prometheus",
@@ -88,7 +88,7 @@
"subdir": "documentation/prometheus-mixin" "subdir": "documentation/prometheus-mixin"
} }
}, },
"version": "0f007373087bfb2d581f77a4a9a47941e5eeee6b" "version": "41151ca8dc069448515f48893b8631b9a3ad8df8"
} }
] ]
} }

4
manifests/prometheus-rules.yaml
View File

@@ -739,7 +739,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
@@ -1131,7 +1131,7 @@ spec:
message: Clock skew detected on node-exporter {{ $labels.namespace }}/{{ $labels.pod message: Clock skew detected on node-exporter {{ $labels.namespace }}/{{ $labels.pod
}}. Ensure NTP is configured correctly on this host. }}. Ensure NTP is configured correctly on this host.
expr: | expr: |
abs(node_timex_offset_seconds{job="node-exporter"}) > 0.03 abs(node_timex_offset_seconds{job="node-exporter"}) > 0.05
for: 2m for: 2m
labels: labels:
severity: warning severity: warning