Skip to content

Commit 193ce09

Browse files
committed
K8S-111 Improved notification logic
1 parent 6b44b52 commit 193ce09

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

manifest.jps

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,13 @@ actions:
296296
- cmd[${nodes.k8sm.master.id}]: |-
297297
helm repo update
298298
helm install --name monitoring-prometheus --namespace kubernetes-monitoring stable/prometheus --set server.prefixURL=/prometheus --set server.baseURL=/prometheus
299-
kubectl -n kubernetes-monitoring wait --for=condition=Ready pod -l app=prometheus,component=server --timeout=300s || exit 1
299+
kubectl -n kubernetes-monitoring wait --for=condition=Ready pod -l app=prometheus,component=server --timeout=-1s
300300
helm fetch stable/grafana --untar
301301
for dash_name in "kubernetes-prometeus-dashboard" "kubernetes-rchakra3-dashboard" "kubernetes-vanniekerk-dashboard"; do
302302
wget "${baseUrl}/addons/monitoring/${dash_name}.json" -O "grafana/dashboards/${dash_name}.json"
303303
done
304304
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/.
305-
kubectl -n kubernetes-monitoring wait --for=condition=Ready pod -l app=grafana,release=monitoring-grafana --timeout=300s || exit 1
305+
kubectl -n kubernetes-monitoring wait --for=condition=Ready pod -l app=grafana,release=monitoring-grafana --timeout=-1s
306306
grafana_secret=$(kubectl get secret --namespace kubernetes-monitoring monitoring-grafana -o jsonpath='{.data.admin-password}' | base64 --decode ; echo)
307307
[ "${settings.ingress-controller}" == "HAProxy" ] && crypt_option="-1" || crypt_option="-apr1"
308308
kubectl create secret generic monitoring-prometheus --from-literal=auth="admin:$(openssl passwd ${crypt_option} ${grafana_secret})" --namespace=kubernetes-monitoring
@@ -327,9 +327,9 @@ actions:
327327
return:
328328
type: info
329329
message: ${globals.monitoring_success}
330-
- if (!${settings.monitoring:true}):
331-
jelastic.message.email.SendToUser:
332-
login: "${user.email}"
330+
- if (!${settings.monitoring:false}):
331+
message.email.send:
332+
to: "${user.email}"
333333
subject: Monitoring Tools Successfully Installed in ${env.name}
334334
body: |-
335335
Monitoring Tools installed in <b>${env.name}</b> Kubernetes Cluster: <br>
@@ -371,9 +371,9 @@ actions:
371371
return:
372372
type: info
373373
message: ${globals.jaeger_success}
374-
- if (!${settings.jaeger:true}):
375-
jelastic.message.email.SendToUser:
376-
login: "${user.email}"
374+
- if (!${settings.jaeger:false}):
375+
message.email.send:
376+
to: "${user.email}"
377377
subject: Jaeger Tracing Tools Successfully Installed in ${env.name}
378378
body: |-
379379
Jaeger Tracing Tools installed in <b>${env.name}</b> Kubernetes Cluster: <br>
@@ -489,8 +489,8 @@ addons:
489489
- else:
490490
- setGlobals:
491491
apiStatusMessage: disabled
492-
- jelastic.message.email.SendToUser:
493-
login: "${user.email}"
492+
- message.email.send:
493+
to: "${user.email}"
494494
subject: Remote API Access Successfully Updated in ${env.name}
495495
body: Remote API has been ${globals.apiStatusMessage}
496496

0 commit comments

Comments
 (0)