fix: correcting previous fix on handling list query

Author: smith4

commands.txt

@@ -1,4 +1,11 @@
 
+Policy keeper start:
+
+source env/pk/bin/activate
+./policy_keeper.py --cfg configs/config.yaml --srv
+
+
+
 Policy keeper REST API:
 
 Start a policy:
@@ -10,25 +17,4 @@ curl -X POST http://localhost:12345/policy/stop
 Fire an alert:
 curl -X POST http://localhost:12345/alerts/fire --data-binary @alert.yaml
 
-alert.yaml:
-alerts:
-- annotations: {}
-  endsAt: '0001-01-01T00:00:00Z'
-  generatorURL: http://d41870505e27:9090/graph?g0.expr=vector%281.525268017e%2B09+-+time%28%29%29+%3C+0&g0.tab=1
-  labels:
-    alertname: MyAlert
-  startsAt: '2018-05-03T07:41:01.255717752Z'
-  status: firing
-commonAnnotations: {}
-commonLabels:
-  alertname: time_elapsed
-externalURL: http://7c46054c555f:9093
-groupKey: '{}:{alertname="Myalert"}'
-groupLabels:
-  alertname: MyAlert
-receiver: default
-status: firing
-version: '4'
-
-----------------------
 

configs/devel-config.yaml

@@ -1,9 +1,9 @@
 
 
-prometheus_endpoint: 'http://localhost'
-prometheus_config_template: '/tmp/original_prometheus_config.yaml'
-prometheus_config_target: '/tmp/prometheus_config.yaml'
-prometheus_rules_directory: '/var/lib/micado/prometheus/config'
+prometheus_endpoint: 'http://prometheus:9090/prometheus'
+prometheus_config_template: '/config/policykeeper/prometheus_config_template.yaml'
+prometheus_config_target: '/prometheus.yaml'
+prometheus_rules_directory: '/'
 
 docker_node_unreachable_timeout: 120
 

handle_prometheus.py

@@ -21,17 +21,18 @@ def extract_value_from_prometheus_response(expression,response,filterdict=dict()
   if response['data']['resultType']=='vector':
     result = [ x for x in response['data']['result']
              if x.get('metric',None) is not None and is_subdict(filterdict,x['metric']) ]
+    if isinstance(expression,list):
+      log.debug('Multiple results in prometheus response for expression "{0}": "{1}"'
+                .format(expression,str(result)))
+      return [ x.get('metric',dict()).get(expression[1]) \
+               for x in result if x.get('metric',dict()).get(expression[1])]
     if len(result)<1:
       raise Exception('No results found in prometheus response for expression "{0}": "{1}"'
                       .format(expression,str(result)))
-    log.debug('Multiple results in prometheus response for expression "{0}": "{1}"'
-              .format(expression,str(result)))
-    if not isinstance(expression,list):
-      raise Exception('Multiple results in prometheus response for expression "{0}": "{1}"'
-                      .format(expression,str(result)))
-    else:
-      return [ x.get('metric',dict()).get(expression[1]) \
-               for x in result if x.get('metric',dict()).get(expression[1])]
+    if not result[0].get('value'):
+      raise Exception('Unrecognised result in prometheus response for expression "{0}": "{1}"'
+                      .format(expression,str(result[0])))
+    value=result[0]['value']
   else:
     value=response['data']['result']
   if not isinstance(value,list) or \