chore(logging): k8s - opensearch/fluent - use bitnami/opensearch and …

…update fluent config
mborne · May 31, 2024 · 9c73f5b · 9c73f5b
1 parent f289c46
commit 9c73f5b
Show file tree

Hide file tree

Showing 9 changed files with 3,072 additions and 67 deletions.
diff --git a/fluent/values.dist.yaml → fluent/helm/fluent-bit/values.dist.yaml b/fluent/values.dist.yaml → fluent/helm/fluent-bit/values.dist.yaml
diff --git a/fluent/values.yaml → fluent/helm/fluent-bit/values.yaml b/fluent/values.yaml → fluent/helm/fluent-bit/values.yaml
@@ -12,12 +12,6 @@ config:
         Mem_Buf_Limit 5MB
         Skip_Long_Lines On
 
-    # [INPUT]
-    #     Name systemd
-    #     Tag host.*
-    #     Systemd_Filter _SYSTEMD_UNIT=kubelet.service
-    #     Read_From_Tail On
-
   ## https://docs.fluentbit.io/manual/pipeline/filters
   filters: |
     [FILTER]
@@ -52,15 +46,15 @@ config:
     [OUTPUT]
         Name               opensearch
         Match              kube.*
-        Host               opensearch-cluster-master.opensearch
+        Host               opensearch-cluster.opensearch
         Port               9200
         Suppress_Type_Name On
         Logstash_Format    On
         Logstash_Prefix    logstash
-        HTTP_User          admin
-        HTTP_Passwd        admin
-        tls                On
-        tls.verify         Off
+        # HTTP_User          admin
+        # HTTP_Passwd        admin
+        # tls                On
+        # tls.verify         Off
 
 
 tolerations:
@@ -71,24 +65,3 @@ tolerations:
     effect: "NoExecute"
   - operator: "Exists"
     effect: "NoSchedule"
-
-# volumeMounts:
-# - name: varlog
-#   mountPath: /var/log
-# - name: varlibdockercontainers
-#   mountPath: /var/lib/docker/containers
-#   readOnly: true
-# - name: fluent-bit-config
-#   mountPath: /fluent-bit/etc/
-# terminationGracePeriodSeconds: 10
-# volumes:
-# - name: varlog
-# hostPath:
-#   path: /var/log
-# - name: varlibdockercontainers
-# hostPath:
-#   path: /var/lib/docker/containers
-# - name: fluent-bit-config
-# configMap:
-#   name: fluent-bit-config
-# serviceAccountName: fluent-bit
diff --git a/fluent/k8s-deploy.sh b/fluent/k8s-deploy.sh
@@ -6,7 +6,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 kubectl create namespace fluent --dry-run=client -o yaml | kubectl apply -f -
 
 # Deploy fluent-bit with helm
-helm -n fluent upgrade --install fluent-bit oci://registry-1.docker.io/bitnamicharts/fluent-bit -f ${SCRIPT_DIR}/values.yaml
+helm -n fluent upgrade --install fluent-bit oci://registry-1.docker.io/bitnamicharts/fluent-bit \
+  -f ${SCRIPT_DIR}/helm/fluent-bit/values.yaml
 
 # Allow fluent-bit sa to retreive infos about containers
 cat <<EOF | kubectl apply -f -

diff --git a/opensearch/README.md b/opensearch/README.md
@@ -27,7 +27,6 @@ DEVBOX_HOSTNAME=example.net bash k8s-install.sh
 ## Resources
 
 * [opensearch.org - Install OpenSearch / Docker](https://opensearch.org/docs/latest/opensearch/install/docker/)
-* [opensearch.org - Install OpenSearch using Helm](https://opensearch.org/docs/latest/opensearch/install/helm/#install-opensearch-using-helm)
-
 
+* [bitnami/opensearch - parameters](https://github.com/bitnami/charts/tree/main/bitnami/opensearch/#parameters)