Merge ~mirespace/ubuntu/+source/monitoring-plugins:1940916-1827159-jammy-synthetics-fs into ubuntu/+source/monitoring-plugins:ubuntu/jammy-devel

[Miriam España Acebal]

This is a clone of [MP 414725](https://code.launchpad.net/~mirespace/ubuntu/+source/monitoring-plugins/+git/monitoring-plugins/+merge/414725), except for the version and the lintian report:

---
Hello team,

PPA with the package (monitoring-plugins - 2.3.1-1ubuntu4) is here:

https://launchpad.net/~mirespace/+archive/ubuntu/sru-focal-monitoring-plugins-1940916-1827159-check-disks

sudo add-apt-repository ppa:mirespace/sru-focal-monitoring-plugins-1940916-1827159-check-disks
sudo apt-get update

This bug is a side-effect of bug 1827159, where the synthetic filesystems (tmp, squash, trace) were excluded by default to avoid false positives: if the user wants to explicitly check for this kind of filesystem (including them on command line) or to check a mount point based on some of them, the result was DISK UNKNOWN (as it was excluded by default).

The approach here has been excluding this kind of filesystem only if it's not included via path (-p option) nor by including (-N option).

The code also can be expanded later for another similar kind of filesystems if needed in the future.

The package has no test.

These are the lintian warnings present:
❯ lintian --pedantic
W: monitoring-plugins source: debian-rules-should-not-set-CFLAGS-from-noopt
W: monitoring-plugins source: newer-standards-version 4.5.1 (current is 4.5.0)
P: monitoring-plugins source: no-dep5-copyright
P: monitoring-plugins source: package-uses-old-debhelper-compat-version 10
P: monitoring-plugins source: rules-requires-root-missing

SRU template was filed in the bug with the steps for reproducing, bad and good cases.

Thanks in advance for your time in reviewing this.

[Bryce Harrington (bryce)]

Verified this includes the same changes as the focal branch, and builds properly. There are no autopkgtests but verified invoking autopkgtest does not fail.

Looks good, uploading:

$ dput ubuntu ../*source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../monitoring-plugins_2.3.1-1ubuntu4_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../monitoring-plugins_2.3.1-1ubuntu4.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading monitoring-plugins_2.3.1-1ubuntu4.dsc: done.
  Uploading monitoring-plugins_2.3.1-1ubuntu4.debian.tar.xz: done.
  Uploading monitoring-plugins_2.3.1-1ubuntu4_source.buildinfo: done.
  Uploading monitoring-plugins_2.3.1-1ubuntu4_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 2b7bf15..6159c83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+monitoring-plugins (2.3.1-1ubuntu4) jammy; urgency=medium
+
+  * d/p/exclude-tmpfs-squashfs-tracefs.patch: Adding synthetic filesystems
+    for exclusion only if they have not been included and no mount point
+    has been provided in command line. Re-implementing solution for
+    LP bug 1827159. (LP: #1940916).
+
+ -- Miriam España Acebal <[e-mail]>  Wed, 02 Feb 2022 13:35:26 +0100
+
 monitoring-plugins (2.3.1-1ubuntu3) jammy; urgency=medium
 
   * No-change rebuild against libssl3
diff --git a/debian/patches/exclude-tmpfs-squashfs-tracefs.patch b/debian/patches/exclude-tmpfs-squashfs-tracefs.patch
index b29d75c..e9200dc 100644
--- a/debian/patches/exclude-tmpfs-squashfs-tracefs.patch
+++ b/debian/patches/exclude-tmpfs-squashfs-tracefs.patch
@@ -2,29 +2,54 @@ Description: Exclude tmpfs, squashfs, and tracefs.
  These synthetic filesystems always report 100% disk usage by design, so
  can generate false-positive "disk full" alerts.  While it is possible to
  exclude these via command line arguments, it is more convenient to
- ignore them directly by the tool.
+ ignore them directly by the tool taking into account if they have been
+ included by options or not and if a mount point has been provided in
+ the args.
 Author: Bryce Harrington <[e-mail]>
+        Miriam España Acebal <[e-mail]>
 Bug-Ubuntu: https://bugs.launchpad.net/nagios-charm/+bug/1827159
-Forwarded: yes, https://github.com/monitoring-plugins/monitoring-plugins/pull/1609
+            https://bugs.launchpad.net/ubuntu/+source/monitoring-plugins/+bug/1940916
+Forwarded: yes, https://github.com/monitoring-plugins/monitoring-plugins/pull/1749
 Last-Update: 2019-11-07
 ---
  plugins/check_disk.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/plugins/check_disk.c b/plugins/check_disk.c
-index e73a008..ec5d663 100644
 --- a/plugins/check_disk.c
 +++ b/plugins/check_disk.c
-@@ -471,6 +471,9 @@ process_arguments (int argc, char **argv)
-     return ERROR;
+@@ -417,7 +417,7 @@
+ int
+ process_arguments (int argc, char **argv)
+ {
+-  int c, err;
++  int c, err, i;
+   struct parameter_list *se;
+   struct parameter_list *temp_list = NULL, *previous = NULL;
+   struct mount_entry *me;
+@@ -467,11 +467,11 @@
+     {0, 0, 0, 0}
+   };
  
-   np_add_name(&fs_exclude_list, "iso9660");
-+  np_add_name(&fs_exclude_list, "squashfs");
-+  np_add_name(&fs_exclude_list, "tmpfs");
-+  np_add_name(&fs_exclude_list, "tracefs");
++  char filesystems[3][10] = { "tmpfs", "squashfs", "tracefs" };
++
+   if (argc < 2)
+     return ERROR;
  
+-  np_add_name(&fs_exclude_list, "iso9660");
+-
    for (c = 1; c < argc; c++)
      if (strcmp ("-to", argv[c]) == 0)
--- 
-2.17.1
-
+       strcpy (argv[c], "-t");
+@@ -785,6 +785,12 @@
+     mult = (uintmax_t)1024 * 1024;
+   }
+ 
++  for (i = 0; i < 3; i++)
++    if (!np_find_name (fs_include_list, filesystems[i]) && (path_selected == FALSE))
++      np_add_name(&fs_exclude_list, filesystems[i]);
++
++  np_add_name(&fs_exclude_list, "iso9660");
++
+   return TRUE;
+ }
+