diff options
Diffstat (limited to 'nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt')
| -rw-r--r-- | nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt/fix_uom | 26 | ||||
| -rw-r--r-- | nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt/monitoring-plugin | 48 |
2 files changed, 74 insertions, 0 deletions
diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt/fix_uom b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt/fix_uom new file mode 100644 index 0000000..c192353 --- /dev/null +++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt/fix_uom @@ -0,0 +1,26 @@ +From ebbf45f0dcbe150f4f8ccb306c8e72e95dbe29d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20L=C3=A4ssig?= <b.laessig@pengutronix.de> +Date: Thu, 1 Dec 2016 13:42:17 +0100 +Subject: [PATCH] fix uom of check_libvirt + + * the actual unit of check_libvirt is 'units', which is not a valid UOM + (https://www.monitoring-plugins.org/doc/guidelines.html#AEN201) + so tools like icinga2 cannot interprete the performance data + * remove the UOM to an empty string + -> no unit specified - assume a number (int or float) of things + (eg, users, processes, load averages) +--- + check_libvirt/check_libvirt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/check_libvirt/check_libvirt ++++ b/check_libvirt/check_libvirt +@@ -246,7 +246,7 @@ + chop($output); + chop($output); + $output = $up . "/" . $cnt . " VMs up: " . $output; +- $np->add_perfdata(label => "vmcount", value => $up, uom => 'units', threshold => $np->threshold); ++ $np->add_perfdata(label => "vmcount", value => $up, uom => '', threshold => $np->threshold); + $result = $np->check_threshold(check => $up); + } + elsif (uc($command) eq "POOL") diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt/monitoring-plugin b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt/monitoring-plugin new file mode 100644 index 0000000..c51c873 --- /dev/null +++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libvirt/monitoring-plugin @@ -0,0 +1,48 @@ +diff --git a/check_libvirt/check_libvirt b/check_libvirt/check_libvirt +index 2029c9e..618d1ac 100755 +--- a/check_libvirt/check_libvirt ++++ b/check_libvirt/check_libvirt +@@ -27,11 +27,33 @@ + use strict; + use warnings; + use vars qw($PROGNAME $VERSION $output $result); +-use Nagios::Plugin; + use File::Basename; + use Sys::Virt; + use XML::Simple; + ++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 = basename($0); + $VERSION = '0.1.0'; + my $spooldir="/opt/monitor/var/check_libvirt"; +@@ -41,7 +63,7 @@ if (!-d $spooldir) + mkdir($spooldir); + } + +-my $np = Nagios::Plugin->new( ++my $np = $plugin_module->new( + usage => "Usage: %s -H <hosturl> [ -N <vmname> ]\n" + . " [-u <user> -p <pass>]\n" + . " -l <command> [ -s <subcommand> ]\n" |