Feature/1.23 compat

charts/lsdobserve/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: lsdobserve
-version: "1.0.83"
+version: "1.0.85"
 appVersion: "1.0.2"
 # Disabling kubeVersion because GKE is dumb
 # kubeVersion: ">=v1.11.0"
@@ -23,14 +23,17 @@ tillerVersion: ">=v3.2.1"
 
 dependencies:
 - name: prometheus
-  version: "13.7.0"
+  version: "15.1.1"
   repository: https://prometheus-community.github.io/helm-charts
 - name: prometheus-blackbox-exporter
-  version: "4.10.4"
+  version: "5.3.1"
   repository: https://prometheus-community.github.io/helm-charts
 - name: eck-operator
-  version: "1.3.1"
+  version: "1.9.1"
   repository: https://helm.elastic.co
 - name: grafana
-  version: "6.7.4"
+  version: "6.21.1"
   repository: https://grafana.github.io/helm-charts
+- name: logstash
+  version: "7.16.3"
+  repository: https://helm.elastic.co

charts/lsdobserve/README.md

@@ -10,9 +10,13 @@ helm repo update
 ### Install on Generic Kubernetes Cluster
 
 Basic installation
+
+Only run `kubectl scale sts lsdobserve-logstash --replicas=1` once elastic-post-setup has finished running
 ```
 helm show values lsdopen/lsdobserve > values.yaml
 helm install lsdobserve lsdopen/lsdobserve -n lsdobserve --create-namespace --values values.yaml ; helm upgrade lsdobserve lsdopen/lsdobserve -n lsdobserve --values values.yaml
+
+kubectl scale sts lsdobserve-logstash --replicas=1
 ```
 
 Install on GKE with Admin Password and Elastic disabled
@@ -38,11 +42,15 @@ helm install lsdobserve -n lsdobserve --create-namespace \
 ### Restricted Network Installation
 
 Simple installation
+
+Only run `kubectl scale sts lsdobserve-logstash --replicas=1` once elastic-post-setup has finished running
 ```
 helm dependency update .
 
 kubectl create ns lsdobserve
 helm install lsdobserve . -n lsdobserve --create-namespace --values values.yaml ; helm upgrade lsdobserve . -n lsdobserve --create-namespace --values values.yaml
+
+kubectl scale sts lsdobserve-logstash --replicas=1
 ```
 ## Test smtp details
 

charts/lsdobserve/elastic/lsdobserve-filebeat.bootstrap.k8s.json

@@ -0,0 +1,7 @@
+{
+  "aliases": {
+    "filebeat-7.10.2-k8s": {
+      "is_write_index": true
+    }
+  }
+}

charts/lsdobserve/elastic/lsdobserve-filebeat.bootstrap.lsdo.json

@@ -0,0 +1,7 @@
+{
+  "aliases": {
+    "filebeat-7.10.2-lsdo": {
+      "is_write_index": true
+    }
+  }
+}

charts/lsdobserve/elastic/lsdobserve-filebeat.bootstrap.project.json

@@ -0,0 +1,7 @@
+{
+  "aliases": {
+    "filebeat-7.10.2-project": {
+      "is_write_index": true
+    }
+  }
+}

charts/lsdobserve/elastic/lsdobserve-filebeat.ilm.policy.k8s.json

@@ -0,0 +1,26 @@
+{
+  "policy": {
+    "phases": {
+      "hot": {
+        "min_age": "0ms",
+        "actions": {
+          "rollover": {
+            "max_size": "20gb",
+            "max_age": "3d"
+          },
+          "set_priority": {
+            "priority": 100
+          }          
+        }
+      },
+      "delete": {
+        "min_age": "3d",
+        "actions": {
+          "delete": {
+            "delete_searchable_snapshot": true
+          }
+        }
+      }
+    }
+  }
+}

charts/lsdobserve/elastic/lsdobserve-filebeat.ilm.policy.lsdo.json

@@ -0,0 +1,26 @@
+{
+  "policy": {
+    "phases": {
+      "hot": {
+        "min_age": "0ms",
+        "actions": {
+          "rollover": {
+            "max_size": "20gb",
+            "max_age": "3d"
+          },
+          "set_priority": {
+            "priority": 100
+          }          
+        }
+      },
+      "delete": {
+        "min_age": "3d",
+        "actions": {
+          "delete": {
+            "delete_searchable_snapshot": true
+          }
+        }
+      }
+    }
+  }
+}

charts/lsdobserve/elastic/lsdobserve-filebeat.ilm.policy.project.json

@@ -0,0 +1,26 @@
+{
+  "policy": {
+    "phases": {
+      "hot": {
+        "min_age": "0ms",
+        "actions": {
+          "rollover": {
+            "max_size": "20gb",
+            "max_age": "7d"
+          },
+          "set_priority": {
+            "priority": 100
+          }          
+        }
+      },
+      "delete": {
+        "min_age": "7d",
+        "actions": {
+          "delete": {
+            "delete_searchable_snapshot": true
+          }
+        }
+      }
+    }
+  }
+}