From d4085bca6940f5ba0157e43e689156585fe398fb Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Wed, 3 Jan 2024 14:56:18 -0500 Subject: [PATCH 1/3] Add aodh, logging and metric-storage services --- collection-scripts/common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/collection-scripts/common.sh b/collection-scripts/common.sh index 9eb76bb..77082d9 100644 --- a/collection-scripts/common.sh +++ b/collection-scripts/common.sh @@ -56,6 +56,9 @@ declare -a OSP_SERVICES=( "barbican" "dataplane" "ceilometer" + "metric-storage" + "aodh" + "logging" ) export OSP_SERVICES From 6954adfa3161e40553fb3a39c1ba72c3d3b4c9ff Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Wed, 3 Jan 2024 15:49:54 -0500 Subject: [PATCH 2/3] Add *.monitoring.rhobs to gathered CRs --- collection-scripts/gather_crs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/collection-scripts/gather_crs b/collection-scripts/gather_crs index bd055a7..2387c74 100755 --- a/collection-scripts/gather_crs +++ b/collection-scripts/gather_crs @@ -10,9 +10,11 @@ fi # Resource list crs=() -# explictly adding rabbit in the grep because it's not part of the openstack -# umbrella and we rely on the upstream rabbitmq-cluster-operator -for i in $(/usr/bin/oc get crd | grep -E "(openstack|rabbitmq)\.(org|com)" | awk '{print $1}') +# Explictly adding rabbit in the grep because it's not part of the openstack +# umbrella and we rely on the upstream rabbitmq-cluster-operator. +# Also adding monitoring.rhobs, because telemetry uses observability-operator +# for deploying a MonitoringStack for storing and scraping metrics. +for i in $(/usr/bin/oc get crd | grep -E "(openstack|rabbitmq|monitoring)\.(org|com|rhobs)" | awk '{print $1}') do crs+=("$i") done From 35c9f2a2342e58bb5f155127d97fbae146023380 Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Mon, 8 Jan 2024 11:12:40 -0500 Subject: [PATCH 3/3] Rewrite a comment about rabbit CRD domain --- collection-scripts/gather_crs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/collection-scripts/gather_crs b/collection-scripts/gather_crs index 2387c74..302b629 100755 --- a/collection-scripts/gather_crs +++ b/collection-scripts/gather_crs @@ -10,10 +10,9 @@ fi # Resource list crs=() -# Explictly adding rabbit in the grep because it's not part of the openstack -# umbrella and we rely on the upstream rabbitmq-cluster-operator. +# Explictly adding rabbit in the grep because its CRD is named with a different domain. # Also adding monitoring.rhobs, because telemetry uses observability-operator -# for deploying a MonitoringStack for storing and scraping metrics. +# to deploy a `MonitoringStack` for storing and scraping metrics. for i in $(/usr/bin/oc get crd | grep -E "(openstack|rabbitmq|monitoring)\.(org|com|rhobs)" | awk '{print $1}') do crs+=("$i")