From 7a7f29fd399a960d9c7a066019101049d03b1e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A6titia=20Delvaux?= Date: Thu, 22 Jun 2023 16:33:50 +0000 Subject: [PATCH 1/3] Preparing packaging for next version: v5.0.4-0.a1.0 --- .../unibuild-packaging/deb/changelog | 6 ++++++ .../rpm/perfsonar-logstash-output-plugin.spec | 4 ++-- .../perfsonar-logstash/unibuild-packaging/deb/changelog | 6 ++++++ .../unibuild-packaging/rpm/perfsonar-logstash.spec | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/changelog b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/changelog index 708f3c5..e942bcf 100644 --- a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/changelog +++ b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/changelog @@ -1,3 +1,9 @@ +perfsonar-logstash-output-plugin (5.0.4~a1.0-1) perfsonar-5.0-snapshot; urgency=low + + * New upstream version. + + -- Lætitia Delvaux Thu, 22 Jun 2023 16:33:49 +0000 + perfsonar-logstash-output-plugin (5.0.3-1) perfsonar-5.0; urgency=low * New upstream version. 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 c5794a6..14bdd8a 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 @@ -3,8 +3,8 @@ %define plugin_base %{logstash_base}/plugin #Version variables set by automated scripts -%define perfsonar_auto_version 5.0.3 -%define perfsonar_auto_relnum 1 +%define perfsonar_auto_version 5.0.4 +%define perfsonar_auto_relnum 0.a1.0 Name: perfsonar-logstash-output-plugin Version: %{perfsonar_auto_version} diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/changelog b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/changelog index e445f1f..1ea74d3 100644 --- a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/changelog +++ b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/changelog @@ -1,3 +1,9 @@ +perfsonar-logstash (5.0.4~a1.0-1) perfsonar-5.0-snapshot; urgency=low + + * New upstream version. + + -- Lætitia Delvaux Thu, 22 Jun 2023 16:33:49 +0000 + perfsonar-logstash (5.0.3-1) perfsonar-5.0; urgency=low * New upstream version. 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 cd3b2b6..1d52779 100644 --- a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec +++ b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec @@ -6,8 +6,8 @@ %define config_base /etc/perfsonar/logstash #Version variables set by automated scripts -%define perfsonar_auto_version 5.0.3 -%define perfsonar_auto_relnum 1 +%define perfsonar_auto_version 5.0.4 +%define perfsonar_auto_relnum 0.a1.0 Name: perfsonar-logstash Version: %{perfsonar_auto_version} From 6d1d479621c495c8c3f82046797a86dd6a9d0ea0 Mon Sep 17 00:00:00 2001 From: Andy Lake Date: Fri, 14 Jul 2023 15:10:47 -0400 Subject: [PATCH 2/3] Adding string version of lists in trace for convenience --- perfsonar-logstash/perfsonar-logstash/ruby/pscheduler_trace.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/perfsonar-logstash/perfsonar-logstash/ruby/pscheduler_trace.rb b/perfsonar-logstash/perfsonar-logstash/ruby/pscheduler_trace.rb index abacb6c..9b144b3 100644 --- a/perfsonar-logstash/perfsonar-logstash/ruby/pscheduler_trace.rb +++ b/perfsonar-logstash/perfsonar-logstash/ruby/pscheduler_trace.rb @@ -44,8 +44,11 @@ def filter(event) event.set("[@metadata][result][hop][success_count]", success_count) event.set("[@metadata][result][hop][error_count]", error_count) event.set("[@metadata][result][hop][ip]", hop_ips) + event.set("[@metadata][result][hop][ip_str]", hop_ips.join(" ")) event.set("[@metadata][result][hop][as_number]", hop_asns) + event.set("[@metadata][result][hop][as_number_str]", hop_asns.join(" ")) event.set("[@metadata][result][hop][as_organization]", hop_asos) + event.set("[@metadata][result][hop][as_organization_str]", hop_asos.join(" ")) if path_mtu then event.set("[@metadata][result][mtu]", path_mtu) end From 78924b676314f9adeeffcc81664291bfd4faa3a2 Mon Sep 17 00:00:00 2001 From: Andy Lake Date: Mon, 24 Jul 2023 10:41:50 -0400 Subject: [PATCH 3/3] Releasing logstash - RPM 5.0.4-1 - DEB 5.0.4-1 --- .../unibuild-packaging/deb/changelog | 4 ++-- .../rpm/perfsonar-logstash-output-plugin.spec | 2 +- .../perfsonar-logstash/unibuild-packaging/deb/changelog | 4 ++-- .../unibuild-packaging/rpm/perfsonar-logstash.spec | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/changelog b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/changelog index e942bcf..551e88f 100644 --- a/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/changelog +++ b/perfsonar-logstash-output-plugin/perfsonar-logstash-output-plugin/unibuild-packaging/deb/changelog @@ -1,8 +1,8 @@ -perfsonar-logstash-output-plugin (5.0.4~a1.0-1) perfsonar-5.0-snapshot; urgency=low +perfsonar-logstash-output-plugin (5.0.4-1) perfsonar-5.0; urgency=low * New upstream version. - -- Lætitia Delvaux Thu, 22 Jun 2023 16:33:49 +0000 + -- perfSONAR developers Mon, 24 Jul 2023 10:41:50 -0400 perfsonar-logstash-output-plugin (5.0.3-1) perfsonar-5.0; urgency=low 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 14bdd8a..97974ac 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 @@ -4,7 +4,7 @@ #Version variables set by automated scripts %define perfsonar_auto_version 5.0.4 -%define perfsonar_auto_relnum 0.a1.0 +%define perfsonar_auto_relnum 1 Name: perfsonar-logstash-output-plugin Version: %{perfsonar_auto_version} diff --git a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/changelog b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/changelog index 1ea74d3..37aab39 100644 --- a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/changelog +++ b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/deb/changelog @@ -1,8 +1,8 @@ -perfsonar-logstash (5.0.4~a1.0-1) perfsonar-5.0-snapshot; urgency=low +perfsonar-logstash (5.0.4-1) perfsonar-5.0; urgency=low * New upstream version. - -- Lætitia Delvaux Thu, 22 Jun 2023 16:33:49 +0000 + -- perfSONAR developers Mon, 24 Jul 2023 10:41:50 -0400 perfsonar-logstash (5.0.3-1) perfsonar-5.0; urgency=low 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 1d52779..cd3d838 100644 --- a/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec +++ b/perfsonar-logstash/perfsonar-logstash/unibuild-packaging/rpm/perfsonar-logstash.spec @@ -7,7 +7,7 @@ #Version variables set by automated scripts %define perfsonar_auto_version 5.0.4 -%define perfsonar_auto_relnum 0.a1.0 +%define perfsonar_auto_relnum 1 Name: perfsonar-logstash Version: %{perfsonar_auto_version}