latest tiny fixes, works fine now

Author: ihorman

configs/settings.yaml

@@ -57,3 +57,5 @@ fields:
     inputType: hidden
     caption: Kubernetes Version
     default: v1.15.1
+
+

manifest.jps

@@ -45,21 +45,15 @@ onInstall:
   - remove-attr
   - if (${settings.monitoring:true}):
         - install_monitoring
-        - setGlobals:
-             monitoring_success: |
-                Enter [Prometheus dashboard](${env.url}prometheus/), [Prometheus AlertManager](${env.url}prometheus-alert/)
-                and [Grafana dashboard](${env.url}grafana/), using login "admin" and password:
-                
-                ```${globals.grafana_secret}``` 
-  
+
   - setGlobals:
-        default_success: |               
+        default_success: |
              Enter [Kubernetes dashboard](${globals.dashboardUrl}) or [Remote API Endpoint](${env.protocol}://${env.domain}/api/) using the Access Token:
 
              ```${globals.token}```
              Press **Open in Browser** to view a default web page of your application.
-             To bind a custom domain name with your Kubernetes cluster please refer to the steps described in Jelastic [documentation](https://docs.jelastic.com/custom-domains).        
-              
+             To bind a custom domain name with your Kubernetes cluster please refer to the steps described in Jelastic [documentation](https://docs.jelastic.com/custom-domains).
+
   - if ('${env.protocol}' == 'http'):
       - api: env.control.AddEndpoint
         nodeId: ${nodes.cp.master.id}
@@ -224,18 +218,25 @@ actions:
     cmd[*]: |-
       chattr -i -a /root/.bash_*
     user: root
-    
-    
+
+
   install_monitoring:
+  - log: '${globals.monitoring_installed}'
+  - if ('${globals.monitoring_installed}' == 'true'):
+        return:
+            type: info
+            message: ${globals.monitoring_success}
+            
   - cmd[${nodes.k8sm.master.id}]: |-
+      [ ! -f /root/monitoring_is_installed ] && {
       helm repo update
       helm install --name monitoring-prometheus --namespace kubernetes-monitoring stable/prometheus --set server.prefixURL=/prometheus --set server.baseURL=/prometheus
       while true; do kubectl get pods --field-selector=status.phase=Running -n kubernetes-monitoring | grep prometheus-server && break ; done
-      sleep 5
       helm fetch stable/grafana --untar
       for dash_name in "kubernetes-prometeus-dashboard" "kubernetes-rchakra3-dashboard" "kubernetes-vanniekerk-dashboard"; do
         wget "${baseUrl}/addons/monitoring/${dash_name}.json" -O "grafana/dashboards/${dash_name}.json"
       done
+      sleep 5
       helm install --name monitoring-grafana --namespace kubernetes-monitoring --set 'grafana\.ini'.server.root_url=${env.url}grafana -f ${baseUrl}/addons/monitoring/jelastic-values.yaml grafana/.
       while true; do kubectl get pods --field-selector=status.phase=Running -n kubernetes-monitoring | grep grafana && break ; done
       sleep 5
@@ -249,19 +250,30 @@ actions:
       dash_id=$(curl -sb grafana/grafana-jar.txt 'http://${env.domain}/grafana/api/search?mode=tree&query=Jelastic' | grep -Po '"id":(\d+)' | awk -F ':' '{print $2}')
       curl -X POST -b grafana/grafana-jar.txt "http://${env.domain}/grafana/api/user/stars/dashboard/${dash_id}"
       curl -X PUT -H 'Content-Type: application/json' -b grafana/grafana-jar.txt -d "{\"homeDashboardId\":${dash_id}}" "http://${env.domain}/grafana/api/org/preferences"
+      touch /root/monitoring_is_installed; } || echo "Already installed" ;
   - cmd[${nodes.k8sm.master.id}]: kubectl get secret --namespace kubernetes-monitoring monitoring-grafana -o jsonpath='{.data.admin-password}' | base64 --decode
   - setGlobals:
       grafana_secret: ${response.out}
+  - setGlobals:
+      monitoring_installed: true
+  - log: ${globals.monitoring_installed}
+      
+  - setGlobals:
+      monitoring_success: |
+          Enter [Prometheus dashboard](${env.url}prometheus/), [Prometheus AlertManager](${env.url}prometheus-alert/)
+          and [Grafana dashboard](${env.url}grafana/), using login "admin" and password:
+
+          ```${globals.grafana_secret}```
   - if (!${settings.monitoring:true}):
       return:
         type: info
-        message: /text/success-monitoring.md
+        message: ${globals.monitoring_success}
 
 addons:
 
   - id: conf-k8s-addon
     type: update
-    baseUrl: ${baseUrl}
+    baseUrl: https://raw.githubusercontent.com/jelastic-jps/kubernetes/v1.15.1
     name: Kubernetes Cluster Configuration
     description: Press "Remote API" to enable or disable remote access or "Upgrade" to initiate upgrade procedure.
     logo: /images/k8s-logo.png
@@ -289,8 +301,9 @@ addons:
         successText: Kubernetes Cluster has been successfully upgraded!
       - caption: Monitoring
         action: install_monitoring
-        loadingText: Installing...
-        confirmText: Do you want to install Kubernetes Cluster Monitoring tools?
+        confirmText: Monitoring will be configured, OK?
+
+        
     actions:
       upgrade:
         script: |
@@ -336,4 +349,3 @@ addons:
 
 success: ${globals.default_success:} + ${globals.monitoring_success:}
 
-