summaryrefslogtreecommitdiffstats
path: root/monitor/monitoring.sh
diff options
context:
space:
mode:
authorYang Yu <Gabriel.yuyang@huawei.com>2018-05-07 22:23:29 +0800
committerYang Yu <Gabriel.yuyang@huawei.com>2018-05-10 21:58:22 +0800
commit8d5e2fff2f9800942cf7f2c8a15b648ba3c76a16 (patch)
treed8993bd3e8b49cd1b3795dca9950967741ce7b0e /monitor/monitoring.sh
parentcb67313c1e14b6eca057bdfc7722bc11506b7a2a (diff)
Add/modify the Grafana Dashboard
Adding/modify metrics and structure of dashboard for Long Duration Test Change-Id: I4d1f169b7aa1e0f906e09fae13010ad3b8b49038 Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com>
Diffstat (limited to 'monitor/monitoring.sh')
-rw-r--r--monitor/monitoring.sh23
1 files changed, 12 insertions, 11 deletions
diff --git a/monitor/monitoring.sh b/monitor/monitoring.sh
index b42126b7..524958a6 100644
--- a/monitor/monitoring.sh
+++ b/monitor/monitoring.sh
@@ -15,16 +15,16 @@ DISPATCH="/home/opnfv/bottlenecks/monitor/dispatch"
# INSTALL GRAFANA + PROMETHEUS + CADVISOR + BAROMETER on the JUMPERSERVER
# # Node-Exporter
-# sudo docker run --name bottlenecks-node-exporter \
-# -d -p 9100:9100 \
-# -v "/proc:/host/proc:ro" \
-# -v "/sys:/host/sys:ro" \
-# -v "/:/rootfs:ro" \
-# --net="host" \
-# 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)($|/)"
+sudo docker run --name bottlenecks-node-exporter \
+ -d -p 9100:9100 \
+ -v "/proc:/host/proc:ro" \
+ -v "/sys:/host/sys:ro" \
+ -v "/:/rootfs:ro" \
+ --net="host" \
+ 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)($|/)"
# # Collectd
# # Configure IP Address in collectd server configuration
@@ -58,6 +58,7 @@ sudo docker run --name bottlenecks-grafana \
# Automate Prometheus Datasource and Grafana Dashboard creation
set -e
+sleep 5
python dashboard/automated_dashboard_datasource.py
set +e
@@ -76,7 +77,7 @@ sudo docker run \
set -e
# Barometer
# Configure IP Address in barometer server configuration
-sleep 10
+sleep 5
python ${DISPATCH}/server_ip_configure.py ${MONITOR_CONFIG}/barometer_server.conf
set +e