From f8e42d53031adc9e1c1cf4e48aff53d812774f3d Mon Sep 17 00:00:00 2001 From: Sruti Parthiban Date: Wed, 27 Apr 2022 17:50:40 -0700 Subject: [PATCH] Merge from main into 2.0 (#201) * Adding release notes for 2.0.0-rc1 (#193) Signed-off-by: Sagar Upadhyaya * Updating release notes for 2.0.0-rc1 (#196) Signed-off-by: Sagar Upadhyaya * Fix rpm build (#200) Signed-off-by: sruti1312 Co-authored-by: Sagar <99425694+sgup432@users.noreply.github.com> --- ...ceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1 | 2 +- packaging/deb/postinst | 17 +++++++++++------ packaging/performance-analyzer-agent-cli | 2 +- packaging/rpm/postinst | 17 +++++++++++------ 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1 index 73e2ce29..8c234263 100644 --- a/licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1 +++ b/licenses/performanceanalyzer-rca-2.0.0.0-rc1-SNAPSHOT.jar.sha1 @@ -1 +1 @@ -3b7af77bf18cd2e6d27ae094175304573662bbe1 \ No newline at end of file +c65b3ad1382943f3bcd628d388b1497cc8a1fc70 \ No newline at end of file diff --git a/packaging/deb/postinst b/packaging/deb/postinst index 437a2be4..9b2568b5 100644 --- a/packaging/deb/postinst +++ b/packaging/deb/postinst @@ -6,6 +6,11 @@ if [ -z "$OPENSEARCH_HOME" ]; then OPENSEARCH_HOME=/usr/share/opensearch fi +# Make sure the OPENSEARCH_PATH_CONF environment variable is set +if [ -z "$OPENSEARCH_PATH_CONF" ]; then + OPENSEARCH_PATH_CONF=/etc/opensearch +fi + # Prepare the RCA reader process for execution mv "$OPENSEARCH_HOME"/plugins/opensearch-performance-analyzer/performance-analyzer-rca $OPENSEARCH_HOME mkdir -p "$OPENSEARCH_HOME"/data @@ -19,13 +24,13 @@ chown opensearch /var/lib/opensearch/rca_enabled.conf chown -R opensearch "$OPENSEARCH_HOME/performance-analyzer-rca" chmod a+rw /tmp -if ! grep -q '## OpenSearch Performance Analyzer' /etc/opensearch/jvm.options; then +if ! grep -q '## OpenSearch Performance Analyzer' $OPENSEARCH_PATH_CONF/jvm.options; then CLK_TCK=`/usr/bin/getconf CLK_TCK` - echo >> /etc/opensearch/jvm.options - 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/config/opensearch-performance-analyzer/opensearch_security.policy" >> /etc/opensearch/jvm.options + echo >> $OPENSEARCH_PATH_CONF/jvm.options + echo '## OpenSearch Performance Analyzer' >> $OPENSEARCH_PATH_CONF/jvm.options + echo "-Dclk.tck=$CLK_TCK" >> $OPENSEARCH_PATH_CONF/jvm.options + echo "-Djdk.attach.allowAttachSelf=true" >> $OPENSEARCH_PATH_CONF/jvm.options + echo "-Djava.security.policy=file://$OPENSEARCH_PATH_CONF/opensearch-performance-analyzer/opensearch_security.policy" >> $OPENSEARCH_PATH_CONF/jvm.options fi IS_UPGRADE=false diff --git a/packaging/performance-analyzer-agent-cli b/packaging/performance-analyzer-agent-cli index 50ae5e49..387ee065 100644 --- a/packaging/performance-analyzer-agent-cli +++ b/packaging/performance-analyzer-agent-cli @@ -1,6 +1,6 @@ #!/bin/sh -PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_HOME/config/opensearch-performance-analyzer/log4j2.xml \ +PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_PATH_CONF/opensearch-performance-analyzer/log4j2.xml \ -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \ -XX:MaxRAM=400m" diff --git a/packaging/rpm/postinst b/packaging/rpm/postinst index 5baed0d1..4057513c 100644 --- a/packaging/rpm/postinst +++ b/packaging/rpm/postinst @@ -12,6 +12,11 @@ if [ -z "$OPENSEARCH_HOME" ]; then OPENSEARCH_HOME=/usr/share/opensearch fi +# Make sure the OPENSEARCH_PATH_CONF environment variable is set +if [ -z "$OPENSEARCH_PATH_CONF" ]; then + OPENSEARCH_PATH_CONF=/etc/opensearch +fi + # Prepare the RCA reader process for execution mv "$OPENSEARCH_HOME"/plugins/opensearch-performance-analyzer/performance-analyzer-rca $OPENSEARCH_HOME mkdir -p "$OPENSEARCH_HOME"/data @@ -25,13 +30,13 @@ chown opensearch /var/lib/opensearch/rca_enabled.conf chown -R opensearch "$OPENSEARCH_HOME/performance-analyzer-rca" chmod a+rw /tmp -if ! grep -q '## OpenSearch Performance Analyzer' /etc/opensearch/jvm.options; then +if ! grep -q '## OpenSearch Performance Analyzer' $OPENSEARCH_PATH_CONF/jvm.options; then CLK_TCK=`/usr/bin/getconf CLK_TCK` - echo >> /etc/opensearch/jvm.options - 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/config/opensearch-performance-analyzer/opensearch_security.policy" >> /etc/opensearch/jvm.options + echo >> $OPENSEARCH_PATH_CONF/jvm.options + echo '## OpenSearch Performance Analyzer' >> $OPENSEARCH_PATH_CONF/jvm.options + echo "-Dclk.tck=$CLK_TCK" >> $OPENSEARCH_PATH_CONF/jvm.options + echo "-Djdk.attach.allowAttachSelf=true" >> $OPENSEARCH_PATH_CONF/jvm.options + echo "-Djava.security.policy=file://$OPENSEARCH_PATH_CONF/opensearch-performance-analyzer/opensearch_security.policy" >> $OPENSEARCH_PATH_CONF/jvm.options fi IS_UPGRADE=false