commit a222c1070fb5f8c3ea187ecf831689084a66976a Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Tue Jan 23 22:55:06 2024 +0100
rel 2; more aacraid improvements (from git) aacraid.patch | 41 +++++++++++++++++++++++++++++++++++++++++ maxcache.patch | 11 ----------- nagios-plugin-check_raid.spec | 4 ++-- 3 files changed, 43 insertions(+), 13 deletions(-) --- diff --git a/nagios-plugin-check_raid.spec b/nagios-plugin-check_raid.spec index 0cc487e..ae28b30 100644 --- a/nagios-plugin-check_raid.spec +++ b/nagios-plugin-check_raid.spec @@ -4,12 +4,12 @@ Summary: Nagios plugin to check current server's RAID status Name: nagios-plugin-%{plugin} Version: 4.0.10 -Release: 1 +Release: 2 License: GPL v2 Group: Applications Source0: https://github.com/glensc/nagios-plugin-check_raid/archive/%{version}/%{name}-%{version}.tar.gz # Source0-md5: 44d42b711ea234f69c1103f731a4c461 -Patch0: maxcache.patch +Patch0: aacraid.patch Patch1: bbu.patch URL: https://github.com/glensc/nagios-plugin-check_raid BuildRequires: perl-ExtUtils-MakeMaker-CPANfile diff --git a/aacraid.patch b/aacraid.patch new file mode 100644 index 0000000..4df3fd5 --- /dev/null +++ b/aacraid.patch @@ -0,0 +1,41 @@ +From 6dc89fbdb6d230a9e4cad310f50c6e643725885d Mon Sep 17 00:00:00 2001 +From: Sven Strickroth <em...@cs-ware.de> +Date: Sat, 7 Jan 2023 13:39:56 +0100 +Subject: [PATCH] Add support for new arcconf output format + +Signed-off-by: Sven Strickroth <em...@cs-ware.de> +--- + .../Plugin/CheckRaid/Plugins/arcconf.pm | 5 +- + 5 files changed, 2024 insertions(+), 3 deletions(-) + +diff --git a/lib/App/Monitoring/Plugin/CheckRaid/Plugins/arcconf.pm b/lib/App/Monitoring/Plugin/CheckRaid/Plugins/arcconf.pm +index 7e473ea..9b3b8e6 100644 +--- a/lib/App/Monitoring/Plugin/CheckRaid/Plugins/arcconf.pm ++++ b/lib/App/Monitoring/Plugin/CheckRaid/Plugins/arcconf.pm +@@ -70,7 +70,7 @@ sub parse_status { + next; + } + +- if (/^\s+Logical device\s+: (\d+)/) { ++ if (/^\s+Logical [D|d]evice\s+: (\d+)/) { + $task{device} = $1; + } elsif (/^\s+Task ID\s+: (\d+)/) { + $task{id} = $1; +@@ -259,7 +259,7 @@ sub parse_ctrl_config { + } + } + +- } elsif ($section eq 'MaxCache 3.0 information') { ++ } elsif ($section eq 'MaxCache 3.0 information' || $section eq 'maxCache 3.0 information') { + # not parsed yet + } elsif ($section eq 'Connector information') { + # not parsed yet +@@ -464,6 +464,7 @@ sub process_logical_drive_information { + shift->process_logical_device_information(@_); + } + ++# TODO: pr66/arcconf-getconfig.out, issue31/getconfig, issue190/getconfig + sub process_maxcache_3_0_information { + } + + diff --git a/maxcache.patch b/maxcache.patch deleted file mode 100644 index 5b19009..0000000 --- a/maxcache.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/App/Monitoring/Plugin/CheckRaid/Plugins/arcconf.pm.org 2016-12-26 21:40:17.000000000 +0100 -+++ b/lib/App/Monitoring/Plugin/CheckRaid/Plugins/arcconf.pm 2017-02-01 12:15:26.041797097 +0100 -@@ -255,7 +255,7 @@ sub parse_ctrl_config { - } - } - -- } elsif ($section eq 'MaxCache 3.0 information') { -+ } elsif (lc $section eq 'maxcache 3.0 information') { - # not parsed yet - } elsif ($section eq 'Connector information') { - # not parsed yet ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugin-check_raid.git/commitdiff/a222c1070fb5f8c3ea187ecf831689084a66976a _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit