From 9dd8641c9470f8ba62189832f778f7475ba20a8a Mon Sep 17 00:00:00 2001
From: "d.pasquali" <d.pasquali@reply.it>
Date: Mon, 26 Feb 2018 15:13:58 +0100
Subject: [PATCH] fix ret value for status

---
 ansible/test-service.sh                       |  6 ++-
 .../data/pasquali/controller/Controller.scala |  2 +
 .../pasquali/engine/AnsibleConnector.scala    | 51 ++-----------------
 3 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/ansible/test-service.sh b/ansible/test-service.sh
index 89ac5b0..c53cdd2 100644
--- a/ansible/test-service.sh
+++ b/ansible/test-service.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
-sudo ansible-playbook -i "$1," ansible/test-service.yml \
+base=`dirname $0`
+
+sudo ansible-playbook -i "$1," "$base/test-service.yml" \
 -e 'host_key_checking=False' \
 --extra-vars="{SERVICE: [$2]}" \
---private-key=/path/to/rsa/key \
+--private-key=key \
 -e 'ansible_ssh_user=user' \
\ No newline at end of file
diff --git a/src/main/scala/it/reply/data/pasquali/controller/Controller.scala b/src/main/scala/it/reply/data/pasquali/controller/Controller.scala
index 02c447e..dc2a71d 100644
--- a/src/main/scala/it/reply/data/pasquali/controller/Controller.scala
+++ b/src/main/scala/it/reply/data/pasquali/controller/Controller.scala
@@ -69,6 +69,8 @@ class Controller extends ScalatraServlet with FlashMapSupport with ScalateSuppor
     rr += s"node_exporter on localhost state : ${if(stats(2)) "running" else "stop :("}"
     rr += s"grafana on localhost state : ${if(stats(3)) "running" else "stop :("}"
     rr += s"pushgateway on localhost state : ${if(stats(4)) "running" else "stop :("}"
+
+    rr
   }
 
   get("/service/status/:machine/:service") {
diff --git a/src/main/scala/it/reply/data/pasquali/engine/AnsibleConnector.scala b/src/main/scala/it/reply/data/pasquali/engine/AnsibleConnector.scala
index e124391..2f33d3f 100644
--- a/src/main/scala/it/reply/data/pasquali/engine/AnsibleConnector.scala
+++ b/src/main/scala/it/reply/data/pasquali/engine/AnsibleConnector.scala
@@ -17,14 +17,6 @@ case class AnsibleConnector(ansibleHome : String,
 
     logger.info(" .......................... ANSIBLE PING")
 
-    val query = s"""ansible -i '$machineAddress,' all """ +
-                   s"""--private-key=$SSHKeyFile """ +
-                   s"""-e 'ansible_ssh_user=$ansibleSSHUser' """ +
-                   s"""-e 'host_key_checking=False' """ +
-                   s"""-m ping"""
-
-    logger.info(s" .......................... ANSIBLE COMMAND $query")
-
     var res =
       s"""ansible -i '$machineAddress,' all """ +
         s"""--private-key=$SSHKeyFile """ +
@@ -37,18 +29,10 @@ case class AnsibleConnector(ansibleHome : String,
 
   def pingMultiple(addrs : Array[String]) : mutable.ArrayBuffer[Boolean] = {
 
-    var targets = ""
-    for(a <- addrs) targets += a+","
-
     logger.info(" .......................... ANSIBLE PING")
 
-    val query = s"""ansible -i '$targets' all """ +
-      s"""--private-key=$SSHKeyFile """ +
-      s"""-e 'ansible_ssh_user=$ansibleSSHUser' """ +
-      s"""-e 'host_key_checking=False' """ +
-      s"""-m ping"""
-
-    logger.info(s" .......................... ANSIBLE COMMAND $query")
+    var targets = ""
+    for(a <- addrs) targets += a+","
 
     var res =
       s"""ansible -i '$targets,' all """ +
@@ -78,15 +62,7 @@ case class AnsibleConnector(ansibleHome : String,
 
     logger.info(" .......................... ANSIBLE PING")
 
-    val query = s"""ansible -i '$targets' all """ +
-      s"""--private-key=$SSHKeyFile """ +
-      s"""-e 'ansible_ssh_user=$ansibleSSHUser' """ +
-      s"""-e 'host_key_checking=False' """ +
-      s"""-m ping"""
-
-    logger.info(s" .......................... ANSIBLE COMMAND $query")
-
-    var res = s"""ansible/ping.sh $targets""" !!
+    var res = s"""/opt/monitoring/ping.sh $targets""" !!
 
     logger.info(res)
 
@@ -108,16 +84,6 @@ case class AnsibleConnector(ansibleHome : String,
 
     logger.info(" .......................... ANSIBLE CHECK SERVICE")
 
-    val query = s"""ansible-playbook -i '$machineAddress,' all """ +
-      s"""--private-key=$SSHKeyFile """ +
-      s"""ansible/test-service.yml """+
-      s"""-e 'ansible_ssh_user=$ansibleSSHUser' """ +
-      s"""-e 'host_key_checking=False' """ +
-      s"""--extra-vars "service_pretty=$service service=$service" """ +
-      s"""| tail -n 2 """
-
-    logger.info(s" .......................... ANSIBLE COMMAND $query")
-
     var res = s"""ansible-playbook -i '$machineAddress,' all """ +
       s"""--private-key=$SSHKeyFile """ +
       s"""./ansible/test-service.yml """+
@@ -141,15 +107,7 @@ case class AnsibleConnector(ansibleHome : String,
 
     logger.info(" .......................... ANSIBLE CHECK SERVICE")
 
-    val query = s"""sudo ansible-playbook -i "$machineAddress," test.yml \\""" +
-    s"""-e 'host_key_checking=False' \\""" +
-    s"""--extra-vars="{SERVICE: [$targets]}" \\""" +
-    s"""--private-key=/path/to/rsa/key \\""" +
-    s"""-e 'ansible_ssh_user=user' """
-
-    logger.info(s" .......................... ANSIBLE COMMAND $query")
-
-    var res = s"""ansible/test-service.sh $machineAddress $targets""" !!
+    var res = s"""/opt/monitoring/test-service.sh $machineAddress $targets""" !!
 
     logger.info(res)
 
@@ -163,7 +121,6 @@ case class AnsibleConnector(ansibleHome : String,
     status
   }
 
-
   def getAnsibleRunResult(lastLine : String) : AnsibleResult = {
 
     val arr = lastLine.split(" ").filter(el => el != "" && el != ":")