From 8635ad474467777de6fc8c2edbdbd1a895e08f27fdcc08ad930b2aca2474440b Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Thu, 4 Oct 2018 15:01:15 +0000 Subject: [PATCH] + nrpe-check_total_procs => check_procs + nrpe-check_zombie_procs => check_procs + nrpe-check_users => check_users + nrpe-check_mysql => check_mysql + nrpe-check_proc_cron => check_procs + nrpe-check_partition => check_disk + nrpe-check_ups => check_ups OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=56 --- monitoring-plugins.changes | 7 +++++++ monitoring-plugins.spec | 37 ++++++++++++++++++++++++++++++++----- nrpe-check_mysql | 1 + nrpe-check_partition | 1 + nrpe-check_proc_cron | 1 + nrpe-check_total_procs | 1 + nrpe-check_ups | 1 + nrpe-check_users | 1 + nrpe-check_zombie_procs | 1 + 9 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 nrpe-check_mysql create mode 100644 nrpe-check_partition create mode 100644 nrpe-check_proc_cron create mode 100644 nrpe-check_total_procs create mode 100644 nrpe-check_ups create mode 100644 nrpe-check_users create mode 100644 nrpe-check_zombie_procs diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index ee0fdd6..300844e 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -6,6 +6,13 @@ Wed Oct 3 14:11:51 UTC 2018 - lars@linux-schulserver.de + nrpe-check_mailq => check_mailq + nrpe-check_ntp_time => check_ntp_time + nrpe-check_swap => check_swap + + nrpe-check_total_procs => check_procs + + nrpe-check_zombie_procs => check_procs + + nrpe-check_users => check_users + + nrpe-check_mysql => check_mysql + + nrpe-check_proc_cron => check_procs + + nrpe-check_partition => check_disk + + nrpe-check_ups => check_ups - use %%license macro on newer versions ------------------------------------------------------------------- diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec index 8f0266a..5679168 100644 --- a/monitoring-plugins.spec +++ b/monitoring-plugins.spec @@ -53,6 +53,13 @@ Source50: nrpe-check_mailq Source51: nrpe-check_load Source52: nrpe-check_ntp_time Source53: nrpe-check_swap +Source54: nrpe-check_partition +Source55: nrpe-check_proc_cron +Source56: nrpe-check_total_procs +Source57: nrpe-check_users +Source58: nrpe-check_zombie_procs +Source59: nrpe-check_mysql +Source60: nrpe-check_ups # PATCH-FIX-UPSTREAM Quote the options comming in from users (path names might contain whitespaces) Patch1: %{name}-2.1.1-check_logfile.patch # PATCH-FIX-OPENSUSE do not use chown in Makefile (not possible when building as normal user) @@ -1194,6 +1201,13 @@ install -m 644 %{SOURCE50} %{buildroot}%{nrpe_sysconfdir}/check_mailq.cfg install -m 644 %{SOURCE51} %{buildroot}%{nrpe_sysconfdir}/check_load.cfg install -m 644 %{SOURCE52} %{buildroot}%{nrpe_sysconfdir}/check_ntp_time.cfg install -m 644 %{SOURCE53} %{buildroot}%{nrpe_sysconfdir}/check_swap.cfg +install -m 644 %{SOURCE54} %{buildroot}%{nrpe_sysconfdir}/check_partition_root.cfg +install -m 644 %{SOURCE55} %{buildroot}%{nrpe_sysconfdir}/check_proc_cron.cfg +install -m 644 %{SOURCE56} %{buildroot}%{nrpe_sysconfdir}/check_total_procs.cfg +install -m 644 %{SOURCE57} %{buildroot}%{nrpe_sysconfdir}/check_users.cfg +install -m 644 %{SOURCE58} %{buildroot}%{nrpe_sysconfdir}/check_zombie_procs.cfg +install -m 644 %{SOURCE59} %{buildroot}%{nrpe_sysconfdir}/check_mysql.cfg +install -m 644 %{SOURCE60} %{buildroot}%{nrpe_sysconfdir}/check_ups.cfg # inform the users about the deprecated monitoring-plugins-extras package cat >> README.SUSE-deprecated << EOF @@ -1347,8 +1361,10 @@ fi %files disk %defattr(0755,root,root) %dir %{nagios_plugindir} +%dir %{nrpe_sysconfdir} %{nagios_plugindir}/check_disk %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_disk +%attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_partition_root.cfg %files disk_smb %defattr(0755,root,root) @@ -1442,7 +1458,7 @@ fi %dir %{nagios_plugindir} %dir %{nrpe_sysconfdir} %{nagios_plugindir}/check_load -%config(noreplace) %{nrpe_sysconfdir}/check_load.cfg +%attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_load.cfg %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_load %files log @@ -1454,7 +1470,7 @@ fi %dir %{nagios_plugindir} %dir %{nrpe_sysconfdir} %{nagios_plugindir}/check_mailq -%config(noreplace) %{nrpe_sysconfdir}/check_mailq.cfg +%attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_mailq.cfg %files mrtg %defattr(0755,root,root) @@ -1469,8 +1485,10 @@ fi %files mysql %defattr(0755,root,root) %dir %{nagios_plugindir} +%dir %{nrpe_sysconfdir} %{nagios_plugindir}/check_mysql %{nagios_plugindir}/check_mysql_query +%attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_mysql.cfg %files nagios %defattr(0755,root,root) @@ -1494,7 +1512,7 @@ fi %{nagios_plugindir}/check_ntp %{nagios_plugindir}/check_ntp_time %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_ntp_time -%config(noreplace) %{nrpe_sysconfdir}/check_ntp_time.cfg +%attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_ntp_time.cfg %files nwstat %defattr(0755,root,root) @@ -1524,9 +1542,14 @@ fi %files procs %defattr(0755,root,root) %dir %{nagios_plugindir} +%dir %{nrpe_sysconfdir} %{nagios_plugindir}/check_procs %{nagios_plugindir}/check_procs_perf -%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_procs +%defattr(0644,root,root) +%config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_procs +%config(noreplace) %{nrpe_sysconfdir}/check_proc_cron.cfg +%config(noreplace) %{nrpe_sysconfdir}/check_total_procs.cfg +%config(noreplace) %{nrpe_sysconfdir}/check_zombie_procs.cfg %if 0%{?suse_version} %files radius @@ -1573,7 +1596,7 @@ fi %dir %{nrpe_sysconfdir} %{nagios_plugindir}/check_swap %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_swap -%config(noreplace) %{nrpe_sysconfdir}/check_swap.cfg +%attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_swap.cfg %files tcp %defattr(0755,root,root) @@ -1599,13 +1622,17 @@ fi %files ups %defattr(0755,root,root) %dir %{nagios_plugindir} +%dir %{nrpe_sysconfdir} %{nagios_plugindir}/check_ups +%attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_ups.cfg %files users %defattr(0755,root,root) %dir %{nagios_plugindir} +%dir %{nrpe_sysconfdir} %{nagios_plugindir}/check_users %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_users +%attr(0644,root,root) %config(noreplace) %{nrpe_sysconfdir}/check_users.cfg %files wave %defattr(0755,root,root) diff --git a/nrpe-check_mysql b/nrpe-check_mysql new file mode 100644 index 0000000..ecd9e9b --- /dev/null +++ b/nrpe-check_mysql @@ -0,0 +1 @@ +command[check_mysql]=/usr/lib/nagios/plugins/check_mysql -H localhost -u root diff --git a/nrpe-check_partition b/nrpe-check_partition new file mode 100644 index 0000000..2ece71d --- /dev/null +++ b/nrpe-check_partition @@ -0,0 +1 @@ +command[check_partition_root]=/usr/lib/nagios/plugins/check_disk -w 10% -c 5% -p / diff --git a/nrpe-check_proc_cron b/nrpe-check_proc_cron new file mode 100644 index 0000000..9177623 --- /dev/null +++ b/nrpe-check_proc_cron @@ -0,0 +1 @@ +command[check_proc_cron]=/usr/lib/nagios/plugins/check_procs --command=cron -u root -c 1:1024 diff --git a/nrpe-check_total_procs b/nrpe-check_total_procs new file mode 100644 index 0000000..225ce16 --- /dev/null +++ b/nrpe-check_total_procs @@ -0,0 +1 @@ +command[check_total_procs]=/usr/lib/nagios/plugins/check_procs -w 6000 -c 7500 diff --git a/nrpe-check_ups b/nrpe-check_ups new file mode 100644 index 0000000..22e1b7e --- /dev/null +++ b/nrpe-check_ups @@ -0,0 +1 @@ +command[check_ups]=/usr/lib/nagios/plugins/check_ups -H 127.0.0.1 -u liebert diff --git a/nrpe-check_users b/nrpe-check_users new file mode 100644 index 0000000..19e18d1 --- /dev/null +++ b/nrpe-check_users @@ -0,0 +1 @@ +command[check_users]=/usr/lib/nagios/plugins/check_users -w 30 -c 40 diff --git a/nrpe-check_zombie_procs b/nrpe-check_zombie_procs new file mode 100644 index 0000000..b56e71d --- /dev/null +++ b/nrpe-check_zombie_procs @@ -0,0 +1 @@ +command[check_zombie_procs]=/usr/lib/nagios/plugins/check_procs -w 5 -c 10 -s Z