From 9a3e6393452ea59488148bf207dba80fd4589dc7 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Mon, 19 Oct 2020 12:29:48 +0200
Subject: [PATCH] jsonnet/kube-prometheus: update Prometheus dependency to
v2.22.0
---
README.md | 4 ++--
examples/all-namespaces.jsonnet | 2 +-
examples/strip-limits.jsonnet | 2 +-
jsonnet/kube-prometheus/jsonnetfile.json | 2 +-
jsonnetfile.lock.json | 4 ++--
manifests/prometheus-rules.yaml | 9 +++++++++
6 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 56843680..eb18ee96 100644
--- a/README.md
+++ b/README.md
@@ -657,7 +657,7 @@ In case you want to monitor all namespaces in a cluster, you can add the followi
[embedmd]:# (examples/all-namespaces.jsonnet)
```jsonnet
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
- (import 'kube-prometheus/kube-prometheus-all-namespaces.libsonnet') + {
+ (import 'kube-prometheus/kube-prometheus-all-namespaces.libsonnet') + {
_config+:: {
namespace: 'monitoring',
@@ -704,7 +704,7 @@ To do that, one can import the following mixin
[embedmd]:# (examples/strip-limits.jsonnet)
```jsonnet
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
- (import 'kube-prometheus/kube-prometheus-strip-limits.libsonnet') + {
+ (import 'kube-prometheus/kube-prometheus-strip-limits.libsonnet') + {
_config+:: {
namespace: 'monitoring',
},
diff --git a/examples/all-namespaces.jsonnet b/examples/all-namespaces.jsonnet
index 24afe672..7c5d149f 100644
--- a/examples/all-namespaces.jsonnet
+++ b/examples/all-namespaces.jsonnet
@@ -1,5 +1,5 @@
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
- (import 'kube-prometheus/kube-prometheus-all-namespaces.libsonnet') + {
+ (import 'kube-prometheus/kube-prometheus-all-namespaces.libsonnet') + {
_config+:: {
namespace: 'monitoring',
diff --git a/examples/strip-limits.jsonnet b/examples/strip-limits.jsonnet
index 5113da1b..69912b64 100644
--- a/examples/strip-limits.jsonnet
+++ b/examples/strip-limits.jsonnet
@@ -1,5 +1,5 @@
local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
- (import 'kube-prometheus/kube-prometheus-strip-limits.libsonnet') + {
+ (import 'kube-prometheus/kube-prometheus-strip-limits.libsonnet') + {
_config+:: {
namespace: 'monitoring',
},
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index 4da94526..fdd27e32 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -90,7 +90,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "release-2.20",
+ "version": "release-2.22",
"name": "prometheus"
}
],
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 66064551..6fa938e1 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -129,8 +129,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "983ebb4a513302315a8117932ab832815f85e3d2",
- "sum": "TBq4SL7YsPInARbJqwz25JaBvvAegcnRCsuz3K9niWc=",
+ "version": "0a7fdd3b76960808c3a91d92267c3d815c1bc354",
+ "sum": "CGxvaHkP7z/gnsLB/8Imvt/AnW+9nJUnTcL+fvIAZUs=",
"name": "prometheus"
},
{
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 0512bdf4..31ba10b0 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -1906,6 +1906,15 @@ spec:
for: 15m
labels:
severity: warning
+ - alert: PrometheusTargetLimitHit
+ annotations:
+ description: Prometheus {{$labels.namespace}}/{{$labels.pod}} has dropped {{ printf "%.0f" $value }} targets because the number of targets exceeded the configured target_limit.
+ summary: Prometheus has dropped targets because some scrape configs have exceeded the targets limit.
+ expr: |
+ increase(prometheus_target_scrape_pool_exceeded_target_limit_total{job="prometheus-k8s",namespace="monitoring"}[5m]) > 0
+ for: 15m
+ labels:
+ severity: warning
- name: alertmanager.rules
rules:
- alert: AlertmanagerConfigInconsistent
--
GitLab