diff options
Diffstat (limited to 'monitor')
-rw-r--r-- | monitor/monitoring.sh | 5 | ||||
-rw-r--r-- | monitor/uninstall.py | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/monitor/monitoring.sh b/monitor/monitoring.sh index 89750614..758f77ec 100644 --- a/monitor/monitoring.sh +++ b/monitor/monitoring.sh @@ -52,7 +52,7 @@ while [[ $# > 0 ]] INSTALLER_TYPE="$2" shift ;; - -i|--openstack-env) + -o|--openstack-env) OPENSTACK_ENV="$2" shift ;; @@ -104,7 +104,6 @@ sudo docker run --name bottlenecks-node-exporter \ -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 \ @@ -114,7 +113,7 @@ sudo docker run --name bottlenecks-node-exporter \ sudo docker run --name bottlenecks-openstack-exporter \ -v /tmp:/tmp \ -p 9104:9104 --env-file ${OPENSTACK_ENV} \ - -d gabrielyuyang/att-prometheus-openstack-exporter:latest + -d gabrielyuyang/openstack-exporter:1.0 # Grafana sudo docker run --name bottlenecks-grafana \ diff --git a/monitor/uninstall.py b/monitor/uninstall.py index 3a9cf0c7..26351722 100644 --- a/monitor/uninstall.py +++ b/monitor/uninstall.py @@ -50,3 +50,4 @@ local_del_docker('cadvisor') local_del_docker('barometer') local_del_docker('grafana') local_del_docker('collectd') +local_del_docker('openstack-exporter') |