From 54aa3e484c105c6578207df1f051662c62867a30 Mon Sep 17 00:00:00 2001 From: Ramil Valitov Date: Sat, 4 Jan 2020 01:32:07 +0300 Subject: [PATCH 1/2] [del] remove template for version 4.2 We don't have to support it, a single template version 4.0 is enough --- README.md | 1 + zabbix/zabbix_php_fpm_template_4.2.xml | 1882 ------------------------ 2 files changed, 1 insertion(+), 1882 deletions(-) delete mode 100644 zabbix/zabbix_php_fpm_template_4.2.xml diff --git a/README.md b/README.md index 90b89c3..a00a8ca 100644 --- a/README.md +++ b/README.md @@ -406,6 +406,7 @@ In Zabbix frontend go to `"Configuration"->"Templates"->"Import"`: ![Zabbix template import interface](https://github.com/rvalitov/zabbix-php-fpm/raw/master/media/zabbix-import.jpg) Upload a template file from the [archive](https://github.com/rvalitov/zabbix-php-fpm/archive/master.zip) that corresponds to your version of Zabbix server. For example, use file `/zabbix/zabbix_php_fpm_template_4.0.xml` for Zabbix server 4.0. If there's no version of the template that matches your version of Zabbix server, then try to use the nearest version of the template that is not higher than your version of Zabbix server. +For example, template version 4.0 also works for higher versions of Zabbix server, such as 4.2 and 4.4. But template version 4.0 will not work for Zabbix 3.x. #### 2.2. Add the template to your hosts Add template "Template App PHP-FPM" to the desired hosts. diff --git a/zabbix/zabbix_php_fpm_template_4.2.xml b/zabbix/zabbix_php_fpm_template_4.2.xml deleted file mode 100644 index 12616bd..0000000 --- a/zabbix/zabbix_php_fpm_template_4.2.xml +++ /dev/null @@ -1,1882 +0,0 @@ - - - 4.2 - 2019-12-21T12:24:20Z - - - Templates/Applications - - - - - - From 15b6a3e8e72f11bb20db8646115fd359425ef239 Mon Sep 17 00:00:00 2001 From: Ramil Valitov Date: Sat, 4 Jan 2020 01:36:53 +0300 Subject: [PATCH 2/2] [fix] listen queue trigger alarms only after 3 sequental checks --- zabbix/zabbix_php_fpm_template_4.0.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zabbix/zabbix_php_fpm_template_4.0.xml b/zabbix/zabbix_php_fpm_template_4.0.xml index 4629cb9..cf913a0 100644 --- a/zabbix/zabbix_php_fpm_template_4.0.xml +++ b/zabbix/zabbix_php_fpm_template_4.0.xml @@ -1411,7 +1411,7 @@ - {Template App PHP-FPM:php-fpm.listen_queue[{#POOLSOCKET}].diff()}=1 + {Template App PHP-FPM:php-fpm.listen_queue[{#POOLSOCKET}].last(#3)}>0 0 PHP-FPM uses queue on {HOST.NAME} pool {#POOLNAME}