Merge "Clean AFD alarm definitions"

deployment_scripts/puppet/modules/lma_collector/templates/alarming.yaml.erb

@@ -176,53 +176,17 @@ lma_collector:
             periods: 0
             function: avg
     - name: 'apache-warning'
-      description: ''
+      description: 'Number of idle workers is too low'
       severity: 'warning'
       trigger:
         logical_operator: 'or'
         rules:
           - metric: apache_idle_workers
-            relational_operator: '='
+            relational_operator: '=='
             threshold: 0
             window: 60
             periods: 0
             function: min
-          - metric: apache_status
-            relational_operator: '='
-            threshold: 0
-            window: 60
-            periods: 0
-            function: min
-    - name: 'haproxy-warning'
-      description: 'HAproxy warning'
-      severity: 'warning'
-      trigger:
-        logical_operator: 'or'
-        rules:
-          - metric: haproxy_status
-            relational_operator: '='
-            threshold: 0
-            window: 60
-            periods: 0
-            function: min
-    - name: 'memcached-warning'
-      description: 'Memcached warning'
-      severity: 'warning'
-      trigger:
-        logical_operator: 'or'
-        rules:
-          - metric: memcached_status
-            relational_operator: '='
-            threshold: 0
-            window: 60
-            periods: 0
-            function: min
-          - metric: memcached_percent_hitratio
-            relational_operator: '>='
-            threshold: 50
-            window: 120
-            periods: 0
-            function: avg
     - name: 'fs-warning'
       description: 'Filesystem free space is low'
       severity: 'warning'
@@ -292,13 +256,9 @@ lma_collector:
     - controller: ['primary-controller', 'controller']
     - compute: ['compute']
     - storage: ['cinder', 'ceph-osd']
-    - influxdb: ['influxdb-grafana']
   service_cluster_roles:
     - rabbitmq: ['primary-controller', 'controller']
     - apache: ['primary-controller', 'controller']
-    - mysql: ['primary-controller', 'controller']
-    - haproxy: ['primary-controller', 'controller']
-    - memcached: ['primary-controller', 'controller']
   node_cluster_alarms:
     - controller:
       - system: ['cpu-critical-controller', 'cpu-warning-controller']
@@ -319,7 +279,3 @@ lma_collector:
       - disk: ['rabbitmq-disk-limit-critical', 'rabbitmq-disk-limit-warning']
     - apache:
       - worker: ['apache-warning']
-    - memcached:
-      - all: ['memcached-warning']
-    - haproxy:
-      - alive: ['haproxy-warning']