Change-Id: Ifb45abae0c8a7716addbd62d340423f1c1e44c03
Issue-ID: INT-1926
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
 ---
 k8s_volumes:
-  - name: kube-prometheus
+  - name: kube-prometheus-prometheus
     capacity: "6Gi"
-    path_prefix: "{{ nfs_mount_path }}"
+    path_prefix: "{{ nfs_mount_path }}/kube-prometheus"
     owner: 1000  # derived from prometheus.prometheusSpec.securityContext.runAsUser
     group: 2000  # derived from prometheus.prometheusSpec.securityContext.fsGroup
+  - name: kube-prometheus-grafana
+    capacity: "4Gi"
+    path_prefix: "{{ nfs_mount_path }}/kube-prometheus"
 
   helm_values:
     grafana:
       adminPassword: admin
+      persistence:
+        type: pvc
+        enabled: true
+        storageClassName: kube-prometheus-grafana
+        accessModes:
+          - ReadWriteOnce
+        size: 4Gi
     prometheus:
       prometheusSpec:
         scrapeInterval: 60s
           disableMountSubPath: true
           volumeClaimTemplate:
             spec:
-              storageClassName: kube-prometheus
+              storageClassName: kube-prometheus-prometheus
               accessModes: ["ReadWriteOnce"]
               resources:
                 requests: