diff --git a/perfsonar-logstash/perfsonar-logstash/pipeline_etc/logstash_sysconfig b/perfsonar-logstash/perfsonar-logstash/pipeline_etc/logstash_sysconfig deleted file mode 100644 index 15ff0fa..0000000 --- a/perfsonar-logstash/perfsonar-logstash/pipeline_etc/logstash_sysconfig +++ /dev/null @@ -1,5 +0,0 @@ -## Logstash environment variables. -log_level=info -XPACK_MONITORING_ENABLED=False -RATE_CACHE_MAX_ENTRIES=10000000 -RATE_CACHE_EXPIRES=600 diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.install b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.install index ba5edbf..dde5da3 100644 --- a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.install +++ b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/perfsonar-logstash.install @@ -2,5 +2,4 @@ pipeline/* /usr/lib/perfsonar/logstash/pipeline/ prometheus_pipeline/* /usr/lib/perfsonar/logstash/prometheus_pipeline/ scripts/* /usr/lib/perfsonar/logstash/scripts/ ruby/* /usr/lib/perfsonar/logstash/ruby/ -java/* /usr/lib/perfsonar/logstash/java/ -pipeline_etc/logstash_sysconfig /etc/perfsonar/logstash/ +java/* /usr/lib/perfsonar/logstash/java/ \ No newline at end of file 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 ae40823..01837eb 100644 --- a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec +++ b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec @@ -70,7 +70,6 @@ fi %config(noreplace) %{pipeline_base}/01-inputs.conf %config(noreplace) %{pipeline_base}/99-outputs.conf %config(noreplace) %{prometheus_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