Merge pull request #57 from anasoid/develop

add sll verification
anasoid · Oct 16, 2023 · 86f076e · 86f076e
2 parents 257de48 + 02d0ba9
commit 86f076e
Show file tree

Hide file tree

Showing 7 changed files with 173 additions and 262 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         include:
           - output: "elasticsearch"
-            logstash-version: 7.17.9
+            logstash-version: 7.17.14
             logstash-branch: 7.17
             elasticsearch-version: 7
             prefix: ""
@@ -51,7 +51,7 @@ jobs:
     # v2 https://github.com/docker/build-push-action/blob/master/UPGRADE.md
     steps:
       - name: Checkout ✅
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Config 📦
         run: |

diff --git a/README.md b/README.md
diff --git a/config/pipeline/output-elastic-logstash.conf b/config/pipeline/output-elastic-logstash.conf
@@ -9,6 +9,7 @@ output {
          http_compression => "${ELASTICSEARCH_HTTP_COMPRESSION:false}"
          user => "${ELASTICSEARCH_USER:}"
          password => "${ELASTICSEARCH_PASSWORD:}"
+         ssl_certificate_verification => "${ELASTICSEARCH_SSL_VERIFICATION:true}"
          template_name => "jmeter-jtl"
          template => "/usr/share/logstash/pipeline/template/jmeter-jtl-${ELASTICSEARCH_VERSION:7}x.json"
          template_overwrite => true
@@ -24,6 +25,7 @@ output {
          http_compression => "${ELASTICSEARCH_HTTP_COMPRESSION:false}"
          user => "${ELASTICSEARCH_USER:}"
          password => "${ELASTICSEARCH_PASSWORD:}"
+         ssl_certificate_verification => "${ELASTICSEARCH_SSL_VERIFICATION:true}"
          template_name => "jmeter-jtl"
          template => "/usr/share/logstash/pipeline/template/jmeter-jtl-${ELASTICSEARCH_VERSION:7}x.json"
          template_overwrite => true

diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-ARG LOGSTASH_VERSION=7.17.10
+ARG LOGSTASH_VERSION=7.17.14
 FROM docker.elastic.co/logstash/logstash-oss:${LOGSTASH_VERSION}
 
 ARG ELASTICSEARCH_VERSION=7

diff --git a/docker/influxdb/Dockerfile b/docker/influxdb/Dockerfile
diff --git a/docker/influxdb/config/pipeline/output-influxdb-logstash.conf b/docker/influxdb/config/pipeline/output-influxdb-logstash.conf
diff --git a/testing/Dockerfile b/testing/Dockerfile
@@ -1,4 +1,4 @@
-ARG LOGSTASH_VERSION=7.17.10
+ARG LOGSTASH_VERSION=7.17.14
 FROM docker.elastic.co/logstash/logstash-oss:${LOGSTASH_VERSION}
 
 ARG ELASTICSEARCH_VERSION=7