Sync ansible files/templates with usage files

Looks like we were using the default config files in the ansible
scripts when we should be using the Usage related ones.

Change-Id: Id30152ab7762aff85f3258552de0b5a3e0a6e876

ansible/roles/stv3-common/defaults/main.yaml

@@ -5,8 +5,8 @@ config_path:
     - /etc/stv3
 
 # used in logging.conf
-root_log_level: WARNING
-yagi_log_level: INFO
+root_log_level: DEBUG
+yagi_log_level: DEBUG
 winchester_log_level: DEBUG
 amqp_log_level: WARNING
 
@@ -29,3 +29,4 @@ catch_all_notifications: false
 
 pipeline_handlers:
     logger: winchester.pipeline_handler:LoggingHandler
+    usage: winchester.pipeline_handler:UsageHandler

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

@@ -35,6 +35,8 @@
       type: int
       fields: 
         - payload.instance_flavor_id
+        - payload.image_meta.instance_type_flavor_id
+        - payload.instance_type_id
     memory_mb:
       type: int
       fields: payload.memory_mb
@@ -50,6 +52,8 @@
     vcpus:
       type: int
       fields: payload.vcpus
+    instance_type:
+      fields: payload.instance_type
     state:
       fields: payload.state
     os_architecture:

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

@@ -1,5 +1,6 @@
 ---
-test_pipeline:
+usage_pipeline:
     - logger
-test_expire_pipeline:
+    - usage
+usage_expire_pipeline:
     - logger

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

@@ -5,11 +5,13 @@
   - instance_id
   - timestamp: "day"
   expiration: "$last + 1h"
-  fire_pipeline: "test_pipeline"
-  expire_pipeline: "test_expire_pipeline"
+  fire_pipeline: "usage_pipeline"
+  expire_pipeline: "usage_expire_pipeline"
   match_criteria:
   - event_type:
     - compute.instance.*
+    - scheduler.run_instance.*
+    - snapshot_instance
     - "!compute.instance.exists"
 #### Traits are optional. 
 #    traits:

winchester/event_definitions.yaml

@@ -26,10 +26,15 @@
     service:
       fields: publisher_id
       plugin: split
+    instance_flavor:
+      fields: 
+        - payload.instance_type
+        - payload.image_meta.instance_type_name
+        - payload.image_meta.instance_type_flavorid
     instance_flavor_id:
       type: int
       fields: 
-        - payload.instance_flavor_id 
+        - payload.instance_flavor_id
         - payload.image_meta.instance_type_flavor_id
         - payload.instance_type_id
     memory_mb:

winchester/triggers.yaml

@@ -1,3 +1,4 @@
+---
 - name: test_trigger
   debug_level: 2
   distinguished_by:
@@ -8,9 +9,9 @@
   expire_pipeline: "test_expire_pipeline"
   match_criteria:
   - event_type:
+    - compute.instance.*
     - scheduler.run_instance.*
     - snapshot_instance
-    - compute.instance.*
     - "!compute.instance.exists"
 #### Traits are optional. 
 #    traits: