From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 10 Mar 2022 19:36:24 +0000 (-0800)
Subject: Service Discovery: Script correction to collect the version of Cassandra.
X-Git-Tag: stable-12.1.0~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e57a78d2fa4afe47b1a5d2d12d4e0a4a71db1073;p=thirdparty%2Fopen-vm-tools.git

Service Discovery: Script correction to collect the version of Cassandra.
---

diff --git a/open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh b/open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh
index 3cdeea2f9..45fd9985e 100644
--- a/open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh
+++ b/open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh
@@ -89,7 +89,12 @@ get_cassandra_version() {
   do
     CASSANDRA_CMD=$(get_command_line $p | grep -Eo "$PATTERN")
     CASSANDRA_INSTALL_PATH=`echo $CASSANDRA_CMD | awk 'match($0,/\/usr\/lib\/[a-zA-Z-]*\/[a-zA-Z\/]*\/apache-cassandra-[0-9.]*\//) {print substr($0,RSTART,RLENGTH)}'`
-    [ ! -z "$CASSANDRA_INSTALL_PATH" ] && echo VERSIONSTART cassandra_version "$("${CASSANDRA_INSTALL_PATH}/bin/cassandra" -v 2>/dev/null)" VERSIONEND
+    if [ ! -z "$CASSANDRA_INSTALL_PATH" ]
+    then
+      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
   done
 }