diff --git a/README.md b/README.md index 568436807d4c0725f84f9999f2913f3e204c0d3c..eb18ee9602ef92cb69f4ea0053bdf67b0ec8854e 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 24afe6720e3da60f951dcd702802004206dce47f..7c5d149f1473ae4a856bbf386845562b594aa15f 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 5113da1bd08722b351ddfd69d241ba1ab79db9b3..69912b648d471f4a97aad3a012436f65ba80dd1f 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 4da94526a3ee99e7c45a2aea31214847fe80085f..fdd27e325f21cb482b3590aff184729a6cd1319d 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 66064551b26ad596a580c6944021af9dd6428c1a..6fa938e1454433d9e715f4c662fc8b0ed8c398c6 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 0512bdf4fad44a9b91a3d8d4a569cd25bdf601a4..31ba10b0ea3dc6d9d8525b3f7ca38e4685452040 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