From ded92b91de46fb52d832f7009c3939176f139be6 Mon Sep 17 00:00:00 2001
From: Junwei Zhao <wahyd4@gmail.com>
Date: Tue, 22 Dec 2020 16:14:09 +1100
Subject: [PATCH] =?UTF-8?q?update=20prometheus=20which=20caused=20me=20los?=
 =?UTF-8?q?t=20whole=20prometheus=20=F0=9F=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apply.sh               |  2 +-
 datadog-values.yaml    |  2 +-
 prometheus-pv.yml      | 64 ++++--------------------------------------
 prometheus-values.yaml | 19 ++++++-------
 4 files changed, 16 insertions(+), 71 deletions(-)

diff --git a/apply.sh b/apply.sh
index c91c3c5..2ab32a0 100755
--- a/apply.sh
+++ b/apply.sh
@@ -10,7 +10,7 @@ kubectl -n kube-system apply -f https://raw.githubusercontent.com/coreos/flannel
 
 k apply -f prometheus-pv.yml -n default
 
-helm upgrade --install prometheus -n default -f prometheus-values.yaml stable/prometheus-operator
+helm upgrade --install prometheus -n default -f prometheus-values.yaml prometheus-community/kube-prometheus-stack
 
 k create namespace nginx-ingress
 
diff --git a/datadog-values.yaml b/datadog-values.yaml
index ea90219..52d6438 100644
--- a/datadog-values.yaml
+++ b/datadog-values.yaml
@@ -382,7 +382,7 @@ clusterAgent:
   # clusterAgent.replicas -- Specify the of cluster agent replicas, if > 1 it allow the cluster agent to work in HA mode.
   replicas: 1
 
-  ## Provide Cluster Agent Deployment pod(s) RBAC configuration
+  ## Provide Cluster Agent Deployment pod(s) media configuration
   rbac:
     # clusterAgent.rbac.create -- If true, create & use RBAC resources
     create: true
diff --git a/prometheus-pv.yml b/prometheus-pv.yml
index 841601a..6551f48 100644
--- a/prometheus-pv.yml
+++ b/prometheus-pv.yml
@@ -1,61 +1,4 @@
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: manual
-provisioner: kubernetes.io/no-provisioner
-volumeBindingMode: WaitForFirstConsumer
 
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: grafana-pv
-  labels:
-    type: local
-spec:
-  storageClassName: manual
-  persistentVolumeReclaimPolicy: Recycle
-  capacity:
-    storage: 10Gi
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: "/mnt/grafana-data"
-
----
-
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: grafana-pvc
-spec:
-  storageClassName: manual
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 10Gi
-
----
-
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: prometheus-pv
-  labels:
-    type: local
-spec:
-  storageClassName: manual
-  persistentVolumeReclaimPolicy: Recycle
-  capacity:
-    storage: 50Gi
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: "/mnt/prometheus-data"
-
----
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -89,11 +32,14 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: prometheus-nfs
+  labels:
+    nfs: "true"
 spec:
+  storageClassName: "nfs"
   capacity:
     storage: 100Gi
   accessModes:
-    - ReadWriteMany
+    - ReadWriteOnce
   nfs:
     server: 192.168.1.4
-    path: "/prometheus-data"
+    path: "/prometheus"
diff --git a/prometheus-values.yaml b/prometheus-values.yaml
index bb59865..ef15d9d 100644
--- a/prometheus-values.yaml
+++ b/prometheus-values.yaml
@@ -1,8 +1,6 @@
 prometheusOperator:
   tls:
     enabled: false
-  nodeSelector:
-    ip: 192.168.1.2
   securityContext:
     runAsGroup: 1000
     fsGroup: 1000
@@ -15,22 +13,25 @@ prometheusOperator:
 #       cpu: 1300m
 #       memory: 1500Mi
 prometheus:
+  server:
+    extraFlags:
+      - storage.local.dirty
+      - web.enable-lifecycle
   serviceMonitorNamespaceSelector:
     matchLabels:
       release: prometheus
   prometheusSpec:
-    nodeSelector:
-      ip: 192.168.1.2
     retentionSize: 100GiB
-    retention: 1y
-    image:
-      tag: v2.19.2
+    retention: 2y
     serviceMonitorSelectorNilUsesHelmValues: false
     storageSpec:
       volumeClaimTemplate:
         spec:
-          storageClassName: manual
+          selector:
+            matchLabels:
+              nfs: "true"
           accessModes: ["ReadWriteOnce"]
+          storageClassName: "nfs"
           resources:
             requests:
               storage: 100Gi
@@ -52,8 +53,6 @@ prometheus:
       matchLabels:
         release: prometheus
 grafana:
-  image:
-    tag: 7.0.1
   persistence:
     enabled: true
     storageClassName: manual