- rel 4; just enable bbu monitoring by default and be done with it

diff --git a/bbu.patch b/bbu.patch
index 331ebb21654a0571ea0e8413eb27370032966b3d..73008390359da40eb233404976c759f14d104a08 100644 (file)
--- a/bbu.patch
+++ b/bbu.patch
@@ -1,38 +1,12 @@
-diff -urN nagios-plugin-check_raid-4.0.8.org/check_raid_bbu.cfg nagios-plugin-check_raid-4.0.8/check_raid_bbu.cfg
---- nagios-plugin-check_raid-4.0.8.org/check_raid_bbu.cfg      1970-01-01 01:00:00.000000000 +0100
-+++ nagios-plugin-check_raid-4.0.8/check_raid_bbu.cfg  2018-12-11 13:49:55.609515941 +0100
-@@ -0,0 +1,34 @@
-+# Usage:
-+# check_raid_bbu
-+define command {
-+      command_name    check_raid_bbu
+diff -urN nagios-plugin-check_raid-4.0.8.org/check_raid.cfg nagios-plugin-check_raid-4.0.8/check_raid.cfg
+--- nagios-plugin-check_raid-4.0.8.org/check_raid.cfg  2017-09-01 20:58:44.000000000 +0200
++++ nagios-plugin-check_raid-4.0.8/check_raid.cfg      2018-12-11 15:37:33.361179565 +0100
+@@ -2,7 +2,7 @@
+ # check_raid
+ define command {
+       command_name    check_raid
+-      command_line    /usr/lib/nagios/plugins/check_raid $ARG1$
 +      command_line    /usr/lib/nagios/plugins/check_raid --bbu-monitoring $ARG1$
-+}
-+
-+# service template
-+define service {
-+      use                     generic-service
-+      name                    raid-bbu
-+      service_description     raid-bbu
-+      register                0
-+
-+      normal_check_interval   30
-+      retry_check_interval    5
-+      notification_interval   3600
-+
-+      check_command           check_raid_bbu
-+}
-+
-+# sample check
-+#define service {
-+#     use                     raid-bbu
-+#     host_name               localhost
-+#}
-+
-+# sample check via nrpe
-+#define service {
-+#     use                     raid-bbu
-+#     hostgroups              linux-servers
-+#     host_name               localhost
-+#     check_command           check_nrpe!-c check_raid_bbu -t 60
-+#}
+ }
+ 
+ # service template

diff --git a/nagios-plugin-check_raid.spec b/nagios-plugin-check_raid.spec
index e27d9d2888333d3eefe49d308a35bc5b3f667196..96afe109bc4faa567b2f5064e41e7ea4c0f65ad0 100644 (file)
--- a/nagios-plugin-check_raid.spec
+++ b/nagios-plugin-check_raid.spec
@@ -5,7 +5,7 @@
 Summary:       Nagios plugin to check current server's RAID status
 Name:          nagios-plugin-%{plugin}
 Version:       4.0.8
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Applications
 Source0:       https://github.com/glensc/nagios-plugin-check_raid/archive/%{version}/%{name}-%{version}.tar.gz
@@ -98,8 +98,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{nrpeddir},%{plugindir},/etc/sudoers.
        DESTDIR=$RPM_BUILD_ROOT
 
 cp -p %{plugin}.cfg $RPM_BUILD_ROOT%{_sysconfdir}
-cp -p %{plugin}_bbu.cfg $RPM_BUILD_ROOT%{_sysconfdir}
-touch $RPM_BUILD_ROOT%{nrpeddir}/%{plugin}{,_bbu}.cfg
+touch $RPM_BUILD_ROOT%{nrpeddir}/%{plugin}.cfg
 touch $RPM_BUILD_ROOT/etc/sudoers.d/check_raid
 
 # remove .pl extension
@@ -139,19 +138,15 @@ fi
 
 %triggerin -- nagios-nrpe
 %nagios_nrpe -a %{plugin} -f %{_sysconfdir}/%{plugin}.cfg
-%nagios_nrpe -a %{plugin}_bbu -f %{_sysconfdir}/%{plugin}_bbu.cfg
 
 %triggerun -- nagios-nrpe
 %nagios_nrpe -d %{plugin} -f %{_sysconfdir}/%{plugin}.cfg
-%nagios_nrpe -a %{plugin}_bbu -f %{_sysconfdir}/%{plugin}_bbu.cfg
 
 %files
 %defattr(644,root,root,755)
 %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{plugin}.cfg
-%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{plugin}_bbu.cfg
 %attr(755,root,root) %{plugindir}/%{plugin}
 %ghost %{nrpeddir}/%{plugin}.cfg
-%ghost %{nrpeddir}/%{plugin}_bbu.cfg
 %ghost /etc/sudoers.d/check_raid
 %dir %{perl_vendorlib}/App/Monitoring
 %dir %{perl_vendorlib}/App/Monitoring/Plugin