Zabbix: fix different handling of /apache-status on proxy hosts

Seems like the proxies don't want to handle port 80 nicely, I get
errors in Zabbix for them using localhost:80/apache-status (which
works elsewhere, like sundries). However using https/443 seems to
work, so we'll do that instead.

Signed-off-by: Greg Sutcliffe <fedora@emeraldreverie.org>

inventory/group_vars/proxies

@@ -177,11 +177,9 @@ tcp_ports: [
 varnish_group: proxies
 # Proxies are (mostly) external, use vpn for monitoring
 zabbix_host: zabbix01.vpn.fedoraproject.org
-zabbix_templates:
-  - group: "proxies" # Ansible group
-    template: "external_hosts_http.json" # Template name in roles/zabbix/zabbix_templates/files/templatename.json
-    custom_template: true # Is the template official template bundled with Zabbix or one of our custom templates
-    hostgroup: "fedora external hosts" # Zabbix hostgroup
+zabbix_macros:
+  'APACHE.STATUS.PORT': 443     # Proxies appear to ignore port 80 for apache-status
+  'APACHE.STATUS.SCHEME': https # but https://localhost seems to work instead
 
 notes: |
   * Provides frontend (reverse) proxy for most web applications

inventory/group_vars/proxies_stg

@@ -99,7 +99,8 @@ tcp_ports: [
 ]
 varnish_group: proxies
 zabbix_macros:
-  'SWAP.PFREE.MIN.WARN': 30 # typically seems to run at ~42%
+  'APACHE.STATUS.PORT': 443     # Proxies appear to ignore port 80 for apache-status
+  'APACHE.STATUS.SCHEME': https # but https://localhost seems to work instead
 
 notes: |
   * Provides frontend (reverse) proxy for most web applications

roles/apache/files/zabbix/apache-template.yml

@@ -832,10 +832,10 @@ zabbix_export:
           value: 'apache-status?auto'
           description: 'The URL path.'
         - macro: '{$APACHE.STATUS.PORT}'
-          value: '443'
+          value: '80'
           description: 'The port of the Apache status page.'
         - macro: '{$APACHE.STATUS.SCHEME}'
-          value: https
+          value: http
           description: 'The request scheme, which may be either HTTP or HTTPS.'
       dashboards:
         - uuid: c27c68fb9c234a09b4023076b45affc1