Merge ~liushuyu-011/ubuntu/+source/nagios-plugins-rabbitmq:merge-lp2065200 into ubuntu/+source/nagios-plugins-rabbitmq:debian/sid

[Zixing Liu]

This MP merges nagios-plugins-rabbitmq changes from Debian unstable into Ubuntu Oracular.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16127204/+listing-archive-extra

[Simon Quigley (tsimonq2)]

> vitrage-tempest-plugin changes

copy/paste slower ;)

review: Approve

[Zixing Liu (liushuyu-011)]

> > vitrage-tempest-plugin changes
>
> copy/paste slower ;)

I swear I have checked that before hitting the submit button.
Probably missed this one

Unmerged commits

7bb0c6c... by Zixing Liu on 2024-05-08

finalize changelog

f4e8882... by Zixing Liu on 2024-05-08

update-maintainer

75784a1... by Zixing Liu on 2024-05-08

reconstruct-changelog

9695a26... by Zixing Liu on 2024-05-08

merge-changelogs

77c960d... by Zixing Liu on 2024-05-08

d/p/get-stats-from-idle-server.patch: move the code changes to a patch ...

... after the package switched to 3.0 format

e0b4fd9... by Zixing Liu on 2024-05-08

    - Avoid breaking to get stats from an idle server that has
      no socket descriptors open (LP: #1787110)

diff --git a/debian/changelog b/debian/changelog
index 8a64f88..eaa0d0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nagios-plugins-rabbitmq (1:1.2.0-2.5ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2065200). Remaining changes:
+    - Avoid breaking to get stats from an idle server that has
+      no socket descriptors open (LP #1787110)
+  * New Changes:
+    - d/p/get-stats-from-idle-server.patch: move the code changes to a patch
+      after the package switched to 3.0 format
+
+ -- Zixing Liu <[e-mail]>  Wed, 08 May 2024 12:00:31 -0600
+
 nagios-plugins-rabbitmq (1:1.2.0-2.5) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -23,6 +34,13 @@ nagios-plugins-rabbitmq (1:1.2.0-2.3) unstable; urgency=medium
 
  -- Holger Levsen <[e-mail]>  Tue, 05 Jan 2021 16:22:06 +0100
 
+nagios-plugins-rabbitmq (1:1.2.0-2.2ubuntu1) eoan; urgency=medium
+
+  * Avoid breaking to get stats from an idle server that has
+    no socket descriptors open (LP: #1787110)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 24 Sep 2019 10:54:04 +0200
+
 nagios-plugins-rabbitmq (1:1.2.0-2.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 3ace5b6..7f37ae3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: nagios-plugins-rabbitmq
 Section: net
 Priority: optional
-Maintainer: Cyril Bouthors <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Cyril Bouthors <[e-mail]>
 Uploaders: Cyril Bouthors <[e-mail]>, Cyril Bouthors <[e-mail]>
 Build-Depends: debhelper-compat (= 13), rsync, libmodule-build-perl
 Standards-Version: 3.9.5
diff --git a/debian/patches/get-stats-from-idle-server.patch b/debian/patches/get-stats-from-idle-server.patch
new file mode 100644
index 0000000..1453d6f
--- /dev/null
+++ b/debian/patches/get-stats-from-idle-server.patch
@@ -0,0 +1,18 @@
+Description: don't rise critical error when $used is 0
+Author: Thierno IB. BARRY <[e-mail]>
+Origin: upstream, https://github.com/nagios-plugins-rabbitmq/nagios-plugins-rabbitmq/commit/caabebdf4e1d820c19b7d7fa8e682848f22834e9
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nagios-plugins-rabbitmq/+bug/1787110
+Applied-Upstream: commit, caabebdf4e1d820c19b7d7fa8e682848f22834e9
+Last-Update: 2024-05-08
+---
+--- nagios-plugins-rabbitmq-1.2.0.orig/scripts/check_rabbitmq_server
++++ nagios-plugins-rabbitmq-1.2.0/scripts/check_rabbitmq_server
+@@ -165,7 +165,7 @@ sub check {
+     my $warning = shift;
+     my $critical = shift;
+ 
+-    if (!$p || !$used) {
++    if (!$p || !defined($used)) {
+       $p->nagios_exit( return_code=>CRITICAL, message=>'Unable to get values for '.$label);
+     } else {
+       my $value = percent($used, $limit);
diff --git a/debian/patches/series b/debian/patches/series
index 89a561b..da8cd89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 namespace.patch
+get-stats-from-idle-server.patch