Merge ~afreiberger/charm-prometheus-grok-exporter:lp1912847-add-ovs-grok-patterns into charm-prometheus-grok-exporter:master

[Drew Freiberger]

Add Openvswitch log patterns and metrics.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:051ca94de39515724ee2e664c5ff10a3ba53100a

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~afreiberger/charm-prometheus-grok-exporter/+git/charm-prometheus-grok-exporter/+merge/401421/+edit-commit-message

https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/1/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/47/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/134/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/1//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:051ca94de39515724ee2e664c5ff10a3ba53100a
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/88/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/234/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/2//rebuild

review: Approve (continuous-integration)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

Abstaining, just claimed the review to take it off the canonical-is-reviewers dashboard, mergebot has been switched to add bootstack-reviewers for future MPs.

review: Abstain

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision d9f54a98ffcd686fd44e12b770d8d98305212462

diff --git a/src/files/grok-patterns.yaml b/src/files/grok-patterns.yaml
index bb180d9..1a14d2d 100644
--- a/src/files/grok-patterns.yaml
+++ b/src/files/grok-patterns.yaml
@@ -3,3 +3,5 @@ grok_patterns:
   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}'
+  OPENVSWITCH_ERRORS: '%{TIMESTAMP_ISO8601:logdate}\|%{NUMBER:logline}\|%{NOTSPACE:module}\|ERR\|%{GREEDYDATA:message}'
+  OPENVSWITCH_NOT_SUPPORTED: '%{TIMESTAMP_ISO8601:logdate}\|%{NUMBER:logline}\|%{NOTSPACE:module}\|%{LOGLEVEL:loglevel}\|(?<message>.*?[Nn]ot [Ss]upported.*)'
diff --git a/src/files/metrics-mapping.yaml b/src/files/metrics-mapping.yaml
index b74c8d0..096039f 100644
--- a/src/files/metrics-mapping.yaml
+++ b/src/files/metrics-mapping.yaml
@@ -246,4 +246,28 @@ metrics:
     help: Total number of gnocchi access api calls grouped by response code
     match: '%{API_ACCESS}'
     labels:
-      response_code: '{{.response}}'
\ No newline at end of file
+      response_code: '{{.response}}'
+  openvswitch_ovs_vswitchd_errors:
+    type: counter
+    path: /var/log/openvswitch/ovs-vswitchd.log
+    help: Total number of ovs-vswitchd errors
+    match: '%{OPENVSWITCH_ERRORS}'
+    labels:
+      module: '{{.module}}'
+      message: '{{.message}}'
+  openvswitch_ovs_vswitchd_unsupported:
+    type: counter
+    path: /var/log/openvswitch/ovs-vswitchd.log
+    help: Total number of ovs-vswitchd not supported log entries
+    match: '%{OPENVSWITCH_NOT_SUPPORTED}'
+    labels:
+      module: '{{.module}}'
+      message: '{{.message}}'
+  openvswitch_ovsdb_server_errors:
+    type: counter
+    path: /var/log/openvswitch/ovsdb-server.log
+    help: Total number of ovsdb-server errors
+    match: '%{OPENVSWITCH_ERRORS}'
+    labels:
+      module: '{{.module}}'
+      message: '{{.message}}'