diff options
author | Sahina Bose <sabose@redhat.com> | 2017-05-15 19:00:46 +0530 |
---|---|---|
committer | Sahina Bose <sabose@redhat.com> | 2017-05-18 11:47:07 +0000 |
commit | 0f5404169402f212caf2b450ccde4eb6b12ccca8 (patch) | |
tree | 9fd0131163bc4d0a328fceeb8d782f1cc7bfe832 | |
parent | b91d50b07b26041fa2205600cc8c7e95a10b870a (diff) |
gluster-nagios: move nrpe config to custom location
BUG: 1425724
Change-Id: If389220150c1c9e1a8f346d03c81b43936472a26
Signed-off-by: Sahina Bose <sabose@redhat.com>
Reviewed-on: https://review.gluster.org/17306
Reviewed-by: Timothy Asir
-rw-r--r-- | config/Makefile.am | 6 | ||||
-rw-r--r-- | config/glusternrpe.cfg.in | 16 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | gluster-nagios-addons.spec.in | 22 |
4 files changed, 24 insertions, 21 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 98abb90..bed3405 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -8,6 +8,11 @@ nagiosconf_DATA = \ nagios_server.conf \ $(NULL) +nrpeconfdir = $(sysconfdir)/nrpe.d +nrpeconf_DATA = \ + glusternrpe.cfg \ + $(NULL) + sudodir = $(sysconfdir)/sudoers.d/ sudo_DATA = \ nrpe \ @@ -15,6 +20,7 @@ sudo_DATA = \ EXTRA_DIST = \ $(nagiosconf_DATA) \ + $(nrpeconf_DATA) \ $(rsyslogconf_DATA) \ $(sudo_DATA) \ $(NULL) diff --git a/config/glusternrpe.cfg.in b/config/glusternrpe.cfg.in new file mode 100644 index 0000000..e5464c3 --- /dev/null +++ b/config/glusternrpe.cfg.in @@ -0,0 +1,16 @@ +command[check_disk_and_inode]=sudo @libdir@/nagios/plugins/gluster/check_mounts.py -w 80 -c 90 -i / -i /boot -i /home -i /var -i /usr +command[check_memory]=@libdir@/nagios/plugins/gluster/memory.py -w 80 -c 90 -t 2 +command[check_swap_usage]=@libdir@/nagios/plugins/gluster/swap.py -w 80 -c 90 -t 2 +command[check_cpu_multicore]=@libdir@/nagios/plugins/gluster/cpu.py -w 80 -c 90 -t 2 +command[check_interfaces]=@libdir@/nagios/plugins/gluster/network.py -e lo -e ';vdsmdummy;' -t 2 +command[check_brick_usage]=sudo @libdir@/nagios/plugins/gluster/check_mounts.py -w 80 -c 90 -i \$ARG1\$ +command[check_vol_utilization]=sudo @libdir@/nagios/plugins/gluster/check_vol_utilization.py \$ARG1\$ -w \$ARG2\$ -c \$ARG3\$ +command[check_vol_status]=sudo @libdir@/nagios/plugins/gluster/check_volume_status.py -v \$ARG1\$ -t \$ARG2\$ +command[check_proc_status]=sudo @libdir@/nagios/plugins/gluster/check_gluster_proc_status.py -t \$ARG1\$ +command[check_brick_status]=sudo @libdir@/nagios/plugins/gluster/check_gluster_proc_status.py -t BRICK -v \$ARG1\$ -b \$ARG2\$ +command[discoverpeers]=sudo @libdir@/nagios/plugins/gluster/discoverpeers.py +command[discover_volume_list]=sudo @libdir@/nagios/plugins/gluster/discover_volumes.py -l +command[discover_volume_info]=sudo @libdir@/nagios/plugins/gluster/discover_volumes.py -v \$ARG1\$ +command[discoverhostparams]=sudo @libdir@/nagios/plugins/gluster/discoverhostparams.py +command[configure_gluster_node]=sudo @libdir@/nagios/plugins/gluster/configure_gluster_node.py -c \$ARG1\$ -n \$ARG2\$ -H \$ARG3\$ +command[check_quorum_status]=sudo @libdir@/nagios/plugins/gluster/check_quorum_status.py diff --git a/configure.ac b/configure.ac index 8badbab..d727a85 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,7 @@ AC_CONFIG_FILES([ gluster-nagios-addons.spec config/Makefile config/glusternagios.conf + config/glusternrpe.cfg config/nrpe plugins/Makefile plugins/nscautils.py diff --git a/gluster-nagios-addons.spec.in b/gluster-nagios-addons.spec.in index 27b13fa..bce506a 100644 --- a/gluster-nagios-addons.spec.in +++ b/gluster-nagios-addons.spec.in @@ -130,27 +130,6 @@ fi %_remove_gluster_nagios_configs -cat >> %{_sysconfdir}/nagios/nrpe.cfg <<EOF -%{_start_conf_section} -command[check_disk_and_inode]=sudo %{_libdir}/nagios/plugins/gluster/check_mounts.py -w 80 -c 90 -i / -i /boot -i /home -i /var -i /usr -command[check_memory]=%{_libdir}/nagios/plugins/gluster/memory.py -w 80 -c 90 -t 2 -command[check_swap_usage]=%{_libdir}/nagios/plugins/gluster/swap.py -w 80 -c 90 -t 2 -command[check_cpu_multicore]=%{_libdir}/nagios/plugins/gluster/cpu.py -w 80 -c 90 -t 2 -command[check_interfaces]=%{_libdir}/nagios/plugins/gluster/network.py -e lo -e ';vdsmdummy;' -t 2 -command[check_brick_usage]=sudo %{_libdir}/nagios/plugins/gluster/check_mounts.py -w 80 -c 90 -i \$ARG1\$ -command[check_vol_utilization]=sudo %{_libdir}/nagios/plugins/gluster/check_vol_utilization.py \$ARG1\$ -w \$ARG2\$ -c \$ARG3\$ -command[check_vol_status]=sudo %{_libdir}/nagios/plugins/gluster/check_volume_status.py -v \$ARG1\$ -t \$ARG2\$ -command[check_proc_status]=sudo %{_libdir}/nagios/plugins/gluster/check_gluster_proc_status.py -t \$ARG1\$ -command[check_brick_status]=sudo %{_libdir}/nagios/plugins/gluster/check_gluster_proc_status.py -t BRICK -v \$ARG1\$ -b \$ARG2\$ -command[discoverpeers]=sudo %{_libdir}/nagios/plugins/gluster/discoverpeers.py -command[discover_volume_list]=sudo %{_libdir}/nagios/plugins/gluster/discover_volumes.py -l -command[discover_volume_info]=sudo %{_libdir}/nagios/plugins/gluster/discover_volumes.py -v \$ARG1\$ -command[discoverhostparams]=sudo %{_libdir}/nagios/plugins/gluster/discoverhostparams.py -command[configure_gluster_node]=sudo %{_libdir}/nagios/plugins/gluster/configure_gluster_node.py -c \$ARG1\$ -n \$ARG2\$ -H \$ARG3\$ -command[check_quorum_status]=sudo %{_libdir}/nagios/plugins/gluster/check_quorum_status.py -%{_end_conf_section} -EOF - %_init_enable nrpe %_init_try_restart crond @@ -175,6 +154,7 @@ fi %{_sysconfdir}/sudoers.d/nrpe %config(noreplace) %{_sysconfdir}/nagios/nagios_server.conf %{_sysconfdir}/init.d/glusterpmd +%config %{_sysconfdir}/nrpe.d/glusternrpe.cfg %files tests %defattr(-,root,root,-) |