From f86d8b1baa9959840f0fbff579ee2eef2ca6bf4f Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Thu, 3 Mar 2022 16:39:30 +1100
Subject: [PATCH] update es

---
 apply.sh              |  9 ++++++++-
 es.yaml               | 16 ++++++++++++----
 fluentbit-values.yaml |  6 ++++--
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/apply.sh b/apply.sh
index ab84b5e..297129c 100755
--- a/apply.sh
+++ b/apply.sh
@@ -185,7 +185,8 @@ k apply -f es.yaml
 
 # fluent bit
 helm repo add fluent https://fluent.github.io/helm-charts
-helm upgrade --install fluent-bit fluent/fluent-bit -f fluentbit-values.yaml
+
+helm upgrade --install fluent-bit fluent/fluent-bit -f fluentbit-values.yaml -n es
 
 # code server https://code.junv.me
 
@@ -212,3 +213,9 @@ db.createUser(
 # crawlab
 
 k apply -f crawlab.yaml -n crawlab
+
+# secuirty
+
+kubectl create namespace security
+
+kubectl apply -f https://raw.githubusercontent.com/aquasecurity/kube-bench/main/job.yaml -n security
diff --git a/es.yaml b/es.yaml
index 66c8c3a..cc5a80d 100644
--- a/es.yaml
+++ b/es.yaml
@@ -15,9 +15,15 @@ spec:
         app: elasticsearch
         name: elasticsearch
     spec:
+      initContainers:
+        - name: increase-vm-max-map
+          image: busybox
+          command: ["sysctl", "-w", "vm.max_map_count=262144"]
+          securityContext:
+            privileged: true
       containers:
         - name: elasticsearch
-          image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2
+          image: docker.elastic.co/elasticsearch/elasticsearch:8.0.1
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 9200
@@ -29,6 +35,8 @@ spec:
           env:
             - name: discovery.type
               value: single-node
+            - name: xpack.security.enabled
+              value: "false"
           volumeMounts:
             - name: es
               mountPath: /usr/share/elasticsearch/data
@@ -80,10 +88,10 @@ metadata:
 spec:
   tls:
   - hosts:
-    - elasticsearch.junv.me
+    - es.junv.me
     secretName: elasticsearch-tls
   rules:
-  - host: elasticsearch.junv.me
+  - host: es.junv.me
     http:
       paths:
       - backend:
@@ -115,7 +123,7 @@ spec:
     spec:
       containers:
         - name: kibana
-          image: docker.elastic.co/kibana/kibana:7.13.2
+          image: docker.elastic.co/kibana/kibana:8.0.1
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 5601
diff --git a/fluentbit-values.yaml b/fluentbit-values.yaml
index c18da31..8f803d8 100644
--- a/fluentbit-values.yaml
+++ b/fluentbit-values.yaml
@@ -215,8 +215,9 @@ config:
         Match kube.*
         Host elasticsearch.es.svc.cluster.local
         Port 9200
-        # Logstash_Format On
-        # Logstash_Prefix kube
+        Logstash_Format On
+        Logstash_Prefix kube
+        Logstash_DateFormat %Y-%m
         Retry_Limit 20
         Buffer_Size 64KB
         Trace_Error On
@@ -228,6 +229,7 @@ config:
         Port 9200
         Logstash_Format On
         Logstash_Prefix node
+        Logstash_DateFormat %Y-%m
         Retry_Limit 20
         Replace_Dots    On