Add mapping for the Horizon backend with TLS

This changes adds an explicit mapping for the Horizon backend when it
runs with TLS. It also fixes the name of the internal statistics proxy
to exclude it from the list of items that the collector monitors.

Closes-Bug: #1496006

Change-Id: I75c6c49955343a4d26253cc2a0b61eb0773492ab

deployment_scripts/puppet/modules/lma_collector/manifests/collectd/controller.pp

@@ -110,8 +110,8 @@ class lma_collector::collectd::controller (
     $modules['haproxy'] = {
       'Socket' => $haproxy_socket,
       'Mapping' => $haproxy_names_mapping,
-      # Ignore internal stats and lma proxies
-      'ProxyIgnore' => ['Stats', 'lma'],
+      # Ignore internal stats ('Stats' for 6.1, 'stats' for 7.0) and lma proxies
+      'ProxyIgnore' => ['Stats', 'stats', 'lma'],
     }
   }
 

deployment_scripts/puppet/modules/lma_collector/manifests/params.pp

@@ -162,6 +162,7 @@ class lma_collector::params {
     'heat-api-cfn'        => 'heat-cfn-api',
     'heat-api-cloudwatch' => 'heat-cloudwatch-api',
     'horizon'             => 'horizon-web',
+    'horizon-ssl'         => 'horizon-https',
     'keystone-1'          => 'keystone-public-api',
     'keystone-2'          => 'keystone-admin-api',
     'murano'              => 'murano-api',

doc/source/dev/metrics/haproxy.rst

@@ -8,7 +8,8 @@
 * heat-api
 * heat-cfn-api
 * heat-cloudwatch-api
-* horizon-web
+* horizon-web (when Horizon is deployed without TLS)
+* horizon-https (when Horizon is deployed with TLS)
 * keystone-public-api
 * keystone-admin-api
 * mysqld-tcp