Add metricbeat to EFK stack for events

komljen · Jul 7, 2019 · ff35598 · ff35598
1 parent 79ab9d9
commit ff35598
Show file tree

Hide file tree

Showing 22 changed files with 109 additions and 57 deletions.
diff --git a/charts/alb-ingress-0.1.3.tgz b/charts/alb-ingress-0.1.3.tgz
diff --git a/charts/buzzfeed-sso-0.0.2.tgz b/charts/buzzfeed-sso-0.0.2.tgz
diff --git a/charts/contour-0.2.0.tgz b/charts/contour-0.2.0.tgz
diff --git a/charts/descheduler-0.2.1.tgz b/charts/descheduler-0.2.1.tgz
diff --git a/charts/devto-0.1.0.tgz b/charts/devto-0.1.0.tgz
diff --git a/charts/efk-0.4.0.tgz b/charts/efk-0.4.0.tgz
diff --git a/charts/elasticsearch-0.1.6.tgz b/charts/elasticsearch-0.1.6.tgz
diff --git a/charts/elasticsearch-operator-0.1.7.tgz b/charts/elasticsearch-operator-0.1.7.tgz
diff --git a/charts/event-forwarder-gelf-0.1.1.tgz b/charts/event-forwarder-gelf-0.1.1.tgz
diff --git a/charts/hpa-operator-0.0.6.tgz b/charts/hpa-operator-0.0.6.tgz
diff --git a/charts/index.yaml b/charts/index.yaml
diff --git a/charts/k8s-spot-rescheduler-0.3.0.tgz b/charts/k8s-spot-rescheduler-0.3.0.tgz
diff --git a/charts/kube-spot-termination-notice-handler-0.4.3.tgz b/charts/kube-spot-termination-notice-handler-0.4.3.tgz
diff --git a/charts/merge-ingress-0.2.tgz b/charts/merge-ingress-0.2.tgz
diff --git a/charts/metrics-server-0.0.5.tgz b/charts/metrics-server-0.0.5.tgz
diff --git a/efk/Chart.yaml b/efk/Chart.yaml
@@ -1,12 +1,15 @@
 name: efk
-version: 0.3.4
+version: 0.4.0
 appVersion: 6.4.2
 description: EFK stack
 keywords:
 - elasticsearch
 - kibana
 - fluent-bit
 - filebeat
+- metricbeat
+- events
+- logs
 maintainers:
 - name: komljen
   email: alen.komljen@live.com

diff --git a/efk/charts/elasticsearch-0.1.6.tgz b/efk/charts/elasticsearch-0.1.6.tgz
diff --git a/efk/charts/metricbeat-1.7.0.tgz b/efk/charts/metricbeat-1.7.0.tgz
diff --git a/efk/requirements.lock b/efk/requirements.lock
@@ -14,5 +14,8 @@ dependencies:
 - name: kibana
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 2.0.0
-digest: sha256:a900210e523dfd4109cb56ed188f28afdc7efb6ff7b73546655d0601f76da056
-generated: 2019-05-21T17:34:32.10322+02:00
+- name: metricbeat
+  repository: https://kubernetes-charts.storage.googleapis.com/
+  version: 1.7.0
+digest: sha256:98d3349733e5d702debea63eccfde0e774c3837472555e22e79096b41a0f37ec
+generated: 2019-07-07T13:09:11.430108+02:00
diff --git a/efk/requirements.yaml b/efk/requirements.yaml
@@ -17,3 +17,6 @@ dependencies:
 - name: kibana
   version: "2.0.0"
   repository: https://kubernetes-charts.storage.googleapis.com/
+- name: metricbeat
+  version: "1.7.0"
+  repository: https://kubernetes-charts.storage.googleapis.com/
diff --git a/efk/values.yaml b/efk/values.yaml
@@ -1,6 +1,6 @@
 # Default values for efk.
 
-# https://github.com/komljen/helm-charts/blob/master/kibana/values.yaml
+# https://github.com/helm/charts/blob/master/stable/kibana/values.yaml
 kibana:
   image:
     repository: "docker.elastic.co/kibana/kibana-oss"
@@ -51,7 +51,7 @@ elasticsearch:
         memory: 2048Mi
         cpu: '1'
 
-# https://github.com/kubernetes/charts/blob/master/stable/fluent-bit/values.yaml
+# https://github.com/helm/charts/blob/master/stable/fluent-bit/values.yaml
 fluent-bit:
   enabled: true
   image:
@@ -73,7 +73,7 @@ elasticsearch-curator:
       hosts:
         - elasticsearch-efk-cluster
 
-# https://github.com/kubernetes/charts/blob/master/stable/filebeat/values.yaml
+# https://github.com/helm/charts/blob/master/stable/filebeat/values.yaml
 filebeat:
   enabled: false
   config:
@@ -102,3 +102,26 @@ filebeat:
       hosts: ["http://elasticsearch-efk-cluster:9200"]
       index: "kubernetes_cluster-%{+yyyy.MM.dd}"
   privileged: true
+
+# https://github.com/helm/charts/blob/master/stable/metricbeat/values.yaml
+metricbeat:
+  enabled: false
+  daemonset:
+    enabled: false
+
+  deployment:
+    config:
+      setup.template.name: "kubernetes_events"
+      setup.template.pattern: "kubernetes_events-*"
+      output.elasticsearch:
+        hosts: ["http://elasticsearch-efk-cluster:9200"]
+        index: "kubernetes_events-%{[beat.version]}-%{+yyyy.MM.dd}"
+      output.file:
+        enabled: false
+    modules:
+      kubernetes:
+        enabled: true
+        config:
+          - module: kubernetes
+            metricsets:
+              - event
diff --git a/hpa-operator/charts/metrics-server-0.0.5.tgz b/hpa-operator/charts/metrics-server-0.0.5.tgz