From d9abe7ceae5ed1b3b2b506520a10911b84a92091 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Mon, 16 Feb 2015 12:33:32 -0800
Subject: [PATCH] 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    | 16 ++++++++--------
 .../stv3-common/templates/winchester.yaml.j2     |  2 ++
 winchester/triggers.yaml                         |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/stv3-common/files/triggers.yaml b/ansible/roles/stv3-common/files/triggers.yaml
index 7b74c6f..a6b81af 100644
--- a/ansible/roles/stv3-common/files/triggers.yaml
+++ b/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
diff --git a/ansible/roles/stv3-common/templates/winchester.yaml.j2 b/ansible/roles/stv3-common/templates/winchester.yaml.j2
index 10711b7..4074f8f 100644
--- a/ansible/roles/stv3-common/templates/winchester.yaml.j2
+++ b/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
diff --git a/winchester/triggers.yaml b/winchester/triggers.yaml
index d1ec7c3..fb99be6 100644
--- a/winchester/triggers.yaml
+++ b/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