From 5bc517388298d068a74af053cd06ea00fbdbaf37 Mon Sep 17 00:00:00 2001 From: Andy Lake Date: Thu, 26 Oct 2023 13:01:40 -0400 Subject: [PATCH] Got around push issue, so adding rest of logstash updates --- .../deb/perfsonar-logstash-output-plugin.install | 2 +- .../deb/perfsonar-logstash-output-plugin.postinst | 4 ++-- .../rpm/perfsonar-logstash-output-plugin.spec | 7 ++++--- .../unibuild-packaging/deb/perfsonar-logstash.postinst | 2 -- .../unibuild-packaging/rpm/perfsonar-logstash.spec | 2 -- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/perfsonar-logstash-output-plugin.install b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/perfsonar-logstash-output-plugin.install index fd96457..bae8933 100644 --- a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/perfsonar-logstash-output-plugin.install +++ b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/perfsonar-logstash-output-plugin.install @@ -1 +1 @@ -plugin/logstash-output-plugin-offline-7.17.9.zip /usr/lib/perfsonar/logstash/plugin/ +plugin/logstash-output-plugin-offline-8.10.4.zip /usr/lib/perfsonar/logstash/plugin/ diff --git a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/perfsonar-logstash-output-plugin.postinst b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/perfsonar-logstash-output-plugin.postinst index 5ae69c1..ebfbc8f 100644 --- a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/perfsonar-logstash-output-plugin.postinst +++ b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/perfsonar-logstash-output-plugin.postinst @@ -9,10 +9,10 @@ if [ ! -z "$PLUGIN_INSTALLED" ]; then #if upgrade, safely remove old plugin before adding new systemctl stop logstash /usr/share/logstash/bin/logstash-plugin remove $PLUGIN_INSTALLED - /usr/share/logstash/bin/logstash-plugin install file:/usr/lib/perfsonar/logstash/plugin/logstash-output-plugin-offline-7.17.9.zip + /usr/share/logstash/bin/logstash-plugin install file:/usr/lib/perfsonar/logstash/plugin/logstash-output-plugin-offline-8.10.4.zip systemctl start logstash else - /usr/share/logstash/bin/logstash-plugin install file:/usr/lib/perfsonar/logstash/plugin/logstash-output-plugin-offline-7.17.9.zip + /usr/share/logstash/bin/logstash-plugin install file:/usr/lib/perfsonar/logstash/plugin/logstash-output-plugin-offline-8.10.4.zip fi #DEBHELPER# diff --git a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/rpm/perfsonar-logstash-output-plugin.spec b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/rpm/perfsonar-logstash-output-plugin.spec index 3a0a558..8ca4179 100644 --- a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/rpm/perfsonar-logstash-output-plugin.spec +++ b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/rpm/perfsonar-logstash-output-plugin.spec @@ -1,6 +1,7 @@ %define install_base /usr/lib/perfsonar/ %define logstash_base %{install_base}/logstash %define plugin_base %{logstash_base}/plugin +%define plugin_version 8.10.4 #Version variables set by automated scripts %define perfsonar_auto_version 5.1.0 @@ -39,12 +40,12 @@ rm -rf %{buildroot} %post if [ "$1" = "1" ]; then #if new install, add plugin to logstash - /usr/share/logstash/bin/logstash-plugin install file:%{plugin_base}/logstash-output-plugin-offline-7.17.9.zip + /usr/share/logstash/bin/logstash-plugin install file:%{plugin_base}/logstash-output-plugin-offline-%{plugin_version}.zip else #if upgrade, safely remove old plugin before adding new systemctl stop logstash.service /usr/share/logstash/bin/logstash-plugin remove logstash-output-opensearch - /usr/share/logstash/bin/logstash-plugin install file:%{plugin_base}/logstash-output-plugin-offline-7.17.9.zip + /usr/share/logstash/bin/logstash-plugin install file:%{plugin_base}/logstash-output-plugin-offline-%{plugin_version}.zip systemctl start logstash.service fi @@ -59,7 +60,7 @@ fi %files %defattr(0644,perfsonar,perfsonar,0755) %license LICENSE -%attr(0755, logstash, logstash) %{plugin_base}/logstash-output-plugin-offline-7.17.9.zip +%attr(0755, logstash, logstash) %{plugin_base}/logstash-output-plugin-offline-%{plugin_version}.zip %changelog * Sun Mar 21 2021 andy@es.net 4.4.0-0.0.a1 diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.postinst b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.postinst index 02b9895..36709a3 100644 --- a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.postinst +++ b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.postinst @@ -9,8 +9,6 @@ chmod 755 $(find /usr/lib/perfsonar/logstash -type d) $(find /etc/perfsonar/logs # run logstash configuration scripts python3 /usr/lib/perfsonar/logstash/scripts/update_logstash_pipeline_yml.py -#make sure httpd input plugin is updated -/usr/share/logstash/bin/logstash-plugin update logstash-input-http_poller # 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 index 77b3089..01837eb 100644 --- a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec +++ b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec @@ -49,8 +49,6 @@ rm -rf %{buildroot} %post #update logstash pipelines.yml %{scripts_base}/update_logstash_pipeline_yml.py -#make sure httpd input plugin is updated -/usr/share/logstash/bin/logstash-plugin update logstash-input-http_poller #Restart/enable logstash %systemd_post logstash.service