Handle "disabled" in cinder_volume alarms

Change-Id: I8a9e44282f755d157f7e3fe58808d1f7d511b400

cinder/meta/heka.yml

@@ -153,6 +153,8 @@ remote_collector:
         function: last
     {%- endif %}
     {%- if volume %}
+    # we treat "up" and "disabled" states in the same way, considering
+    # that "disabled" should not be treated as an error
     cinder_volume_some_down:
       description: 'Some Cinder volumes are down'
       severity: warning
@@ -167,15 +169,6 @@ remote_collector:
         window: 60
         periods: 0
         function: last
-      - metric: openstack_cinder_services_percent
-        field:
-          service: volume
-          state: up
-        relational_operator: '>='
-        threshold: 50
-        window: 60
-        periods: 0
-        function: last
     cinder_volume_majority_down:
       description: 'Majority of Cinder volumes are down'
       severity: critical
@@ -183,8 +176,8 @@ remote_collector:
       - metric: openstack_cinder_services_percent
         field:
           service: volume
-          state: up
-        relational_operator: '<'
+          state: down
+        relational_operator: '>'
         threshold: 50
         window: 60
         periods: 0