From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 6 May 2022 21:27:59 +0000 (-0700)
Subject: Service Discovery: Cassandra service version missed for a default Cassandra installation.
X-Git-Tag: stable-12.1.0~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=875d19750952f575f6f41b6ce4631ecdbe74b90a;p=thirdparty%2Fopen-vm-tools.git

Service Discovery: Cassandra service version missed for a default Cassandra installation.

Updated the get-versions.sh script to correctly report the version of the
Cassandra service running in the guest.
---

diff --git a/open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh b/open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh
index 45fd9985e..5f61e94c0 100644
--- a/open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh
+++ b/open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh
@@ -94,7 +94,10 @@ get_cassandra_version() {
       IS_LI_CASSANDRA=`echo $CASSANDRA_INSTALL_PATH | grep "loginsight"`
       [ ! -z "$IS_LI_CASSANDRA" ] &&  export CASSANDRA_CONF="/storage/core/loginsight/cidata/cassandra/config"
       echo VERSIONSTART cassandra_version "$("${CASSANDRA_INSTALL_PATH}/bin/cassandra" -v 2>/dev/null)" VERSIONEND
-    fi
+    else
+      CASSANDRA_CMD=$(get_command_line $p | grep -Eo "CassandraDaemon")
+      [ ! -z "$CASSANDRA_CMD" ] && echo VERSIONSTART cassandra_version  $($(which cassandra) 2>/dev/null -v) VERSIONEND
+   fi
   done
 }