test

charts/templates/logstash_beats.yaml

@@ -110,9 +110,6 @@ spec:
         - name:  logstash-technical-ilm-vol
           mountPath: /usr/share/logstash/ilm/logstash-technical-ilm.json
           subPath: logstash-technical-ilm.json
-        - name:  logstash-test
-          mountPath: /usr/share/logstash/test/logstash-replace.sh
-          subPath: logstash-replace.sh
         env:
           - name: LS_JAVA_OPTS
             value: {{ .Values.logstash.env.ls_java_opts }}
@@ -165,10 +162,6 @@ spec:
         configMap:
           name: logstash-technical-ilm-configmap
           defaultMode: 511
-      - name: logstash-test
-        configMap:
-          name: logstash-test
-          defaultMode: 511
   pipelinesRef:
     secretName: logstash-{{ .Values.logstash.beats.pipelines_group_name }}-pipelines-yml
 ---
@@ -316,13 +309,4 @@ data:
       }
     }
 ---
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: logstash-test
-data: 
-  logstash-replace.sh: |
-    #!/bin/bash
-    sed -i 's/@{/${/g' /app/elastic/logstash/config/pipelines/beats-pipeline.config
----
 {{- end }}
\ No newline at end of file

charts/values.yaml

@@ -302,9 +302,9 @@ logstash:
           }
           else if [log_type] == "technical" {
             elasticsearch {
-            hosts => [ "@{ELASTIC_ELASTICSEARCH_ES_HOSTS}" ]
-            user => "@{LOGSTASH_USER}"
-            password => "@{LOGSTASH_PASSWORD}"
+            hosts => [ "${ELASTIC_ELASTICSEARCH_ES_HOSTS}" ]
+            user => "${LOGSTASH_USER}"
+            password => "${LOGSTASH_PASSWORD}"
             ssl_enabled => "true"
             ssl_verification_mode => "full"
             ssl_certificate_authorities => "/usr/share/logstash/config/certs/ca.crt"

pipeline.variables.sh

 PROJECT_VERSION_NUMBER="0.1.10"
 export LOGSTASH_HOSTS="\${LOGSTASH_HOSTS}"
 export ELASTIC_ELASTICSEARCH_ES_HOSTS="\${ELASTIC_ELASTICSEARCH_ES_HOSTS}"
+export LOGSTASH_USER="\${LOGSTASH_USER}"
+export LOGSTASH_PASSWORD="\${LOGSTASH_PASSWORD}"
+export MONITORED_NAMESPACE="\${MONITORED_NAMESPACE}"