Merge "Collect WARN and INFO message counts too"

cloud-bulldozer · Jan 16, 2017 · fb90712 · fb90712
2 parents 99a9eeb + 29ba5fb
commit fb90712
Show file tree

Hide file tree

Showing 7 changed files with 1,513 additions and 95 deletions.
diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml
@@ -83,6 +83,13 @@ collectd_compute: false
 gnocchi_status_python_plugin: false
 gnocchi_status_interval: 30
 
+########################
+# tail plugin
+########################
+# Determines if WARN/INFO messages are also counted
+regex_warn: false
+regex_info: false
+
 ########################################
 # Docker related
 # (use these if deploying graphite/carbon/grafana as containers)

diff --git a/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2 b/ansible/install/roles/collectd-openstack/templates/compute.collectd.conf.j2
@@ -128,8 +128,24 @@ PreCacheChain "PreCache"
       Regex " ERROR "
       DSType "CounterInc"
       Type "counter"
-      Instance "total"
+      Instance "error"
     </Match>
+{%if regex_warn %}
+    <Match>
+      Regex " WARNING "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "warn"
+    </Match>
+{% endif %}
+{%if regex_info %}
+    <Match>
+      Regex " INFO "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "info"
+    </Match>
+{% endif %}
   </File>
 
   <File "/var/log/neutron/openvswitch-agent.log">
@@ -138,35 +154,100 @@ PreCacheChain "PreCache"
       Regex " ERROR "
       DSType "CounterInc"
       Type "counter"
-      Instance "total"
+      Instance "error"
     </Match>
+{%if regex_warn %}
+    <Match>
+      Regex " WARNING "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "warn"
+    </Match>
+{% endif %}
+{%if regex_info %}
+    <Match>
+      Regex " INFO "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "info"
+    </Match>
+{% endif %}
   </File>
   <File "/var/log/neutron/l3-agent.log">
     Instance "neutron-l3-agent"
     <Match>
       Regex " ERROR "
       DSType "CounterInc"
       Type "counter"
-      Instance "total"
+      Instance "error"
     </Match>
+{%if regex_warn %}
+    <Match>
+      Regex " WARNING "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "warn"
+    </Match>
+{% endif %}
+{%if regex_info %}
+    <Match>
+      Regex " INFO "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "info"
+    </Match>
+{% endif %}
   </File>
   <File "/var/log/neutron/metadata-agent.log">
     Instance "neutron-metadata-agent"
     <Match>
       Regex " ERROR "
       DSType "CounterInc"
       Type "counter"
-      Instance "total"
+      Instance "error"
+    </Match>
+{%if regex_warn %}
+    <Match>
+      Regex " WARNING "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "warn"
+    </Match>
+{% endif %}
+{%if regex_info %}
+    <Match>
+      Regex " INFO "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "info"
     </Match>
+{% endif %}
   </File>
+
   <File "/var/log/ceilometer/compute.log">
     Instance "ceilometer-compute"
     <Match>
       Regex " ERROR "
       DSType "CounterInc"
       Type "counter"
-      Instance "total"
+      Instance "error"
+    </Match>
+{%if regex_warn %}
+    <Match>
+      Regex " WARNING "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "warn"
+    </Match>
+{% endif %}
+{%if regex_info %}
+    <Match>
+      Regex " INFO "
+      DSType "CounterInc"
+      Type "counter"
+      Instance "info"
     </Match>
+{% endif %}
   </File>
 </Plugin>