X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=monitor%2Fmonitoring.sh;h=9abe49d9fa68d6fcc3eaf24e9e03aecb28b5abfa;hb=742fc9ab94ede1187c9146e5336e28fe84d510c5;hp=8ad388a317e6075a394a2931a91d31633be13b7c;hpb=0d35befb107865b26c9cf2477fdded767e3eeb09;p=bottlenecks.git

diff --git a/monitor/monitoring.sh b/monitor/monitoring.sh
index 8ad388a3..9abe49d9 100644
--- a/monitor/monitoring.sh
+++ b/monitor/monitoring.sh
@@ -18,7 +18,7 @@ sudo docker run --name bottlenecks-node-exporter \
   -v "/sys:/host/sys:ro" \
   -v "/:/rootfs:ro" \
   --net="host" \
-  quay.io/prometheus/node-exporter \
+  quay.io/prometheus/node-exporter:v0.14.0 \
     -collector.procfs /host/proc \
     -collector.sysfs /host/sys \
     -collector.filesystem.ignored-mount-points "^/(sys|proc|dev|host|etc)($|/)"
@@ -28,21 +28,55 @@ sudo docker run --name bottlenecks-collectd -d \
   --privileged \
   -v ${MONITOR_CONFIG}:/etc/collectd:ro \
   -v /proc:/mnt/proc:ro \
-  fr3nd/collectd
+  fr3nd/collectd:5.5.0-1
 
 # Collectd-Exporter
 sudo docker run --name bottlenecks-collectd-exporter \
   -d -p 9103:9103 \
-  -p 25826:25826/udp prom/collectd-exporter \
+  -p 25826:25826/udp prom/collectd-exporter:0.3.1 \
   -collectd.listen-address=":25826"
 
 # Prometheus
 sudo docker run --name bottlenecks-prometheus \
   -d -p 9090:9090 \
   -v ${MONITOR_CONFIG}/prometheus.yaml:/etc/prometheus/prometheus.yml \
-  prom/prometheus
+  prom/prometheus:v1.7.1
 
-$ Grafana
+# Grafana
 sudo  docker run --name bottlenecks-grafana \
   -d -p 3000:3000 \
-  grafana/grafana
+  -v ${GRAFANA}/config/grafana.ini:/etc/grafana/grafana.ini \
+  grafana/grafana:4.5.0
+
+# Cadvisor
+sudo docker run \
+  --volume=/:/rootfs:ro \
+  --volume=/var/run:/var/run:rw \
+  --volume=/sys:/sys:ro \
+  --volume=/var/lib/docker/:/var/lib/docker:ro \
+  --volume=/dev/disk/:/dev/disk:ro \
+  --publish=8080:8080 \
+  --detach=true \
+  --name=cadvisor \
+  google/cadvisor:v0.25.0 \ -storage_driver=Prometheus
+
+# Configure IP Address in barometer client configuration
+python client_ip_configure.py barometer_client.conf
+
+# Configure IP Address in barometer server configuration
+python server_ip_configure.py barometer_collectd.conf
+
+# Automate Collectd Client
+python automate_collectd_client.py
+
+# Automate Cadvisor Client
+python automate_cadvisor_client.py
+
+# Automate Barometer installation for jump server
+bash ./barometer_install_script.sh
+
+# Automate Barometer installation for compute/controller nodes
+python barometer_automated_client_install.py
+
+# Automate Prometheus Datasource and Grafana Dashboard creation
+python automated_dashboard_datasource.py