2 Small fixes for the observability scripts (#14)

* Fix negation of cli check Signed-off-by: Jeroen van Erp <[email protected]> * Fix deletion of stackpack Signed-off-by: Jeroen van Erp <[email protected]> --------- Signed-off-by: Jeroen van Erp <[email protected]>
SUSE · Sep 18, 2024 · b7b8b5c · b7b8b5c
1 parent 8abd214
commit b7b8b5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/scripts/observability/cli.sh b/scripts/observability/cli.sh
@@ -4,7 +4,7 @@
 # Install the SUSE Observability CLI
 #######################################
 observability_install_cli() {
-  if [ -x "$(command -v sts)" ]; then
+  if ! [ -x "$(command -v sts)" ]; then
     curl -o- https://dl.stackstate.com/stackstate-cli/install.sh | STS_CLI_LOCATION=/usr/local/bin bash
   else
     echo ">>> sts CLI already installed"

diff --git a/scripts/observability/stackpack.sh b/scripts/observability/stackpack.sh
@@ -14,7 +14,10 @@ observability_delete_stackpack() {
   local service_token=$2
   local cluster_name=$3
 
-  if observability_check_stackpack $url $service_token $cluster_name;  then
+  local stackpacks stackpack_id
+  stackpacks=$(/usr/local/bin/sts stackpack list-instances --name kubernetes-v2 -o json --url $url --service-token $service_token)
+  stackpack_id=$(echo $stackpacks | jq -r '.instances[] | select(.config.kubernetes_cluster_name == "'$cluster_name'") | .id')
+  if [ -n "$stackpack_id" ];  then
     /usr/local/bin/sts stackpack uninstall --id $stackpack_id --url $url --service-token $service_token --name kubernetes-v2
     echo ">>> StackPack for cluster '${cluster_name}' deleted"
   else