fix

1 files changed, 20 insertions, 19 deletions

diff --git a/tools/monitoring/values.yaml b/tools/monitoring/values.yaml
index 450f60d..d1dbe95 100644
--- a/tools/monitoring/values.yaml
+++ b/tools/monitoring/values.yaml
@@ -204,27 +204,28 @@ opentelemetry-collector:
 
 logstash:
   enabled: true
-  volumeClaimTemplate:
-    accessModes: [ "ReadWriteOnce" ]
-    resources:
-      requests:
-        storage: 10Gi
-  logstashConfig:
+  image: "docker.elastic.co/logstash/logstash:7.17.3"
+  resources:
+    requests:
+      cpu: "500m"
+      memory: "2Gi"
+    limits:
+      cpu: "1"
+      memory: "4Gi"
+  config:
     logstash.yml: |
       http.host: "0.0.0.0"
+      xpack.monitoring.enabled: true
       xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch-master:9200" ]
-    logstashPipeline:
-      logstash.conf: |
-        input {
-          tcp {
-            port => 5044
-            codec => json
-          }
+    logstash.conf: |
+      input {
+        beats {
+          port => 5044
         }
-        output {
-          elasticsearch {
-            hosts => ["http://elasticsearch-master:9200"]
-            index => "logstash-%{+YYYY.MM.dd}"
-          }
+      }
+      output {
+        elasticsearch {
+          hosts => ["http://elasticsearch-master:9200"]
+          index => "%{[@metadata][beat]}-%{+YYYY.MM.dd}"
         }
-
+      }