rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix monitoring pvc issue 

https://github.com/rancher/rancher/issues/19608
This commit is contained in:
loganhz 2019-04-15 17:27:33 +08:00
parent 6d75ad47e6
commit a8ef7612de
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/monitoring/addon/components/enable-monitoring/component.js
View File

@ -17,7 +17,7 @@ const EXPOSED_OPTIONS = ['exporter-node.enabled', 'exporter-node.ports.metrics.p
'prometheus.persistence.size', 'prometheus.resources.core.requests.cpu', 'prometheus.persistence.size', 'prometheus.resources.core.requests.cpu',
'exporter-node.resources.limits.cpu', 'exporter-node.resources.limits.memory', 'exporter-node.resources.limits.cpu', 'exporter-node.resources.limits.memory',
'prometheus.resources.core.limits.cpu', 'prometheus.resources.core.requests.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_CPU = 100;
const NODE_EXPORTER_MEMORY = 30; const NODE_EXPORTER_MEMORY = 30;
const CLUSTER_CPU = 900; 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.limits.cpu'] = `${ get(this, 'limitsCpu') }m`;
answers['prometheus.resources.core.requests.memory'] = `${ get(this, 'requestsMemory') }Mi`; answers['prometheus.resources.core.requests.memory'] = `${ get(this, 'requestsMemory') }Mi`;
answers['prometheus.resources.core.limits.memory'] = `${ get(this, 'limitsMemory') }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) => { Object.keys(answers).filter((key) => key.startsWith('prometheus.nodeSelectors[') ).forEach((key) => {
delete answers[key] delete answers[key]
@ -284,6 +287,12 @@ export default Component.extend(ReservationCheck, {
}, },
updateConfig(answers) { 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'] ) { if ( answers['prometheus.resources.core.requests.cpu'] ) {
set(this, 'requestsCpu', convertToMillis(answers['prometheus.resources.core.requests.cpu'])); set(this, 'requestsCpu', convertToMillis(answers['prometheus.resources.core.requests.cpu']));
set(this, 'preRequestsCpu', get(this, 'requestsCpu')); set(this, 'preRequestsCpu', get(this, 'requestsCpu'));