diff --git a/assets/control-plane/prometheus-rule.yaml b/assets/control-plane/prometheus-rule.yaml index 5cc21b2657..c48c90f3d5 100644 --- a/assets/control-plane/prometheus-rule.yaml +++ b/assets/control-plane/prometheus-rule.yaml @@ -783,10 +783,10 @@ spec: quantile: "0.99" record: cluster_quantile:scheduler_scheduling_algorithm_duration_seconds:histogram_quantile - expr: | - histogram_quantile(0.99, sum(rate(scheduler_binding_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod)) + histogram_quantile(0.99, sum(rate(scheduler_pod_scheduling_sli_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod)) labels: quantile: "0.99" - record: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile + record: cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile - expr: | histogram_quantile(0.9, sum(rate(scheduler_scheduling_attempt_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod)) labels: @@ -798,10 +798,10 @@ spec: quantile: "0.9" record: cluster_quantile:scheduler_scheduling_algorithm_duration_seconds:histogram_quantile - expr: | - histogram_quantile(0.9, sum(rate(scheduler_binding_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod)) + histogram_quantile(0.9, sum(rate(scheduler_pod_scheduling_sli_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod)) labels: quantile: "0.9" - record: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile + record: cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile - expr: | histogram_quantile(0.5, sum(rate(scheduler_scheduling_attempt_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod)) labels: @@ -813,10 +813,10 @@ spec: quantile: "0.5" record: cluster_quantile:scheduler_scheduling_algorithm_duration_seconds:histogram_quantile - expr: | - histogram_quantile(0.5, sum(rate(scheduler_binding_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod)) + histogram_quantile(0.5, sum(rate(scheduler_pod_scheduling_sli_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod)) labels: quantile: "0.5" - record: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile + record: cluster_quantile:scheduler_pod_scheduling_sli_duration_seconds:histogram_quantile - name: node.rules rules: - expr: | diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json index 5de956043e..3716fd5f29 100644 --- a/jsonnet/jsonnetfile.lock.json +++ b/jsonnet/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "6775d033bc560a4604831837e56cc914e3fe172d", + "version": "d99edb648af6f7ef45b346f97c25def0533e107c", "sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po=" }, { @@ -48,7 +48,7 @@ "subdir": "gen/grafonnet-latest" } }, - "version": "8a27651b56fbdba45a389ccb11440200091c73a1", + "version": "7380c9c64fb973f34c3ec46265621a2b0dee0058", "sum": "V9vAj21qJOc2DlMPDgB1eEjSQU4A+sAA4AXuJ6bd4xc=" }, { @@ -58,7 +58,7 @@ "subdir": "gen/grafonnet-v10.0.0" } }, - "version": "8a27651b56fbdba45a389ccb11440200091c73a1", + "version": "7380c9c64fb973f34c3ec46265621a2b0dee0058", "sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0=" }, { @@ -68,7 +68,7 @@ "subdir": "gen/grafonnet-v11.4.0" } }, - "version": "8a27651b56fbdba45a389ccb11440200091c73a1", + "version": "7380c9c64fb973f34c3ec46265621a2b0dee0058", "sum": "aVAX09paQYNOoCSKVpuk1exVIyBoMt/C50QJI+Q/3nA=" }, { @@ -78,8 +78,8 @@ "subdir": "grafana-builder" } }, - "version": "d1eede9462c03d44dcd4a707aa8e7dcaf155a552", - "sum": "d8iL8gbyQxspZJ8mDGsqHRR/JF3cu+YOaV50vao93Nw=" + "version": "968130109ee8ccdb473ecc99ff8b996ac0feb9f5", + "sum": "YPaA+KJ6JBW9QpxNvl0iAxnC7gL4jRRvulNl6QRkPU0=" }, { "source": { @@ -88,8 +88,8 @@ "subdir": "mixin-utils" } }, - "version": "d1eede9462c03d44dcd4a707aa8e7dcaf155a552", - "sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo=" + "version": "968130109ee8ccdb473ecc99ff8b996ac0feb9f5", + "sum": "kgoIxOkFlpadoT9+HnMZ4LMdaS1HJsAAUQEe1eUg22E=" }, { "source": { @@ -129,8 +129,8 @@ "subdir": "" } }, - "version": "cec7af386c5d615a388f8101430a3b782d220d6c", - "sum": "kTICCjpL3vAC4yIKufo/Gd9YaTTa9MiWS0EDGC/loUM=" + "version": "4655e3d1218abb18e9a484b154b91c91db2bb116", + "sum": "FxTlK+uTcVwqXU2lD94oivkx7CnbKGWjDEAS0ZbQ4KQ=" }, { "source": { @@ -139,8 +139,8 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "9ea375226bc72c0283bd0d35a7d4b3e399749b73", - "sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM=" + "version": "598b0564325ea0f4d33329ef02fd89fd4d3d0e49", + "sum": "QimcNpwZcRriOp64HdmGCJuV6mzDs9FPWJ7XFnko3Yo=" }, { "source": { @@ -149,7 +149,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "9ea375226bc72c0283bd0d35a7d4b3e399749b73", + "version": "598b0564325ea0f4d33329ef02fd89fd4d3d0e49", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -170,7 +170,7 @@ "subdir": "jsonnet/telemeter" } }, - "version": "80acf50b0b105f9a83b2caec8a1e9aba05ab0f4d", + "version": "a54acdfeb2d62c79516d099e37f3319205c903a7", "sum": "sgPbiGdB2J/VDC14OeDwKK8Okru2gYRKygv+urKYuhA=", "name": "telemeter-client" }, @@ -181,8 +181,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "2e016283f2505a99ed03687b36d41d3e9dd5c49f", - "sum": "ky9yNtgZxHDmXiygPo6pJl1GzBOiRfuGKmUEeiv+0rA=" + "version": "4c6f263cd945d2ce61654aaa471a0569601aee23", + "sum": "4A3vxzFJVZyqg6BoUrO/6OEiUXxgMPRA1n7FsJAxgik=" }, { "source": { @@ -191,7 +191,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "0ff52b38b82db983c210eae0147d7d675a23ca70", + "version": "c770259bdf8296b1bc2e0e9ff40200471a3324da", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -202,8 +202,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "0ff52b38b82db983c210eae0147d7d675a23ca70", - "sum": "H2UtUOnr9WTkyyLPJL91T+mgmSjRh3yT0UBos4J3jsI=" + "version": "a50aee4108dcf07f86b1b3e9dfa2bd6ee167f8a8", + "sum": "x5k2v4RHVdbaiUlT+QpWs8yJ+86USm6tzda0lVyPMxY=" }, { "source": { @@ -212,7 +212,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "f7b4feffd3c8d4570e7daed234c4ba56b9ef8b05", + "version": "b6083b71b140189dc7a7ad1e67a24045f440ff65", "sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=", "name": "alertmanager" }, @@ -233,7 +233,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "d0d2699dc5f454ebca53e56247281447f8dd8c5a", + "version": "109f9409ed8df64561bd01870ad16165f036558b", "sum": "UuADJwhNploRwfJYGb0sr2mi+MvswKpumoOMXnGs0Dc=", "name": "prometheus" }, @@ -244,7 +244,7 @@ "subdir": "jsonnet/controller-gen" } }, - "version": "6f16e091a98c44792808d238f1b7db1a97ead23a", + "version": "b2b8a509c328a8843d188d0ae56cf390865d9422", "sum": "xUGxDjMr7V/SpY21Xsr0X3ve/a04du3pRlbrA3I/Uk8=", "name": "pyrra" }, @@ -265,7 +265,7 @@ "subdir": "mixin" } }, - "version": "b3b08ef8d13538b603f0a7af917ccb6960a71b7e", + "version": "5a0cbf8e717c2c497999f69ad67882aacf626fec", "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 de81c00860..1dd6bd3a05 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.87.0 + operator.prometheus.io/version: 0.87.1 service.beta.openshift.io/inject-cabundle: "true" labels: app.kubernetes.io/managed-by: cluster-version-operator 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 fdf5b6f474..39b4498aaa 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.87.0 + operator.prometheus.io/version: 0.87.1 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 626efcd181..0f21a5f594 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.87.0 + operator.prometheus.io/version: 0.87.1 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 97e5049fb5..55bb0c6391 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.87.0 + operator.prometheus.io/version: 0.87.1 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 936a7aa30d..e3e0d1e721 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.87.0 + operator.prometheus.io/version: 0.87.1 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 1f0c49b23f..33657bdaeb 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.87.0 + operator.prometheus.io/version: 0.87.1 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 c71393ec2f..809bcce202 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.87.0 + operator.prometheus.io/version: 0.87.1 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 1d03087414..12907a2c7d 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.87.0 + operator.prometheus.io/version: 0.87.1 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring