yangxg 3 лет назад
Родитель
Сommit
dae5086708
1 измененных файлов с 5 добавлено и 24 удалено
  1. 5 24
      deploy-tmp-logstash.yaml

+ 5 - 24
deploy-tmp-logstash.yaml

@@ -76,22 +76,6 @@ data:
           }
       }
     }
-  logstash_yml: |
-    http.host: "0.0.0.0"
-  jvm-options: |
-    -Xms4g
-    -Xmx4g
-    -XX:+UseConcMarkSweepGC
-    -XX:CMSInitiatingOccupancyFraction=75
-    -XX:+UseCMSInitiatingOccupancyOnly
-    -Djava.awt.headless=true
-    -Dfile.encoding=UTF-8
-    -Djruby.compile.invokedynamic=true
-    -Djruby.jit.threshold=0
-    -Djruby.regexp.interruptible=true
-    -XX:+HeapDumpOnOutOfMemoryError
-    -Djava.security.egd=file:/dev/urandom
-    -Dlog4j2.isThreadContextMapInheritable=true
 ---
 kind: Deployment
 apiVersion: apps/v1
@@ -123,15 +107,12 @@ spec:
         volumeMounts:
         - name: core-config
           mountPath: /usr/share/logstash/config
-        - name: jvm-config
-          mountPath: /usr/share/logstash/config
+        env:
+        - name: LS_HEAP_SIZE
+          value: 4096m
+        - name: LS_HTTP_HOST
+          value: 0.0.0.0
       volumes:
-          - name: jvm-config
-            configMap:
-              name: logstash-config
-              items:
-              - key: jvm-options
-                path: jvm.options
           - name: core-config
             configMap:
               name: logstash-config