diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf index da1fc2a5d..9594762ba 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache.conf @@ -5,6 +5,13 @@ AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps + + Order Allow,Deny + Allow from all + + SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" + + Options FollowSymLinks AllowOverride None diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf index 2c6f4660d..e081fccdb 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf @@ -30,6 +30,13 @@ Listen 8443 # HTTP Strict Transport Security (mod_headers is required) (63072000 seconds) Header always set Strict-Transport-Security "max-age=63072000" + + Order Allow,Deny + Allow from all + + SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" + + Options FollowSymLinks AllowOverride None diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf index da1fc2a5d..9594762ba 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache.conf @@ -5,6 +5,13 @@ AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps + + Order Allow,Deny + Allow from all + + SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" + + Options FollowSymLinks AllowOverride None diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf index 2c6f4660d..e081fccdb 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/apache_ssl.conf @@ -30,6 +30,13 @@ Listen 8443 # HTTP Strict Transport Security (mod_headers is required) (63072000 seconds) Header always set Strict-Transport-Security "max-age=63072000" + + Order Allow,Deny + Allow from all + + SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" + + Options FollowSymLinks AllowOverride None diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf index da1fc2a5d..9594762ba 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache.conf @@ -5,6 +5,13 @@ AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps + + Order Allow,Deny + Allow from all + + SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" + + Options FollowSymLinks AllowOverride None diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf index 2c6f4660d..e081fccdb 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf @@ -30,6 +30,13 @@ Listen 8443 # HTTP Strict Transport Security (mod_headers is required) (63072000 seconds) Header always set Strict-Transport-Security "max-age=63072000" + + Order Allow,Deny + Allow from all + + SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" + + Options FollowSymLinks AllowOverride None diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf index da1fc2a5d..9594762ba 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache.conf @@ -5,6 +5,13 @@ AddType application/x-httpd-php .php .php3 .php4 .php5 .phtml AddType application/x-httpd-php-source .phps + + Order Allow,Deny + Allow from all + + SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" + + Options FollowSymLinks AllowOverride None diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf index 2c6f4660d..e081fccdb 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/apache_ssl.conf @@ -30,6 +30,13 @@ Listen 8443 # HTTP Strict Transport Security (mod_headers is required) (63072000 seconds) Header always set Strict-Transport-Security "max-age=63072000" + + Order Allow,Deny + Allow from all + + SetHandler "proxy:unix:/tmp/php-fpm.sock|fcgi://localhost" + + Options FollowSymLinks AllowOverride None diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf index a60198594..8b2e1d9e1 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf @@ -26,3 +26,7 @@ php_value[upload_max_filesize] = ${ZBX_UPLOADMAXFILESIZE} php_value[max_input_time] = ${ZBX_MAXINPUTTIME} php_value[max_input_vars] = 10000 php_value[date.timezone] = ${PHP_TZ} + +; PHP-FPM monitoring +pm.status_path = /status +ping.path = /ping diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf index da6769355..46d0a1f65 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf @@ -46,6 +46,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index f3a6d6534..056d1354c 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -73,6 +73,15 @@ server { return 404; } + location ~ ^/(status|ping)$ { + access_log off; + fastcgi_pass unix:/tmp/php-fpm.sock; + + fastcgi_param SCRIPT_FILENAME $webroot$fastcgi_script_name; + fastcgi_index index.php; + include fastcgi_params; + } + location / { try_files $uri $uri/ /index.php?$args; } diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index ad9c374e8..b914a93c7 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -259,7 +259,7 @@ services: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 58762ae1a..fcfc0b0df 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -325,7 +325,7 @@ services: - zabbix-server - zabbix-build-mysql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index e3bf1aeb5..ad1b968e2 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -254,7 +254,7 @@ services: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 8d9c85309..18d5512e4 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -333,7 +333,7 @@ services: - zabbix-server - zabbix-build-pgsql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 52796c6d6..efc6121ca 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -205,7 +205,7 @@ services: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 @@ -259,7 +259,7 @@ services: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index feb4667ce..efa2bc854 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -264,7 +264,7 @@ services: - zabbix-server - zabbix-build-mysql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 @@ -325,7 +325,7 @@ services: - zabbix-server - zabbix-build-mysql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 0eb817851..625f85537 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -200,7 +200,7 @@ services: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 @@ -254,7 +254,7 @@ services: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index c6f93d3f7..d51fae7a2 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -272,7 +272,7 @@ services: - zabbix-server - zabbix-build-pgsql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 @@ -333,7 +333,7 @@ services: - zabbix-server - zabbix-build-pgsql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index 29defc2dd..c1556bd98 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -205,7 +205,7 @@ services: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 @@ -259,7 +259,7 @@ services: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 084c1fd5b..f8cc8de91 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -264,7 +264,7 @@ services: - zabbix-server - zabbix-build-mysql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 @@ -325,7 +325,7 @@ services: - zabbix-server - zabbix-build-mysql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index 5776b1fb4..536f511ce 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -200,7 +200,7 @@ services: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 @@ -254,7 +254,7 @@ services: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index d88d75af6..f0f56dca8 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -272,7 +272,7 @@ services: - zabbix-server - zabbix-build-pgsql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 @@ -333,7 +333,7 @@ services: - zabbix-server - zabbix-build-pgsql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index a3be9519a..7285acab5 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -252,7 +252,7 @@ services: - mysql-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 0d66138eb..9f55d362d 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -320,7 +320,7 @@ services: - zabbix-server - zabbix-build-mysql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 364fac39c..9460024cf 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -249,7 +249,7 @@ services: - postgres-server - zabbix-server healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3 diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 760ea9dad..4ab93943f 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -328,7 +328,7 @@ services: - zabbix-server - zabbix-build-pgsql healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] + test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s timeout: 5s retries: 3