Restructure monitoring scripts

[bottlenecks.git] / monitor / dispatch / automate_collectd_client.py

diff --git a/monitor/automate_collectd_client.py b/monitor/dispatch/automate_collectd_client.py
similarity index 81%
rename from monitor/automate_collectd_client.py
rename to monitor/dispatch/automate_collectd_client.py
index 8358cfc..c4346e5 100644 (file)
--- a/monitor/automate_collectd_client.py
+++ b/monitor/dispatch/automate_collectd_client.py
@@ -13,7 +13,7 @@ import utils.infra_setup.passwordless_SSH.ssh as ssh
 
 logger = logging.getLogger(__name__)
 collectd_client_install_sh =\
-    "/home/opnfv/bottlenecks/monitor/install_collectd_client.sh"
+    "/home/opnfv/bottlenecks/monitor/dispatch/install_collectd_client.sh"
 collectd_client_install_conf =\
     "/home/opnfv/bottlenecks/monitor/config/collectd_client.conf"
 
@@ -30,16 +30,19 @@ with open('/tmp/pod.yaml') as f:
                     "cd /etc && mkdir collectd_config"
                 )
                 if status:
-                    raise Exception("Command failed with non-zero status.")
+                    print Exception(
+                        "Command: \"mkdir collectd_config\" failed.")
                     logger.info(stdout.splitlines())
                 with open(collectd_client_install_sh) as stdin_file:
                     ssh_d.run("cat > /etc/collectd_config/install.sh",
                               stdin=stdin_file)
                 with open(collectd_client_install_conf) as stdin_file:
-                    ssh_d.run("cat > /etc/collectd_config/collectd.conf",
-                              stdin=stdin_file)
+                    ssh_d.run(
+                        "cat > /etc/collectd_config/collectd_client.conf",
+                        stdin=stdin_file
+                    )
                 status, stdout, stderr = ssh_d.execute(
-                    "sudo apt-get install docker.io"
+                    "sudo apt-get install -y docker.io"
                 )
                 if status:
                     raise Exception("Command for installing docker failed.")