Merge "Added ES cluster health check in SL block"
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 8191778..68fb0dd 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -792,18 +792,14 @@
// Install MongoDB for Alerta
if (salt.testTarget(master, 'I@mongodb:server')) {
- salt.enforceState(master, 'I@mongodb:server', 'mongodb')
- }
+ salt.enforceState(master, 'I@mongodb:server', 'mongodb.server')
- // Configure Alerta
- if (salt.testTarget(master, 'I@prometheus:alerta')) {
- salt.enforceState(master, 'I@docker:swarm and I@prometheus:alerta', 'prometheus.alerta')
+ // Initialize mongodb replica set
+ common.retry(5,20){
+ salt.enforceState(master, 'I@mongodb:server', 'mongodb.cluster')
+ }
}
- // Launch containers
- salt.enforceState(master, 'I@docker:swarm:role:master and I@prometheus:server', 'docker.client')
- salt.runSaltProcessStep(master, 'I@docker:swarm and I@prometheus:server', 'dockerng.ps')
-
//Install Telegraf
salt.enforceState(master, 'I@telegraf:agent or I@telegraf:remote_agent', 'telegraf')
@@ -848,11 +844,6 @@
salt.enforceState(master, 'I@influxdb:server', 'influxdb')
}
- //Install Prometheus LTS
- if (salt.testTarget(master, 'I@prometheus:relay')) {
- salt.enforceState(master, 'I@prometheus:relay', 'prometheus')
- }
-
// Install service for the log collection
if (salt.testTarget(master, 'I@fluentd:agent')) {
salt.enforceState(master, 'I@fluentd:agent', 'fluentd')
@@ -890,6 +881,15 @@
salt.enforceState(master, 'I@docker:swarm and I@prometheus:server', 'heka.remote_collector', true, false)
}
+ // Launch containers
+ salt.enforceState(master, 'I@docker:swarm:role:master and I@prometheus:server', 'docker.client')
+ salt.runSaltProcessStep(master, 'I@docker:swarm and I@prometheus:server', 'dockerng.ps')
+
+ //Install Prometheus LTS
+ if (salt.testTarget(master, 'I@prometheus:relay')) {
+ salt.enforceState(master, 'I@prometheus:relay', 'prometheus')
+ }
+
// Install sphinx server
if (salt.testTarget(master, 'I@sphinx:server')) {
salt.enforceState(master, 'I@sphinx:server', 'sphinx')