Add PA fix to missing config files errors (#3090)

* Add PA fix to missing config files errors Signed-off-by: Peter Zhu <[email protected]> * Add more changes Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Jan 11, 2023 · be73801 · be73801
1 parent 0eb9e40
commit be73801
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/scripts/components/OpenSearch-Dashboards/install.sh b/scripts/components/OpenSearch-Dashboards/install.sh
@@ -48,7 +48,7 @@ while getopts ":h:v:s:o:p:a:d:f:" arg; do
             DISTRIBUTION=$OPTARG
             ;;
         f)
-            ARTIFACTS=$ARTIFACTS
+            ARTIFACTS=$OPTARG
             ;;
         :)
             echo "Error: -${OPTARG} requires an argument"

diff --git a/scripts/components/OpenSearch/install.sh b/scripts/components/OpenSearch/install.sh
@@ -48,7 +48,7 @@ while getopts ":h:v:s:o:p:a:d:f:" arg; do
             DISTRIBUTION=$OPTARG
             ;;
         f)
-            ARTIFACTS=$ARTIFACTS
+            ARTIFACTS=$OPTARG
             ;;
         :)
             echo "Error: -${OPTARG} requires an argument"

diff --git a/scripts/components/performance-analyzer/install.sh b/scripts/components/performance-analyzer/install.sh
@@ -44,7 +44,7 @@ while getopts ":h:v:s:o:p:a:f:" arg; do
             ARCHITECTURE=$OPTARG
             ;;
         f)
-            ARTIFACTS=$ARTIFACTS
+            ARTIFACTS=$OPTARG
             ;;
         :)
             echo "Error: -${OPTARG} requires an argument"
@@ -71,13 +71,9 @@ fi
 ## Setup Performance Analyzer Agent
 mv $OUTPUT/plugins/opensearch-performance-analyzer/performance-analyzer-rca $OUTPUT/
 
-## Create data directory by default
-## Do nothing if the directory already exists
-mkdir -p $OUTPUT/data
-
 ## Performance Analyzer Configs
-echo 'true' > $OUTPUT/data/rca_enabled.conf
-echo 'true' > $OUTPUT/config/performance_analyzer_enabled.conf
-echo 'true' > $OUTPUT/config/rca_enabled.conf
-
-
+if echo $ARTIFACTS | grep -Eo '/deb/|/rpm/'; then
+    echo "DEB/RPM configs"
+    echo 'true' > $OUTPUT/../var/lib/opensearch/rca_enabled.conf
+    echo 'true' > $OUTPUT/../var/lib/opensearch/performance_analyzer_enabled.conf
+fi
diff --git a/scripts/default/install.sh b/scripts/default/install.sh
@@ -47,7 +47,7 @@ while getopts ":h:v:q:s:o:p:a:f:" arg; do
             ARCHITECTURE=$OPTARG
             ;;
         f)
-            ARTIFACTS=$ARTIFACTS
+            ARTIFACTS=$OPTARG
             ;;
         :)
             echo "Error: -${OPTARG} requires an argument"

diff --git a/scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec b/scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec
@@ -151,9 +151,6 @@ exit 0
 %config(noreplace) %{config_dir}/%{name}.yml
 %config(noreplace) %{config_dir}/jvm.options
 %config(noreplace) %{config_dir}/log4j2.properties
-%config(noreplace) %{config_dir}/performance_analyzer_enabled.conf
-%config(noreplace) %{data_dir}/rca_enabled.conf
-%config(noreplace) %{config_dir}/rca_enabled.conf
 
 # Service files
 %attr(0644, root, root) %{_prefix}/lib/systemd/system/%{name}.service