Fix Grok pattern for Home Assistant

The `WORD` type does not include dashes, which can be used in Home Assistant thread names.
anton-johansson · Nov 4, 2018 · f6207e5 · f6207e5
1 parent c303928
commit f6207e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/logstash/pipeline/01-home-assistant.conf b/logstash/pipeline/01-home-assistant.conf
@@ -1,7 +1,7 @@
 filter {
   if [docker][name] == "home-assistant" {
     grok {
-      match => ["message", "^%{TIMESTAMP_ISO8601} %{WORD:severity} \(%{WORD:thread}\) \[%{GREEDYDATA:name}\] %{GREEDYDATA:message}$"]
+      match => ["message", "^%{TIMESTAMP_ISO8601} %{WORD:severity} \(%{GREEDYDATA:thread}\) \[%{GREEDYDATA:name}\] %{GREEDYDATA:message}$"]
       overwrite => ["message"]
     }
     mutate {

diff --git a/logstash/test/test_cases/01-home-assistant.expected-output.json b/logstash/test/test_cases/01-home-assistant.expected-output.json
@@ -10,7 +10,7 @@
   },
   "host": "localhost",
   "message": "Bus:Handling <Event state_changed[L]: entity_id=sensor.processor_use, old_state=<state sensor.processor_use=12; unit_of_measurement=%, friendly_name=CPU, icon=mdi:memory @ 2018-05-27T11:26:21.267940+02:00>, new_state=<state sensor.processor_use=22; unit_of_measurement=%, friendly_name=CPU, icon=mdi:memory @ 2018-05-27T11:26:52.274195+02:00>>",
-  "thread": "MainThread",
+  "thread": "Main-Thread",
   "severity": "INFO",
   "name": "homeassistant.core",
   "type": "application"

diff --git a/logstash/test/test_cases/01-home-assistant.input.json b/logstash/test/test_cases/01-home-assistant.input.json
@@ -8,6 +8,6 @@
     "id" : "74ab19cd30b403e00d6634d9951224e83305208a22f12911de6cabbbd5997d32",
     "hostname" : "74ab19cd30b4"
   },
-  "message": "2018-05-27 11:26:52 INFO (MainThread) [homeassistant.core] Bus:Handling <Event state_changed[L]: entity_id=sensor.processor_use, old_state=<state sensor.processor_use=12; unit_of_measurement=%, friendly_name=CPU, icon=mdi:memory @ 2018-05-27T11:26:21.267940+02:00>, new_state=<state sensor.processor_use=22; unit_of_measurement=%, friendly_name=CPU, icon=mdi:memory @ 2018-05-27T11:26:52.274195+02:00>>",
+  "message": "2018-05-27 11:26:52 INFO (Main-Thread) [homeassistant.core] Bus:Handling <Event state_changed[L]: entity_id=sensor.processor_use, old_state=<state sensor.processor_use=12; unit_of_measurement=%, friendly_name=CPU, icon=mdi:memory @ 2018-05-27T11:26:21.267940+02:00>, new_state=<state sensor.processor_use=22; unit_of_measurement=%, friendly_name=CPU, icon=mdi:memory @ 2018-05-27T11:26:52.274195+02:00>>",
   "host": "localhost"
 }