diff --git a/assets/prometheus-k8s/prometheus-rule.yaml b/assets/prometheus-k8s/prometheus-rule.yaml index 819a8e8fa5..ea7a9f2206 100644 --- a/assets/prometheus-k8s/prometheus-rule.yaml +++ b/assets/prometheus-k8s/prometheus-rule.yaml @@ -62,8 +62,8 @@ spec: severity: warning - alert: PrometheusErrorSendingAlertsToSomeAlertmanagers annotations: - description: '{{ printf "%.1f" $value }}% errors while sending alerts from Prometheus {{$labels.namespace}}/{{$labels.pod}} to Alertmanager {{$labels.alertmanager}}.' - summary: Prometheus has encountered more than 1% errors sending alerts to a specific Alertmanager. + description: '{{ printf "%.1f" $value }}% of alerts sent by Prometheus {{$labels.namespace}}/{{$labels.pod}} to Alertmanager {{$labels.alertmanager}} were affected by errors.' + summary: More than 1% of alerts sent by Prometheus to a specific Alertmanager were affected by errors. expr: | ( rate(prometheus_notifications_errors_total{job=~"prometheus-k8s|prometheus-user-workload"}[5m]) diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json index 4e456a6664..4ed11a1f4e 100644 --- a/jsonnet/jsonnetfile.lock.json +++ b/jsonnet/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "bd8896364a1d9adb554b538232004e5b2d6c850a", + "version": "3d46df15f74d381273423229d9fa3136584bec78", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -88,7 +88,7 @@ "subdir": "grafana-builder" } }, - "version": "ab84b9f67c7a7f61e0c0a311afb47a1af4f5903f", + "version": "57b0b85dc1d7ed5e30c2e41f3bd26744b8aef519", "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo=" }, { @@ -140,7 +140,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "0738de0be2ba1607aac8b58a0d783891664d48a9", + "version": "32e7727ff4613b0f55dfc18aff15afb8c04d03c5", "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4=" }, { @@ -150,7 +150,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "0738de0be2ba1607aac8b58a0d783891664d48a9", + "version": "32e7727ff4613b0f55dfc18aff15afb8c04d03c5", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -171,8 +171,8 @@ "subdir": "jsonnet/telemeter" } }, - "version": "0453f452b7ca677e3be10faa95bea714733b4830", - "sum": "0m1kvO0SH4YoldGek69nhBGMTPxYz3gYcyNhfrymAOE=", + "version": "700802fe29aba4ed602309f0c68222c4bedb08f5", + "sum": "53k2pqb4mjABCulTT/H5d7pQDiemIOO23gzfon7g9K4=", "name": "telemeter-client" }, { @@ -182,8 +182,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "69d9636b64192418d64912c032f5437361e88ea5", - "sum": "W4HnSyscMMutOCaDyjNZy1XXcdhRPibYuV1yVgqxXm0=" + "version": "fa9a3fdd5c24f32fffc717b19bdf281e830db364", + "sum": "i13AMiwcZqbAl33BG2homuZIOPihkLdqbxRuwef9ZTg=" }, { "source": { @@ -192,7 +192,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "3c35a6d7baf761cc2e4426d508528e913cc9aab2", + "version": "88e9db83e649cd5126a59b9bde4fd8cca6e452f7", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -203,8 +203,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "40104e6b861f6794243d65a11ef5ba3bc356e121", - "sum": "rgCAJulmuWjMCgd17hyaw4CE/G52MnPZH8Bd6kLmnW4=" + "version": "9efea40e09ee6d80627c40b0ef208af200ecd7d5", + "sum": "C4oz34hEILHHKOHgaI+XvZur0cKObfU+cYy30e5tApQ=" }, { "source": { @@ -213,7 +213,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "ff8c09d60174f27850830ceed6be38b3cf86974b", + "version": "82b89dc769b324400edb88ad3384a6121f7c1468", "sum": "Mf4h1BYLle2nrgjf/HXrBbl0Zk8N+xaoEM017o0BC+k=", "name": "alertmanager" }, @@ -224,7 +224,7 @@ "subdir": "docs/node-mixin" } }, - "version": "07ee8efaa4f8e7260eb8611f3f42973cbbf8ce8f", + "version": "cf8c6891cc610e54f70383addd4bb6079f0add35", "sum": "cQCW+1N0Xae5yXecCWDK2oAlN0luBS/5GrwBYSlaFms=" }, { @@ -234,8 +234,8 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "3c5551df68442dd07668987e0685d12d9c3138dd", - "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=", + "version": "cd1f8ac129a289be8e7d98b6de57a9ba5814c406", + "sum": "OYT5u3S8DbamuJV/v3gbWSteOvFzMeNwMj+u4Apk7jM=", "name": "prometheus" }, { @@ -266,7 +266,7 @@ "subdir": "mixin" } }, - "version": "df3df36986e07b21aaa88adefb5fbf0b648129b8", + "version": "51fddeb28d78ffcc67e38117c5f6294932800ec9", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=" } ], diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml index 7303d9abee..06f1129d6f 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 service.beta.openshift.io/inject-cabundle: "true" labels: app.kubernetes.io/managed-by: cluster-version-operator @@ -738,6 +738,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -1641,6 +1647,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -2369,6 +2381,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -3083,6 +3101,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -3821,6 +3845,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -4654,6 +4684,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -5325,6 +5361,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -6088,6 +6130,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -6783,6 +6831,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -7438,6 +7492,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -8082,6 +8142,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -8787,6 +8853,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -9677,6 +9749,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -10559,6 +10637,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -11273,6 +11357,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -11981,6 +12071,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -12698,6 +12794,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -13503,6 +13605,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -14167,6 +14275,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -14916,6 +15030,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -15597,6 +15717,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -16243,6 +16369,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -16880,6 +17012,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -17564,6 +17702,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml index 0e40aea964..a289c512c1 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml index 1068cdfac2..79349f8a33 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml index a43a2d569e..1832de1e7e 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml index 419e2fbb8f..d25c93a7e3 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml index b92f011efe..e03b4be79d 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml index e2d2e9e3ed..0e75a78b0c 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml index 72834063e2..cda8e44bb2 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring