Update PA directories from plugins to root

Signed-off-by: sruti1312 <[email protected]>

Author: sruti1312

config/supervisord.conf

@@ -28,5 +28,5 @@ serverurl=/usr/share/supervisord.sock
 files = /etc/supervisor/conf.d/*.conf
 
 [program:performance_analyzer]
-command=/usr/share/opensearch/plugins/opensearch-performance-analyzer/bin/performance-analyzer-agent /usr/share/opensearch
+command=/usr/share/opensearch/bin/opensearch-performance-analyzer/performance-analyzer-agent /usr/share/opensearch
 user=1000

licenses/performanceanalyzer-rca-2.0.0.0-alpha1-SNAPSHOT.jar.sha1

@@ -0,0 +1 @@
+3b7af77bf18cd2e6d27ae094175304573662bbe1

licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1

@@ -8,10 +8,6 @@ fi
 
 # Prepare the RCA reader process for execution
 mv "$OPENSEARCH_HOME"/plugins/opensearch-performance-analyzer/performance-analyzer-rca $OPENSEARCH_HOME
-if [ -f "$OPENSEARCH_HOME"/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli ]; then
-  mv "$OPENSEARCH_HOME"/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli "$OPENSEARCH_HOME"/bin
-  rm -rf "$OPENSEARCH_HOME"/bin/opensearch-performance-analyzer
-fi
 mkdir -p "$OPENSEARCH_HOME"/data
 mkdir -p "/var/lib/opensearch"
 touch "$OPENSEARCH_HOME"/data/rca_enabled.conf
@@ -29,7 +25,7 @@ if ! grep -q '## OpenSearch Performance Analyzer' /etc/opensearch/jvm.options; t
    echo '## OpenSearch Performance Analyzer' >> /etc/opensearch/jvm.options
    echo "-Dclk.tck=$CLK_TCK" >> /etc/opensearch/jvm.options
    echo "-Djdk.attach.allowAttachSelf=true" >> /etc/opensearch/jvm.options
-   echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/config/opensearch_security.policy" >> /etc/opensearch/jvm.options
+   echo "-Djava.security.policy=file:///usr/share/opensearch/config/opensearch-performance-analyzer/opensearch_security.policy" >> /etc/opensearch/jvm.options
 fi
 
 IS_UPGRADE=false
@@ -53,7 +49,7 @@ if [ "x$IS_UPGRADE" != "xtrue" ]; then
 
     elif command -v chkconfig >/dev/null; then
         echo "### Non systemd distro. Please start and stop performance analyzer manually using the command: "
-        echo "sh /usr/share/opensearch/plugins/opensearch-performance-analyzer/bin/performance-analyzer-agent /usr/share/opensearch -d"
+        echo "sh /usr/share/opensearch/bin/opensearch-performance-analyzer/performance-analyzer-agent /usr/share/opensearch -d"
     fi
 fi
 

packaging/deb/postinst

@@ -3,7 +3,7 @@ Description=OpenSearch Performance Analyzer
 PartOf=opensearch.service
 
 [Service]
-ExecStart=/usr/share/opensearch/bin/performance-analyzer-agent-cli
+ExecStart=/usr/share/opensearch/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli
 Restart=on-failure
 User=opensearch
 Group=opensearch

packaging/opensearch-performance-analyzer.service

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/config/log4j2.xml \
+PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_HOME/config/opensearch-performance-analyzer/log4j2.xml \
               -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \
               -XX:MaxRAM=400m"
 

packaging/performance-analyzer-agent-cli

@@ -14,10 +14,6 @@ fi
 
 # Prepare the RCA reader process for execution
 mv "$OPENSEARCH_HOME"/plugins/opensearch-performance-analyzer/performance-analyzer-rca $OPENSEARCH_HOME
-if [ -f "$OPENSEARCH_HOME"/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli ]; then
-  mv "$OPENSEARCH_HOME"/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli "$OPENSEARCH_HOME"/bin
-  rm -rf "$OPENSEARCH_HOME"/bin/opensearch-performance-analyzer
-fi
 mkdir -p "$OPENSEARCH_HOME"/data
 mkdir -p "/var/lib/opensearch"
 touch "$OPENSEARCH_HOME"/data/rca_enabled.conf
@@ -35,7 +31,7 @@ if ! grep -q '## OpenSearch Performance Analyzer' /etc/opensearch/jvm.options; t
    echo '## OpenSearch Performance Analyzer' >> /etc/opensearch/jvm.options
    echo "-Dclk.tck=$CLK_TCK" >> /etc/opensearch/jvm.options
    echo "-Djdk.attach.allowAttachSelf=true" >> /etc/opensearch/jvm.options
-   echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/config/opensearch_security.policy" >> /etc/opensearch/jvm.options
+   echo "-Djava.security.policy=file:///usr/share/opensearch/config/opensearch-performance-analyzer/opensearch_security.policy" >> /etc/opensearch/jvm.options
 fi
 
 IS_UPGRADE=false
@@ -63,6 +59,6 @@ if [ "x$IS_UPGRADE" != "xtrue" ]; then
 
     elif command -v chkconfig >/dev/null; then
         echo "### Non systemd distro. Please start and stop performance analyzer manually using the command: "
-        echo "sh /usr/share/opensearch/plugins/opensearch-performance-analyzer/bin/performance-analyzer-agent /usr/share/opensearch -d"
+        echo "sh /usr/share/opensearch/bin/opensearch-performance-analyzer/performance-analyzer-agent /usr/share/opensearch -d"
     fi
 fi