From 7c6aaee413050dbebeec89194f568893325072fe Mon Sep 17 00:00:00 2001 From: Yftach Herzog Date: Thu, 5 Sep 2024 11:52:59 +0300 Subject: [PATCH 1/2] fix: kube_pod_container_status_restarts_total federate match (#4457) Fix a typo in the match string for the service monitor used for federating metric kube_pod_container_status_restarts_total Signed-off-by: Yftach Herzog --- .../prometheus/base/monitoringstack/monitoringstack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml b/components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml index d77d3e78c17..20e80529705 100644 --- a/components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml +++ b/components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml @@ -115,7 +115,7 @@ spec: - '{__name__="controller_runtime_reconcile_errors_total", namespace!~".*-tenant|openshift-.*|kube-.*"}' - '{__name__="controller_runtime_reconcile_total", namespace!~".*-tenant|openshift-.*|kube-.*"}' - '{__name__="kube_pod_status_unschedulable", namespace!~".*-tenant|openshift-.*|kube-.*"}' - - '{__name__="kube_pod_container_status_restarts_total", namespace="openshift-pipelines|release-service"}' + - '{__name__="kube_pod_container_status_restarts_total", namespace=~"openshift-pipelines|release-service"}' - '{__name__="kube_pod_container_status_waiting_reason", namespace!~".*-tenant|openshift-.*|kube-.*|release-service"}' - '{__name__="kube_pod_status_phase", namespace!~".*-tenant|openshift-.*|kube-.*|release-service"}' - '{__name__="kube_pod_container_status_terminated_reason", namespace="release-service"}' From f9b79eebb1bb73b48df2079aeef6fbc7c9962f92 Mon Sep 17 00:00:00 2001 From: Max Shaposhnyk Date: Thu, 5 Sep 2024 12:03:59 +0300 Subject: [PATCH 2/2] test IBMP dynamic pool (#4458) Signed-off-by: Max Shaposhnyk --- .../staging-downstream/host-config.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/multi-platform-controller/staging-downstream/host-config.yaml b/components/multi-platform-controller/staging-downstream/host-config.yaml index 67debfed133..bfc0dedb9e0 100644 --- a/components/multi-platform-controller/staging-downstream/host-config.yaml +++ b/components/multi-platform-controller/staging-downstream/host-config.yaml @@ -34,10 +34,9 @@ data: linux-c8xlarge/arm64,\ linux/s390x,\ linux-root/arm64,\ - linux-root/amd64,\ - linux/ppc64le\ + linux-root/amd64\ " - #dynamic-pool-platforms: linux/ppc64le + dynamic-pool-platforms: linux/ppc64le instance-tag: rhtap-staging # cpu:memory (1:4) @@ -302,8 +301,8 @@ data: dynamic.linux-ppc64le.cores: "2" dynamic.linux-ppc64le.memory: "8" dynamic.linux-ppc64le.max-instances: "2" - # dynamic.linux-ppc64le.max-age: "120" - # dynamic.linux-ppc64le.concurrency: "2" + dynamic.linux-ppc64le.max-age: "120" + dynamic.linux-ppc64le.concurrency: "2" # host.ppc1.address: "10.130.72.222" # host.ppc1.platform: "linux/ppc64le"