From b8dcdc89d3286fa189202fb2cb73c703ee44a29d Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 2 Sep 2020 15:05:57 +0100
Subject: [PATCH] Enabled scraping etcd

---
 charts/kubezero-metrics/Chart.yaml  |  4 ++--
 charts/kubezero-metrics/values.yaml |  6 ++++--
 docs/misc.md                        | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 docs/misc.md

diff --git a/charts/kubezero-metrics/Chart.yaml b/charts/kubezero-metrics/Chart.yaml
index d34a0ae2..d2c2a90a 100644
--- a/charts/kubezero-metrics/Chart.yaml
+++ b/charts/kubezero-metrics/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-metrics
 description: KubeZero Umbrella Chart for prometheus-operator
 type: application
-version: 0.1.3
+version: 0.1.4
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
@@ -16,7 +16,7 @@ dependencies:
     version: ">= 0.1.3"
     repository: https://zero-down-time.github.io/kubezero/
   - name: prometheus-operator
-    version: 9.3.0
+    version: 9.3.1
     repository: https://kubernetes-charts.storage.googleapis.com/
   - name: prometheus-adapter
     version: 2.5.0
diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml
index 56b485bd..9e5bb4b0 100644
--- a/charts/kubezero-metrics/values.yaml
+++ b/charts/kubezero-metrics/values.yaml
@@ -27,9 +27,11 @@ prometheus-operator:
   kubeProxy:
     enabled: true
 
-  # Disabled until we figure out how to scrape etcd with ssl client certs
   kubeEtcd:
-    enabled: false
+    enabled: true
+    service:
+      port: 2381
+      targetPort: 2381
 
   kubeControllerManager:
     enabled: true
diff --git a/docs/misc.md b/docs/misc.md
new file mode 100644
index 00000000..8eecdf24
--- /dev/null
+++ b/docs/misc.md
@@ -0,0 +1,26 @@
+## Security - Todo
+- https://github.com/freach/kubernetes-security-best-practice
+- https://github.com/aquasecurity/kube-bench
+- https://kubernetes.io/docs/tasks/debug-application-cluster/audit/
+- https://kubernetes.io/docs/tasks/debug-application-cluster/falco/
+
+## Performance - Todo
+- https://kubernetes.io/docs/tasks/administer-cluster/limit-storage-consumption/
+
+- Set priorityclasses and proper CPU/MEM limits for core pods like api-server etc. as we host additional services on the master nodes which might affect these critical systems
+  see: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
+
+## Storage - Todo
+- OpenSource S3 - https://min.io/
+- LinStore - DRDB for K8s - https://vitobotta.com/2020/01/04/linstor-storage-the-kubernetes-way/, https://github.com/kvaps/kube-linstor, https://github.com/piraeusdatastore/piraeus
+- ChubaoFS - CephFS competitor
+
+# Monitoring
+- https://github.com/cloudworkz/kube-eagle
+
+## Cleanup - Todo
+Something along the lines of https://github.com/onfido/k8s-cleanup which doesnt work as is
+
+## Resources
+- https://docs.google.com/spreadsheets/d/1WPHt0gsb7adVzY3eviMK2W8LejV0I5m_Zpc8tMzl_2w/edit#gid=0
+- https://github.com/ishantanu/awesome-kubectl-plugins