Merge ~peppepetra/charm-prometheus-grok-exporter:haproxy-metrics into charm-prometheus-grok-exporter:master

[Giuseppe Petralia]

[Chris MacNaughton (chris.macnaughton)]

Assuming these config options work, this looks OK

[Jeremy Lounder (jldev)]

review: Approve

diff --git a/files/grok-patterns.yaml b/files/grok-patterns.yaml
index 2abcac3..55267ca 100644
--- a/files/grok-patterns.yaml
+++ b/files/grok-patterns.yaml
@@ -1,3 +1,4 @@
 grok_patterns:
   OPENSTACK_API: '%{TIMESTAMP_ISO8601:logdate}%{SPACE}%{NUMBER:pid}?%{SPACE}?%{LOGLEVEL:loglevel} (\[)?(%{NOTSPACE:module})?(\])?%{SPACE}\[%{GREEDYDATA:request}\]%{SPACE}%{NOTSPACE:requesterip}%{SPACE}(%{GREEDYDATA:httpdate})?\"%{NOTSPACE:http_verb}%{SPACE}%{NOTSPACE:url}%{SPACE}(%{NOTSPACE:http_version})?\"%{SPACE}(status:%{SPACE})?%{NUMBER:response}%{SPACE}(len:%{SPACE})?%{NUMBER:response_len}%{SPACE}(time:%{SPACE})?%{NUMBER:response_time}?(%{SPACE}microversion:%{SPACE}%{NUMBER:microversion})?'
   API_ACCESS: '(%{NOTSPACE:service}%{SPACE})?%{NOTSPACE:requesterip}%{SPACE}-%{SPACE}-%{SPACE}\[%{HTTPDATE:logdate}\]%{SPACE}\"%{NOTSPACE:http_verb}%{SPACE}%{NOTSPACE:url}%{SPACE}%{NOTSPACE:http_version}\"%{SPACE}%{NUMBER:response}%{SPACE}%{NUMBER:response_len}%{GREEDYDATA:client}\"?'
+  NOVA_COMPUTE: '%{TIMESTAMP_ISO8601:logdate}%{SPACE}%{NUMBER:pid}?%{SPACE}?%{LOGLEVEL:loglevel}%{SPACE}((\[)?(%{NOTSPACE:module})?(\])?%{SPACE})?\[%{GREEDYDATA:request}\]%{SPACE}\[%{GREEDYDATA:resource}\]%{SPACE}%{GREEDYDATA:logmessage}'
diff --git a/files/metrics-mapping.yaml b/files/metrics-mapping.yaml
index b435b9e..6cac548 100644
--- a/files/metrics-mapping.yaml
+++ b/files/metrics-mapping.yaml
@@ -97,3 +97,21 @@ metrics:
     match: '%{API_ACCESS}'
     labels:
       response_code: '{{.response}}'
+  nova_compute_number_of_vms_created:
+    type: counter
+    path: /var/log/nova/nova-compute.log
+    help: Total number of VMs created
+    match: '%{NOVA_COMPUTE}Instance spawned successfully'
+  nova_compute_number_of_vms_deleted:
+    type: counter
+    path: /var/log/nova/nova-compute.log
+    help: Total number of VMs deleted
+    match: '%{NOVA_COMPUTE}Instance destroyed successfully'
+  haproxy_number_of_tcp_requests:
+    type: counter
+    path: /var/log/haproxy.log
+    help: Number of tcp requests received by haproxy
+    match: '%{HAPROXYTCP}'
+    labels:
+      retries: '{{.retries}}'
+      server_name: '{{.server_name}}'