Don't purge completed streams and fix pipeline expiries

Just a more variances from production to local dev.

Change-Id: I24611c3dd4e816ac78c77930e6fd85ecafe82d56

ansible/roles/stv3-common/files/triggers.yaml

@@ -4,22 +4,22 @@
   distinguished_by:
   - instance_id
   - timestamp: "day"
-  expiration: "$last + 1h"
+  expiration: "$last + 2d"
   fire_pipeline: "usage_pipeline"
   expire_pipeline: "usage_expire_pipeline"
   match_criteria:
   - event_type:
     - compute.instance.*
-    - scheduler.run_instance.*
     - snapshot_instance
+    - keypair.import.*
+    - rebuild_instance
+    - compute.instance.*
     - "!compute.instance.exists"
-#### Traits are optional. 
-#    traits:
-#      os_distro: ubuntu
-#      memory_mb:
-#        numeric: "> 4096"
   - event_type: compute.instance.exists
-    map_distingushed_trait:
+    map_distinguished_by:
       timestamp: audit_period_beginning
   fire_criteria:
   - event_type: compute.instance.exists
+    traits:
+      audit_period_ending:
+        datetime: $audit_period_beginning + 1d

ansible/roles/stv3-common/templates/winchester.yaml.j2

@@ -28,6 +28,8 @@ catch_all_notifications: {{ catch_all_notifications }}
 database:
     url: {{ database_url }}
 
+purge_completed_streams: false
+
 distiller_config: /etc/stv3/event_definitions.yaml
 trigger_definitions: /etc/stv3/triggers.yaml
 pipeline_config: /etc/stv3/pipelines.yaml

winchester/triggers.yaml

@@ -16,7 +16,7 @@
     - compute.instance.*
     - "!compute.instance.exists"
   - event_type: compute.instance.exists
-    map_distingushed_by:
+    map_distinguished_by:
       timestamp: audit_period_beginning
   fire_criteria:
   - event_type: compute.instance.exists