From 1c9703bf3021faa322c865106ff08a15071e2f3a Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 7 Aug 2024 15:14:20 +0100 Subject: [PATCH] Remove deprecated 'stats bind-process' directive This directive is deprecated in haproxy 2.5. See https://docs.haproxy.org/2.5/configuration.html#3.1-stats%20bind-process Change-Id: I600e6a07d14deb10823ebe005ac417a601930f68 --- defaults/main.yml | 3 --- templates/haproxy.cfg.j2 | 6 ------ 2 files changed, 9 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 257673e..a3bcac9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -39,9 +39,6 @@ haproxy_stats_refresh_interval: 60 # Prometheus stats are supported from HAProxy v2 # Stats must be enabled above before this can be used haproxy_stats_prometheus_enabled: False -# Pin stats gathering to one or more processes when using 'nbproc' tuning -# For permitted options see https://cbonte.github.io/haproxy-dconv/1.8/configuration.html#3.1-stats%20bind-process -# haproxy_stats_process: all # Default haproxy backup nodes to empty list so this doesn't have to be # defined for each service. diff --git a/templates/haproxy.cfg.j2 b/templates/haproxy.cfg.j2 index f5bf23b..7c6f81e 100644 --- a/templates/haproxy.cfg.j2 +++ b/templates/haproxy.cfg.j2 @@ -11,9 +11,6 @@ global {{ key }} {{ value }} {% endfor %} stats socket /var/run/haproxy.stat level admin mode 600 -{% if haproxy_stats_process is defined %} - stats bind-process {{ haproxy_stats_process }} -{% endif %} {% if haproxy_ssl | bool %} ssl-default-bind-options {{ haproxy_ssl_bind_options }} ssl-default-server-options {{ haproxy_ssl_server_options }} @@ -44,9 +41,6 @@ defaults listen stats bind {{ haproxy_stats_bind_address }}:{{ haproxy_stats_port }} {% if haproxy_stats_ssl | bool %}ssl crt {{ haproxy_stats_ssl_cert_path | default(haproxy_ssl_path) }} {% if haproxy_stats_ssl_client_cert_ca is defined %}verify required ca-file {{ haproxy_stats_ssl_client_cert_ca }}{% endif %}{% endif %} -{% if haproxy_stats_process is defined %} - bind-process {{ haproxy_stats_process }} -{% endif %} mode http {% if haproxy_stats_prometheus_enabled | bool %} http-request use-service prometheus-exporter if { path /metrics }