Improvements related to elasticsearch. Made it better :-)

geosp · Oct 4, 2020 · 4a480c4 · 4a480c4
1 parent 6c7c43a
commit 4a480c4
Show file tree

Hide file tree

Showing 13 changed files with 49,577 additions and 93 deletions.
diff --git a/elk/deploy.sh b/elk/deploy.sh
@@ -12,18 +12,19 @@ microk8s kubectl config set-context --current --namespace=elk
 microk8s kubectl apply -f ../shared-storageclass.yaml
 microk8s kubectl apply -f logstash-persistentvolume.yaml
 microk8s kubectl apply -f logstash-persistentvolumeclaim.yaml
-microk8s kubectl apply -f logstash-deployment.yaml
-microk8s kubectl expose deployment logstash --type=LoadBalancer --name=logstash
-microk8s kubectl apply -f logstash-claim0-persistentvolumeclaim.yaml
-microk8s kubectl apply -f logstash-claim1-persistentvolumeclaim.yaml
+microk8s kubectl apply -f elasticsearch-data-persistentvolume.yaml
+microk8s kubectl apply -f elasticsearch-data-persistentvolumeclaim.yaml
+microk8s kubectl apply -f elasticsearch-hunspell-persistentvolume.yaml
+microk8s kubectl apply -f elasticsearch-hunspell-persistentvolumeclaim.yaml
+microk8s kubectl create configmap elasticsearch-config --from-file=elasticsearch/elasticsearch.yml
 microk8s kubectl apply -f elasticsearch-deployment.yaml
-microk8s kubectl apply -f elasticsearch-replicaset.yaml
+microk8s kubectl apply -f logstash-deployment.yaml
 microk8s kubectl apply -f kibana-deployment.yaml
+microk8s kubectl expose deployment logstash --type=LoadBalancer --name=logstash
 microk8s kubectl expose deployment kibana --type=LoadBalancer --name=kibana
-microk8s kubectl expose replicaset elasticsearch --type=LoadBalancer --name=elasticsearch
+microk8s kubectl expose deployment elasticsearch --type=LoadBalancer --name=elasticsearch
 logstashSettingsPath=$(getVolumePath 'logstash-pv-claim')
-logstashConfigurationPath=$(getVolumePath 'logstash-pv-claim')
-echo "Copying configuration to path: ${logstashConfigurationPath}"
-cp -r ./logstash/custom.conf $logstashConfigurationPath
+echo "Copying configuration to path: ${logstashSettingsPath}"
+cp -r ./logstash/custom.conf $logstashSettingsPath
 echo "Copying settings to path: ${logstashSettingsPath}"
 cp -r ./logstash/logstash.yml $logstashSettingsPath
diff --git a/elk/elasticsearch-data-persistentvolume.yaml b/elk/elasticsearch-data-persistentvolume.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: elasticsearch-data-pv-volume
+  labels:
+    type: local
+spec:
+  storageClassName: shared-storage
+  capacity:
+    storage: 10Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: /storage/data/elasticsearch/data
diff --git a/elk/elasticsearch-data-persistentvolumeclaim.yaml b/elk/elasticsearch-data-persistentvolumeclaim.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: elasticsearch-data-pv-claim
+spec:
+  storageClassName: shared-storage
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 3Gi
diff --git a/elk/elasticsearch-deployment.yaml b/elk/elasticsearch-deployment.yaml
@@ -4,12 +4,11 @@ metadata:
   annotations:
     kompose.cmd: kompose convert
     kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     io.kompose.service: elasticsearch
   name: elasticsearch
 spec:
-  replicas: 0
+  replicas: 1
   selector:
     matchLabels:
       io.kompose.service: elasticsearch
@@ -19,7 +18,6 @@ spec:
       annotations:
         kompose.cmd: kompose convert
         kompose.version: 1.21.0 (992df58d8)
-      creationTimestamp: null
       labels:
         io.kompose.network/elk.net: "true"
         io.kompose.service: elasticsearch
@@ -30,8 +28,6 @@ spec:
               value: -Xms1000m -Xmx1000m
             - name: bootstrap.memory_lock
               value: "true"
-            - name: cluster.name
-              value: docker-cluster
             - name: discovery.type
               value: single-node
             - name: xpack.monitoring.enabled
@@ -53,9 +49,27 @@ spec:
           ports:
             - containerPort: 9200
           resources: {}
+          volumeMounts:
+            - mountPath: /usr/share/elasticsearch/data
+              name: elasticsearch-data-pv-claim
+            - mountPath: /usr/share/elasticsearch/config/hunspell
+              name: elasticsearch-hunspell-pv-claim
+            - mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
+              name: elasticsearch-config
+              subPath: elasticsearch.yml
+              readOnly: true
+      volumes:
+        - name: elasticsearch-data-pv-claim
+          persistentVolumeClaim:
+            claimName: elasticsearch-data-pv-claim
+        - name: elasticsearch-hunspell-pv-claim
+          persistentVolumeClaim:
+            claimName: elasticsearch-hunspell-pv-claim
+        - name: elasticsearch-config
+          configMap:
+            name: elasticsearch-config
       restartPolicy: Always
       serviceAccountName: ""
-      volumes: null
       nodeSelector:
         kubernetes.io/hostname: ubuntu01
 status: {}
diff --git a/elk/elasticsearch-hunspell-persistentvolume.yaml b/elk/elasticsearch-hunspell-persistentvolume.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: elasticsearch-hunspell-pv-volume
+  labels:
+    type: local
+spec:
+  storageClassName: shared-storage
+  capacity:
+    storage: 10Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: /storage/data/elasticsearch/config/hunspell
diff --git a/elk/elasticsearch-hunspell-persistentvolumeclaim.yaml b/elk/elasticsearch-hunspell-persistentvolumeclaim.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: elasticsearch-hunspell-pv-claim
+spec:
+  storageClassName: shared-storage
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 3Gi
diff --git a/elk/elasticsearch-replicaset.yaml b/elk/elasticsearch-replicaset.yaml
diff --git a/elk/elasticsearch/elasticsearch.yml b/elk/elasticsearch/elasticsearch.yml
@@ -0,0 +1,3 @@
+cluster.name: "mxes-cluster"
+network.host: 0.0.0.0
+indices.analysis.hunspell.dictionary.lazy: false