Fix guardrail_activation bug and add test

Author: William Chrisp

infrastructure/dashboard.json

@@ -131,7 +131,7 @@
       "type": "timeseries"
     },
     {
-      "description": "Total Guardrail Activation Count",
+      "description": "Guardrail Total Activation Count per Resource and Guardrail ID.",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -145,13 +145,17 @@
                 "color": "green",
                 "value": null
               },
+              {
+                "color": "#EAB839",
+                "value": 25
+              },
               {
                 "color": "red",
-                "value": 80
+                "value": 50
               }
             ]
           },
-          "unit": "Activations"
+          "unit": "none"
         },
         "overrides": []
       },
@@ -169,7 +173,7 @@
           "calcs": [
             "sum"
           ],
-          "fields": "/^measure_value::double$/",
+          "fields": "/^total_activations$/",
           "values": true
         },
         "showUnfilled": true
@@ -183,15 +187,16 @@
             "uid": "4tnTKWb4z"
           },
           "measure": "guardrail_activation_count",
-          "rawQuery": "SELECT \"aggregate_id\", \"measure_value\"::double FROM $__database.$__table\nWHERE \"measure_name\" = '$__measure' AND $__timeFilter\nORDER BY \"time\" ASC",
+          "rawQuery": "SELECT \"aggregate_id\", \"guardrail_id\", MAX(\"measure_value\"::double) as \"total_activations\" FROM $__database.$__table\nWHERE \"measure_name\" = '$__measure' AND $__timeFilter\nGROUP BY \"aggregate_id\", \"guardrail_id\"\nORDER BY \"total_activations\" DESC",
           "refId": "A",
           "table": "\"metrics_table\""
         }
       ],
-      "title": "Guardrail Activation Count",
+      "title": "Guardrail Total Activation Count",
       "type": "bargauge"
     },
     {
+      "description": "Average lead time from last pertinent activation to resolution.",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -223,16 +228,17 @@
       },
       "id": 16,
       "options": {
-        "orientation": "auto",
+        "displayMode": "gradient",
+        "orientation": "horizontal",
         "reduceOptions": {
           "calcs": [
-            "mean"
+            "lastNotNull"
           ],
-          "fields": "/^measure_value::double$/",
-          "values": false
+          "fields": "/^average_lead_time$/",
+          "values": true
         },
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
+        "showUnfilled": true,
+        "text": {}
       },
       "pluginVersion": "8.4.7",
       "targets": [
@@ -243,13 +249,13 @@
             "uid": "4tnTKWb4z"
           },
           "measure": "guardrail_lead_time",
-          "rawQuery": "SELECT \"aggregate_id\", \"measure_value\"::double FROM $__database.$__table\nWHERE \"measure_name\" = '$__measure' AND $__timeFilter\nORDER BY \"time\" ASC",
+          "rawQuery": "SELECT \"aggregate_id\", \"guardrail_id\", AVG(\"measure_value\"::double) as \"average_lead_time\" FROM $__database.$__table\nWHERE \"measure_name\" = '$__measure' AND $__timeFilter\nGROUP BY \"aggregate_id\", \"guardrail_id\"\nORDER BY \"average_lead_time\" DESC",
           "refId": "A",
           "table": "\"metrics_table\""
         }
       ],
       "title": "Guardrail Lead Time Average",
-      "type": "gauge"
+      "type": "bargauge"
     },
     {
       "description": "Percentage based on the number of patch compliant instances.",
@@ -588,13 +594,13 @@
     "list": []
   },
   "time": {
-    "from": "now-5m",
+    "from": "now-15m",
     "to": "now"
   },
   "timepicker": {},
   "timezone": "",
   "title": "Flight Controller dashboard",
   "uid": "test",
-  "version": 2,
+  "version": 10,
   "weekStart": ""
-}
+}

src/usecases/guardrail.py

@@ -65,15 +65,13 @@ def handle_guardrail_passed(
 ) -> Tuple[GuardrailPassed, List[Union[GuardrailLeadTime, GuardrailMaxActivation]]]:
     event = _convert_payload_to_event(event, len(aggregate_events))
     last_compliant_event = 0
-    max_activations = 0
     activations_since_last_pass = 0
     for i, aggregate_event in enumerate(aggregate_events):
         if isinstance(aggregate_event, GuardrailPassed) and aggregate_event.payload.guardrail_id == event.payload.guardrail_id:
             last_compliant_event = i
             activations_since_last_pass = 0
         elif isinstance(aggregate_event, GuardrailActivated) and aggregate_event.payload.guardrail_id == event.payload.guardrail_id:
             activations_since_last_pass += 1
-            max_activations = max(max_activations, activations_since_last_pass)
     for aggregate_event in aggregate_events[last_compliant_event:]:
         if isinstance(aggregate_event, GuardrailActivated) and aggregate_event.payload.guardrail_id == event.payload.guardrail_id:
             return (
@@ -95,7 +93,7 @@ def handle_guardrail_passed(
                             dimension_names=["guardrail_id"],
                             guardrail_id=event.payload.guardrail_id,
                         ),
-                        metric_value=max_activations,
+                        metric_value=activations_since_last_pass,
                     ),
                 ],
             )

tests/src/usecases/test_guardrail.py

@@ -359,3 +359,49 @@ def test_guardrail_passed_returns_correct_max_activation_from_last_pertinent_act
         )[1][1].metric_value
         == 2
     )
+
+
+def test_guardrail_passed_with_history_returns_correct_max_activation_from_last_pertinent_activated_with_a_max_less_then_previous():
+    second_activated_aggregate_event = GuardrailActivated(
+        aggregate_id=activated_aggregate_event.aggregate_id,
+        event_id=str(uuid4()),
+        event_type="guardrail_activated",
+        aggregate_version=2,
+        payload=GuardrailActivatedPayload(
+            guardrail_id=activated_aggregate_event.payload.guardrail_id,
+            timestamp=int(activated_aggregate_event.payload.timestamp + 2),
+        ),
+    )
+    third_passed_aggregate_event = GuardrailPassed(
+        aggregate_id=activated_aggregate_event.aggregate_id,
+        event_id=str(uuid4()),
+        event_type="guardrail_passed",
+        aggregate_version=3,
+        payload=GuardrailPassedPayload(
+            guardrail_id=activated_aggregate_event.payload.guardrail_id,
+            timestamp=int(activated_aggregate_event.payload.timestamp + 4),
+        ),
+    )
+    fourth_activated_aggregate_event = GuardrailActivated(
+        aggregate_id=activated_aggregate_event.aggregate_id,
+        event_id=str(uuid4()),
+        event_type="guardrail_activated",
+        aggregate_version=4,
+        payload=GuardrailActivatedPayload(
+            guardrail_id=activated_aggregate_event.payload.guardrail_id,
+            timestamp=int(activated_aggregate_event.payload.timestamp + 6),
+        ),
+    )
+    assert (
+        handle_guardrail_passed(
+            passed_event,
+            [
+                activated_aggregate_event,
+                second_activated_aggregate_event,
+                third_passed_aggregate_event,
+                fourth_activated_aggregate_event,
+
+            ],
+        )[1][1].metric_value
+        == 1
+    )