From: Laura Flores <lflores@ibm.com>
Date: Fri, 17 Jan 2025 22:57:10 +0000 (-0600)
Subject: qa/workunits: fix some details on telemetry workunits
X-Git-Tag: v20.0.0~347^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a3817fa9d8b4f371b1609a718604b10740edcf8;p=ceph.git

qa/workunits: fix some details on telemetry workunits

1. For the telemetry upgrade tests, we want to
   make sure we enable the perf channel before we
   upgrade to test that out.

2. We also want to be sure to set up ident information.
   in the workunits used before the upgrade.

3. We can remove the "opt out" commands in the before-upgrade
   workunits since we want to stay opted in during the upgrade.
   We only opt out after all the checks are complete.

4. We mistakenly test "ceph telemetry show" twice when one
   of then should be "ceph telemetry show-all".

Signed-off-by: Laura Flores <lflores@ibm.com>
---

diff --git a/qa/workunits/test_telemetry_reef.sh b/qa/workunits/test_telemetry_reef.sh
index d0d24c97ffaa..8852a8e80f10 100755
--- a/qa/workunits/test_telemetry_reef.sh
+++ b/qa/workunits/test_telemetry_reef.sh
@@ -1,8 +1,19 @@
 #!/bin/bash -ex
 
+# Set up ident details for cluster
+ceph config set mgr mgr/telemetry/channel_ident true
+ceph config set mgr mgr/telemetry/organization 'ceph-qa'
+ceph config set mgr mgr/telemetry/description 'upgrade test cluster'
+
+#Run preview commands
+ceph telemetry preview
+ceph telemetry preview-device
+ceph telemetry preview-all
+
 # Opt in to new collections right away to avoid "TELEMETRY_CHANGED"
 # warning (see https://tracker.ceph.com/issues/64458)
 ceph telemetry on --license sharing-1-0
+ceph telemetry enable channel perf
 
 # The last_opt_revision remains at 1 since last_opt_revision
 # was phased out for fresh installs of quincy.
@@ -44,9 +55,6 @@ ceph telemetry preview-all
 # Run show commands
 ceph telemetry show
 ceph telemetry show-device
-ceph telemetry show
-
-# Opt out
-ceph telemetry off
+ceph telemetry show-all
 
 echo OK
diff --git a/qa/workunits/test_telemetry_reef_x.sh b/qa/workunits/test_telemetry_reef_x.sh
index 07bd942b9145..763dde39863c 100755
--- a/qa/workunits/test_telemetry_reef_x.sh
+++ b/qa/workunits/test_telemetry_reef_x.sh
@@ -44,7 +44,7 @@ ceph telemetry preview-all
 # Run show commands
 ceph telemetry show
 ceph telemetry show-device
-ceph telemetry show
+ceph telemetry show-all
 
 # Opt out
 ceph telemetry off
diff --git a/qa/workunits/test_telemetry_squid.sh b/qa/workunits/test_telemetry_squid.sh
index ace240a944ec..332ed1c047c9 100755
--- a/qa/workunits/test_telemetry_squid.sh
+++ b/qa/workunits/test_telemetry_squid.sh
@@ -1,8 +1,19 @@
 #!/bin/bash -ex
 
+# Set up ident details for cluster
+ceph config set mgr mgr/telemetry/channel_ident true
+ceph config set mgr mgr/telemetry/organization 'ceph-qa'
+ceph config set mgr mgr/telemetry/description 'upgrade test cluster'
+
+#Run preview commands
+ceph telemetry preview
+ceph telemetry preview-device
+ceph telemetry preview-all
+
 # Opt in to new collections right away to avoid "TELEMETRY_CHANGED"
 # warning (see https://tracker.ceph.com/issues/64458)
 ceph telemetry on --license sharing-1-0
+ceph telemetry enable channel perf
 
 # The last_opt_revision remains at 1 since last_opt_revision
 # was phased out for fresh installs of quincy.
@@ -44,9 +55,6 @@ ceph telemetry preview-all
 # Run show commands
 ceph telemetry show
 ceph telemetry show-device
-ceph telemetry show
-
-# Opt out
-ceph telemetry off
+ceph telemetry show-all
 
 echo OK
diff --git a/qa/workunits/test_telemetry_squid_x.sh b/qa/workunits/test_telemetry_squid_x.sh
index 07bd942b9145..763dde39863c 100755
--- a/qa/workunits/test_telemetry_squid_x.sh
+++ b/qa/workunits/test_telemetry_squid_x.sh
@@ -44,7 +44,7 @@ ceph telemetry preview-all
 # Run show commands
 ceph telemetry show
 ceph telemetry show-device
-ceph telemetry show
+ceph telemetry show-all
 
 # Opt out
 ceph telemetry off