Merge pull request #193 from whyscream/validate-config-syntax

Validate config syntax
whyscream · Feb 4, 2024 · 858e0eb · 858e0eb
2 parents e0e8cf5 + 10dfac9
commit 858e0eb
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/.github/workflows/test_config_syntax.yml b/.github/workflows/test_config_syntax.yml
@@ -0,0 +1,13 @@
+name: Validate configuration syntax
+on: [push]
+jobs:
+  test-syntax:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          docker run --rm \
+          --volume ./postfix.grok:/etc/logstash/patterns.d/postfix.grok \
+          --volume ./50-filter-postfix.conf:/usr/share/logstash/pipeline/50-filter-postfix.conf \
+          logstash:8.12.0 \
+          logstash --config.test_and_exit -f /usr/share/logstash/pipeline/50-filter-postfix.conf
diff --git a/.github/workflows/run_tests.yml → .github/workflows/test_grok_patterns.yml b/.github/workflows/run_tests.yml → .github/workflows/test_grok_patterns.yml
@@ -1,6 +1,7 @@
+name: Test grok patterns
 on: [push]
 jobs:
-  test:
+  test-patterns:
     runs-on: ubuntu-latest
 
     steps:

diff --git a/ALTERNATIVE-INPUTS.md b/ALTERNATIVE-INPUTS.md
@@ -7,9 +7,11 @@ Various other Logstash filters can produce the needed input fields (`program` an
 ----------------
 
 ``` 
-grok {
-    match => { "message" => "%{SYSLOGTIMESTAMP:timestamp} %{SYSLOGHOST} %{DATA:program}(?:\[%{POSINT}\])?: %{GREEDYDATA:message}" }
-    overwrite => ["timestamp", "message"]
+filter {
+    grok {
+        match => { "message" => "%{SYSLOGTIMESTAMP:timestamp} %{SYSLOGHOST} %{DATA:program}(?:\[%{POSINT}\])?: %{GREEDYDATA:message}" }
+        overwrite => ["timestamp", "message"]
+    }
 }
 ```
 
diff --git a/test_config_syntax.sh b/test_config_syntax.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -eux
+
+docker run --rm -it \
+  --volume $(pwd)/postfix.grok:/etc/logstash/patterns.d/postfix.grok \
+  --volume $(pwd)/50-filter-postfix.conf:/usr/share/logstash/pipeline/50-filter-postfix.conf \
+  logstash:8.12.0 \
+  logstash --config.test_and_exit -f /usr/share/logstash/pipeline/50-filter-postfix.conf
diff --git a/runtests.sh → test_grok_patterns.sh b/runtests.sh → test_grok_patterns.sh