From a8ef7612ded90c5de502fc3fd344d4028c23a2fe Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Mon, 15 Apr 2019 17:27:33 +0800
Subject: [PATCH] Fix monitoring pvc issue

https://github.com/rancher/rancher/issues/19608
---
 .../addon/components/enable-monitoring/component.js   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/monitoring/addon/components/enable-monitoring/component.js b/lib/monitoring/addon/components/enable-monitoring/component.js
index 7271b64cc..f69397a2f 100644
--- a/lib/monitoring/addon/components/enable-monitoring/component.js
+++ b/lib/monitoring/addon/components/enable-monitoring/component.js
@@ -17,7 +17,7 @@ const EXPOSED_OPTIONS = ['exporter-node.enabled', 'exporter-node.ports.metrics.p
   'prometheus.persistence.size', 'prometheus.resources.core.requests.cpu',
   'exporter-node.resources.limits.cpu', 'exporter-node.resources.limits.memory',
   'prometheus.resources.core.limits.cpu', 'prometheus.resources.core.requests.memory',
-  'prometheus.resources.core.limits.memory'];
+  'prometheus.resources.core.limits.memory', 'prometheus.persistent.useReleaseName'];
 const NODE_EXPORTER_CPU = 100;
 const NODE_EXPORTER_MEMORY = 30;
 const CLUSTER_CPU = 900;
@@ -94,6 +94,9 @@ export default Component.extend(ReservationCheck, {
       answers['prometheus.resources.core.limits.cpu'] = `${ get(this, 'limitsCpu') }m`;
       answers['prometheus.resources.core.requests.memory'] = `${ get(this, 'requestsMemory') }Mi`;
       answers['prometheus.resources.core.limits.memory'] = `${ get(this, 'limitsMemory') }Mi`;
+      if ( !get(this, 'enabled') || get(this, 'useReleaseName') ) {
+        answers['prometheus.persistent.useReleaseName'] = 'true';
+      }
 
       Object.keys(answers).filter((key) => key.startsWith('prometheus.nodeSelectors[') ).forEach((key) => {
         delete answers[key]
@@ -284,6 +287,12 @@ export default Component.extend(ReservationCheck, {
   },
 
   updateConfig(answers) {
+    if ( answers['prometheus.persistent.useReleaseName'] ) {
+      set(this, 'useReleaseName', answers['prometheus.persistent.useReleaseName']);
+    } else {
+      set(this, 'useReleaseName', null);
+    }
+
     if ( answers['prometheus.resources.core.requests.cpu'] ) {
       set(this, 'requestsCpu', convertToMillis(answers['prometheus.resources.core.requests.cpu']));
       set(this, 'preRequestsCpu', get(this, 'requestsCpu'));