Merge branch '5.0.5' into 5.1.0

perfsonar · Aug 28, 2023 · de3fc57 · de3fc57
2 parents 507469a + f71f74e
commit de3fc57
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 38 deletions.
diff --git a/perfsonar-logstash/perfsonar-logstash/Makefile b/perfsonar-logstash/perfsonar-logstash/Makefile
@@ -25,5 +25,4 @@ endif
 	cp -r pipeline/* ${ROOTPATH}/pipeline
 	cp -r ruby/* ${ROOTPATH}/ruby
 	cp -r scripts/* ${ROOTPATH}/scripts
-	cp -r pipeline_etc/* ${CONFIGPATH}
 	cp -r systemd/* ${SYSTEMDPATH}/logstash.service.d/
diff --git a/perfsonar-logstash/perfsonar-logstash/pipeline/99-outputs.conf b/perfsonar-logstash/perfsonar-logstash/pipeline/99-outputs.conf
@@ -6,7 +6,8 @@ output {
             ssl_certificate_verification => false
             user => "${opensearch_output_user}"
             password => "${opensearch_output_password}"
-            index => "pscheduler_%{[test][type]}-%{+YYYY.MM.dd}"
+            action => "create"
+            index => "pscheduler_%{[test][type]}"
         }
     }
 }
diff --git a/perfsonar-logstash/perfsonar-logstash/pipeline_etc/logstash_sysconfig b/perfsonar-logstash/perfsonar-logstash/pipeline_etc/logstash_sysconfig
diff --git a/perfsonar-logstash/perfsonar-logstash/scripts/install_logstash_sysconfig.sh b/perfsonar-logstash/perfsonar-logstash/scripts/install_logstash_sysconfig.sh
diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.install b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.install
@@ -1,4 +1,3 @@
 pipeline/* /usr/lib/perfsonar/logstash/pipeline/
 scripts/* /usr/lib/perfsonar/logstash/scripts/
 ruby/* /usr/lib/perfsonar/logstash/ruby/
-pipeline_etc/logstash_sysconfig /etc/perfsonar/logstash/
diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.postinst b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.postinst
@@ -2,13 +2,13 @@
 # postinst script for perfsonar-logstash
 
 # assign file and directory permissions
+mkdir -p /etc/perfsonar/logstash
 chown -R perfsonar:perfsonar /usr/lib/perfsonar/logstash /etc/perfsonar/logstash
 chmod 644 $(find /usr/lib/perfsonar/logstash -type f) $(find /etc/perfsonar/logstash -type f)
 chmod 755 $(find /usr/lib/perfsonar/logstash -type d) $(find /etc/perfsonar/logstash -type d) /usr/lib/perfsonar/logstash/scripts/*
 
 # run logstash configuration scripts
 python3 /usr/lib/perfsonar/logstash/scripts/update_logstash_pipeline_yml.py
-bash /usr/lib/perfsonar/logstash/scripts/install_logstash_sysconfig.sh
 
 # add systemd override to logstash timeout
 mkdir /etc/systemd/system/logstash.service.d

diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec
@@ -47,9 +47,6 @@ rm -rf %{buildroot}
 #update logstash pipelines.yml
 %{scripts_base}/update_logstash_pipeline_yml.py
 
-#Point at logstash settings
-%{scripts_base}/install_logstash_sysconfig.sh
-
 #Restart/enable logstash
 %systemd_post logstash.service
 if [ "$1" = "1" ]; then
@@ -69,7 +66,6 @@ fi
 %license LICENSE
 %config(noreplace) %{pipeline_base}/01-inputs.conf
 %config(noreplace) %{pipeline_base}/99-outputs.conf
-%config(noreplace) %{config_base}/logstash_sysconfig
 %config(noreplace) %{_sysconfdir}/systemd/system/logstash.service.d/*
 %attr(0755, perfsonar, perfsonar) %{scripts_base}/*
 #Use globs so don't dupicate config files above