From 1e2387474a449452b78520b9ad96a8b4b5e99722 Mon Sep 17 00:00:00 2001
From: Harald Pfeiffer <coding@lirion.de>
Date: Wed, 17 Apr 2019 19:07:19 +0200
Subject: initial commit of source fetch

---
 .../debian/patches/check_memory/monitoring-plugin  | 43 ++++++++++++++++++
 .../debian/patches/check_memory/new_free           | 53 ++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory/monitoring-plugin
 create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory/new_free

(limited to 'nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory')

diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory/monitoring-plugin b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory/monitoring-plugin
new file mode 100644
index 0000000..8303246
--- /dev/null
+++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory/monitoring-plugin
@@ -0,0 +1,43 @@
+diff --git a/check_memory/check_memory b/check_memory/check_memory
+index bf46711..4f272d1 100644
+--- a/check_memory/check_memory
++++ b/check_memory/check_memory
+@@ -23,14 +23,36 @@
+ use strict;
+ use warnings;
+ use vars qw($PROGNAME $VERSION $FREECMD $UNIT);
+-use Nagios::Plugin;
++
++sub load_module {
++    my @names = @_;
++    my $module;
++    for my $name (@names) {
++        my $file = $name;
++        # requires need either a bare word or a file name
++        $file =~ s{::}{/}gsxm;
++        $file .= '.pm';
++        eval {
++            require $file;
++            $name->import();
++            $module = $name;
++		};
++		last if $module;
++    }
++    return $module;
++}
++
++my $plugin_module;
++BEGIN {
++	$plugin_module = load_module( 'Monitoring::Plugin', 'Nagios::Plugin' );
++}
+ 
+ $PROGNAME = "check_memory";
+ $VERSION = '1.0.1';
+ $FREECMD = '/usr/bin/free';
+ $UNIT = 'M';
+ 
+-my $np = Nagios::Plugin->new(
++my $np = $plugin_module->new(
+   usage => "Usage: %s [ -w <warning_threshold> ] [ -c <critical_threshold> ]\n"
+     . '   [ -u <unit> ]',
+   version => $VERSION,
diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory/new_free b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory/new_free
new file mode 100644
index 0000000..86f4335
--- /dev/null
+++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_memory/new_free
@@ -0,0 +1,53 @@
+From df189de31d33f40b894c33482dbdf9f61eaf1177 Mon Sep 17 00:00:00 2001
+From: Simon Ruderich <simon@ruderich.org>
+Date: Tue, 26 Jul 2016 18:50:38 +0200
+Subject: [PATCH] Fixing for new free output.
+
+The output of free doesn't anymore contain the "buffers/cache"
+line breaking the check_memory plugin. The attached patch uses
+instead the new "available" column to calculate the free memory
+as it seems to be a better estimation of free (usable) memory.
+---
+ check_memory/check_memory | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/check_memory/check_memory b/check_memory/check_memory
+index 8369a9e..70d0514 100755
+--- a/check_memory/check_memory
++++ b/check_memory/check_memory
+@@ -104,12 +104,23 @@ open(RESULT, "$FREECMD -b |")
+   or $np->nagios_exit('CRITICAL', "Could not run $FREECMD");
+ 
+ warn("Output from $FREECMD:\n") if ($verbose > 1);
+-my ($used, $free);
++my $new_format = 0;
++my ($total, $used, $free);
+ while (<RESULT>) {
+   warn("  $_") if ($verbose > 1);
+-  next unless (m#^\-/\+\ buffers/cache:\s*(\d+)\s+(\d+)#);
+-  $used = $1;
+-  $free = $2;
++  # New `free` output from procps doesn't provide "buffers/cache" anymore, but
++  # provides a better estimate of available memory ("available" column).
++  $new_format = 1 if m{^\s+total\s+used\s+free\s+shared\s+buff/cache\s+available$};
++
++  if ($new_format and /^Mem:\s+(\d+)\s+\d+\s+\d+\s+\d+\s+\d+\s+(\d+)$/) {
++    $total = $1;
++    $free = $2; # available column
++    $used = $total - $free; # used is everything which is not available
++  } elsif (m#^\-/\+\ buffers/cache:\s*(\d+)\s+(\d+)#) {
++    $used = $1;
++    $free = $2;
++    $total = $used + $free;
++  }
+ }
+ 
+ close(RESULT);
+@@ -117,7 +128,6 @@ alarm(0);
+ 
+ $np->nagios_exit('CRITICAL', "Unable to interpret $FREECMD output") if (!defined($free));
+ 
+-my $total = $used + $free;
+ if (defined($warning) && $warning =~ /^\d+%$/) {
+   if ($warning) {
+     $warning =~ s/%//;
-- 
cgit v1.2.3