Merge ~peppepetra/charm-prometheus-grok-exporter:openstack-errors into charm-prometheus-grok-exporter:master

[Giuseppe Petralia]

[Jeremy Lounder (jldev)]

review: Approve

diff --git a/files/grok-patterns.yaml b/files/grok-patterns.yaml
index 55267ca..b71a616 100644
--- a/files/grok-patterns.yaml
+++ b/files/grok-patterns.yaml
@@ -2,3 +2,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}'
+  OPENSTACK_ERROR: '%{TIMESTAMP_ISO8601:logdate}%{SPACE}%{NUMBER:pid}?%{SPACE}ERROR%{GREEDYDATA:message}'
diff --git a/files/metrics-mapping.yaml b/files/metrics-mapping.yaml
index 6cac548..cfd87a0 100644
--- a/files/metrics-mapping.yaml
+++ b/files/metrics-mapping.yaml
@@ -115,3 +115,118 @@ metrics:
     labels:
       retries: '{{.retries}}'
       server_name: '{{.server_name}}'
+  nova_api_os_compute_errors:
+    type: counter
+    path: /var/log/nova/nova-api-os-compute.log
+    help: Total number of nova api os compute errors
+    match: '%{OPENSTACK_ERROR}'
+  nova_placement_api_errors:
+    type: counter
+    path: /var/log/nova/nova-placement-api.log
+    help: Total number of nova placement errors
+    match: '%{OPENSTACK_ERROR}'
+  nova_placement_api_access_errors:
+    type: counter
+    help: Total number of nova placement api access errors
+    path: /var/log/apache2/nova-placement-api_access.log
+    match: '%{OPENSTACK_ERROR}'
+  nova_access_errors:
+    type: counter
+    path: /var/log/apache2/nova_access.log
+    help: Total number of nova access errors
+    match: '%{OPENSTACK_ERROR}'
+  nova_conductor_errors:
+    type: counter
+    path: /var/log/nova/nova-conductor.log
+    help: Total number of nova conductor errors
+    match: '%{OPENSTACK_ERROR}'
+  nova_manage_errors:
+    type: counter
+    path: /var/log/nova/nova-manage.log
+    help: Total number of nova manage errors
+    match: '%{OPENSTACK_ERROR}'
+  nova_scheduler_errors:
+    type: counter
+    path: /var/log/nova/nova-scheduler.log
+    help: Total number of nova scheduler errors
+    match: '%{OPENSTACK_ERROR}'
+  keystone_errors:
+    type: counter
+    path: /var/log/nova/keystone.log
+    help: Total number of keystone errors
+    match: '%{OPENSTACK_ERROR}'
+  keystone_manage_errors:
+    type: counter
+    path: /var/log/nova/keystone-manage.log
+    help: Total number of keystone manage errors
+    match: '%{OPENSTACK_ERROR}'
+  neutron_server_errors:
+    type: counter
+    path: /var/log/neutron/neutron-server.log
+    help: Total number of neutron server errors
+    match: '%{OPENSTACK_ERROR}'
+  heat_api_cfn_errors:
+    type: counter
+    path: /var/log/heat/heat-api-cfn.log
+    help: Total number of heat api cfn errors
+    match: '%{OPENSTACK_ERROR}'
+  heat_api_errors:
+    type: counter
+    path: /var/log/heat/heat-api.log
+    help: Total number of heat api errors
+    match: '%{OPENSTACK_ERROR}'
+  heat_engine_errors:
+    type: counter
+    path: /var/log/heat/heat-engine.log
+    help: Total number of heat engine errors
+    match: '%{OPENSTACK_ERROR}'
+  cinder_scheduler_errors:
+    type: counter
+    path: /var/log/cinder/cinder-scheduler.log
+    help: Total number of cinder scheduler errors
+    match: '%{OPENSTACK_ERROR}'
+  cinder_volume_errors:
+    type: counter
+    path: /var/log/cinder/cinder-volume.log
+    help: Total number of cinder volume errors
+    match: '%{OPENSTACK_ERROR}'
+  designate_api_errors:
+    type: counter
+    path: /var/log/designate/designate-api.log
+    help: Total number of designate api errors
+    match: '%{OPENSTACK_ERROR}'
+  designate_central_errors:
+    type: counter
+    path: /var/log/designate/designate-central.log
+    help: Total number of designate central errors
+    match: '%{OPENSTACK_ERROR}'
+  designate_mdns_errors:
+    type: counter
+    path: /var/log/designate/designate-mdns.log
+    help: Total number of designate mdns errors
+    match: '%{OPENSTACK_ERROR}'
+  designate_pool_manager_errors:
+    type: counter
+    path: /var/log/designate/designate-pool-manager.log
+    help: Total number of designate mdns errors
+    match: '%{OPENSTACK_ERROR}'
+  designate_sink_errors:
+    type: counter
+    path: /var/log/designate/designate-sink.log
+    help: Total number of designate sink errors
+    match: '%{OPENSTACK_ERROR}'
+  designate_zone_manager_errors:
+    type: counter
+    path: /var/log/designate/designate-zone-manager.log
+    help: Total number of designate zone manager errors
+    match: '%{OPENSTACK_ERROR}'
+  glance_api_errors:
+    type: counter
+    path: /var/log/glance/glance-api.log
+    match: '%{OPENSTACK_ERROR}'
+    help: Total number of glance api errors
+  glance_registry_errors:
+    type: counter
+    path: /var/log/glance/glance-registry.log
+    match: '%{OPENSTACK_ERROR}'
+    help: Total number of glance registry errors
 \ No newline at end of file