From 497dc267427fedc317f5861dc150305d89d34eea Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 12 Jan 2024 13:51:38 +0100 Subject: [PATCH] nagios-nrpe: check_phpfpm_multi use new locations of pools --- evolinux-users/templates/sudoers.j2 | 17 +++++++++-------- nagios-nrpe/templates/evolix.cfg.j2 | 16 ++++++++-------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/evolinux-users/templates/sudoers.j2 b/evolinux-users/templates/sudoers.j2 index 0e8471bf..06322eaf 100644 --- a/evolinux-users/templates/sudoers.j2 +++ b/evolinux-users/templates/sudoers.j2 @@ -8,14 +8,15 @@ nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_haproxy_stat nagios ALL = NOPASSWD: /usr/sbin/bkctld check nagios ALL = NOPASSWD: /usr/sbin/bkctld check-jails nagios ALL = NOPASSWD: /usr/sbin/bkctld check-setup -nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php56/rootfs/etc/php5/fpm/pool.d/ -nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php70/rootfs/etc/php/7.0/fpm/pool.d/ -nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php73/rootfs/etc/php/7.3/fpm/pool.d/ -nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php74/rootfs/etc/php/7.4/fpm/pool.d/ -nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php80/rootfs/etc/php/8.0/fpm/pool.d/ -nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php81/rootfs/etc/php/8.1/fpm/pool.d/ -nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php82/rootfs/etc/php/8.2/fpm/pool.d/ -nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php83/rootfs/etc/php/8.3/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /etc/portables/php5.6_*/etc/php5/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /etc/portables/php7.0_*/etc/php/7.0/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /etc/portables/php7.3_*/etc/php/7.3/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /etc/portables/php7.4_*/etc/php/7.4/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /etc/portables/php8.0_*/etc/php/8.0/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /etc/portables/php8.1_*/etc/php/8.1/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /etc/portables/php8.2_*/etc/php/8.2/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /etc/portables/php8.3_*/etc/php/8.3/fpm/pool.d/ +nagios ALL = NOPASSWD: /usr/sbin/megaclisas-status --nagios nagios ALL = NOPASSWD: /usr/sbin/megaclisas-status --nagios nagios ALL = NOPASSWD: /usr/lib/nagios/plugins/check_ipmi_sensor nagios ALL = NOPASSWD: /sbin/dmsetup status --noflush diff --git a/nagios-nrpe/templates/evolix.cfg.j2 b/nagios-nrpe/templates/evolix.cfg.j2 index 66ecc51a..297a0c56 100644 --- a/nagios-nrpe/templates/evolix.cfg.j2 +++ b/nagios-nrpe/templates/evolix.cfg.j2 @@ -80,14 +80,14 @@ command[check_redis_instances]={{ nagios_plugins_directory }}/check_redis_instan command[check_sentinel]=sudo {{ nagios_plugins_directory }}/check_sentinel -c /etc/redis/sentinel.conf command[check_hpraid]={{ nagios_plugins_directory }}/check_hpraid command[check_php-fpm]={{ nagios_plugins_directory }}/check_phpfpm_multi -command[check_php-fpm56]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php56/rootfs/etc/php5/fpm/pool.d/ -command[check_php-fpm70]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php70/rootfs/etc/php/7.0/fpm/pool.d/ -command[check_php-fpm73]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php73/rootfs/etc/php/7.3/fpm/pool.d/ -command[check_php-fpm74]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php74/rootfs/etc/php/7.4/fpm/pool.d/ -command[check_php-fpm80]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php80/rootfs/etc/php/8.0/fpm/pool.d/ -command[check_php-fpm81]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php81/rootfs/etc/php/8.1/fpm/pool.d/ -command[check_php-fpm82]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php82/rootfs/etc/php/8.2/fpm/pool.d/ -command[check_php-fpm83]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php83/rootfs/etc/php/8.3/fpm/pool.d/ +command[check_php-fpm56]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /etc/portables/php5.6_*/etc/php5/fpm/pool.d/ +command[check_php-fpm70]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /etc/portables/php7.0_*/etc/php/7.0/fpm/pool.d/ +command[check_php-fpm73]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /etc/portables/php7.3_*/etc/php/7.3/fpm/pool.d/ +command[check_php-fpm74]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /etc/portables/php7.4_*/etc/php/7.4/fpm/pool.d/ +command[check_php-fpm80]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /etc/portables/php8.0_*/etc/php/8.0/fpm/pool.d/ +command[check_php-fpm81]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /etc/portables/php8.1_*/etc/php/8.1/fpm/pool.d/ +command[check_php-fpm82]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /etc/portables/php8.2_*/etc/php/8.2/fpm/pool.d/ +command[check_php-fpm83]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /etc/portables/php8.3_*/etc/php/8.3/fpm/pool.d/ command[check_dhcp_pool]={{ nagios_plugins_directory }}/check_dhcp_pool command[check_ssl_local]={{ nagios_plugins_directory }}/check_ssl_local