Add missing PA configuration files to TAR/Docker (#3066)

* Add missing PA configuration files to TAR/Docker Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * More tweaks Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Jan 9, 2023 · db1ae01 · db1ae01
1 parent f8badd4
commit db1ae01
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/scripts/components/performance-analyzer/install.sh b/scripts/components/performance-analyzer/install.sh
@@ -70,3 +70,14 @@ 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
+
+
diff --git a/scripts/pkg/build_templates/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec b/scripts/pkg/build_templates/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec
@@ -82,7 +82,7 @@ fi
 # Reload other configs
 systemd-tmpfiles --create %{name}.conf
 # Messages
-echo "### NOT starting on installation, please execute the following statements to configure opensearch service to start automatically using systemd"
+echo "### NOT starting on installation, please execute the following statements to configure opensearch-dashboards service to start automatically using systemd"
 echo " sudo systemctl daemon-reload"
 echo " sudo systemctl enable opensearch-dashboards.service"
 echo "### You can start opensearch-dashboards service by executing"

diff --git a/scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec b/scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec
@@ -60,10 +60,6 @@ mkdir -p %{buildroot}%{product_dir}/performance-analyzer-rca
 # Symlinks (do not symlink config dir as security demo installer has dependency, if no presense it will switch to rpm/deb mode)
 ln -s %{data_dir} %{buildroot}%{product_dir}/data
 ln -s %{log_dir}  %{buildroot}%{product_dir}/logs
-# Performance Analyzer Settings
-echo 'true' > %{buildroot}%{data_dir}/rca_enabled.conf
-echo 'true' > %{buildroot}%{config_dir}/performance_analyzer_enabled.conf
-echo 'true' > %{buildroot}%{config_dir}/rca_enabled.conf
 # Change Permissions
 chmod -Rf a+rX,u+w,g-w,o-w %{buildroot}/*
 exit 0