Fix apache ports check
diff --git a/apache/meta/sensu.yml b/apache/meta/sensu.yml
index 6e64cc3..17cf4b0 100644
--- a/apache/meta/sensu.yml
+++ b/apache/meta/sensu.yml
@@ -7,7 +7,7 @@
subscribers:
- local-apache-server
local_apache_server:
- command: "PATH=$PATH:/etc/sensu/plugins check_apache2.sh -H localhost -P {{ site.host.get('port', '80') }} -t 3 -wr 100 -cr 250"
+ command: "PATH=$PATH:/etc/sensu/plugins check_apache2.sh -H localhost -P {{ server.bind.get('ports', [80]).0 }} -t 3 -wr 100 -cr 250"
interval: 60
occurrences: 1
subscribers:
@@ -16,7 +16,7 @@
{%- if site.enabled %}
{%- if site.get('check', True) %}
remote_apache_server_http_{{ site.host.name }}_{{ site.host.get('port', '80') }}:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_http -H {{ site.host.name }} -p {{ site.host.get('port', '80') }} -w 5 -c 10 -f follow{% if site.get('ssl', {}).get('enabled', False) %} -S{% endif %}{% if site.auth is defined %} -e 'HTTP/1.1 401 Unauthorized'{% endif %}"
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_http -H {{ site.host.name }} -p {% if site.host.port is defined %}{{ site.host.port }}{% else %}{% if site.ssl is defined %}443{% else %}80{% endif %}{% endif %} -w 5 -c 10 -f follow{% if site.get('ssl', {}).get('enabled', False) %} -S{% endif %}{% if site.auth is defined %} -e 'HTTP/1.1 401 Unauthorized'{% endif %}"
interval: 60
occurrences: 2
subscribers: