aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2020-04-09 15:47:32 +0200
committerLoïc Hoguin <[email protected]>2020-04-09 15:47:32 +0200
commitf06317cd4a2de3f3c280fe787a92838760c02ceb (patch)
tree686332b60fc35d948d1dc544236cc3123ce4b38b
parent0ba0a1ceefbb44c78805f444ccb9b7445d0da81d (diff)
downloadci-f06317cd4a2de3f3c280fe787a92838760c02ceb.tar.gz
ci-f06317cd4a2de3f3c280fe787a92838760c02ceb.tar.bz2
ci-f06317cd4a2de3f3c280fe787a92838760c02ceb.zip
Tweak prometheus.sh
-rw-r--r--priv/grafana_prometheus_data_source.json2
-rwxr-xr-xprometheus.sh5
2 files changed, 2 insertions, 5 deletions
diff --git a/priv/grafana_prometheus_data_source.json b/priv/grafana_prometheus_data_source.json
index 3811d8b..2205869 100644
--- a/priv/grafana_prometheus_data_source.json
+++ b/priv/grafana_prometheus_data_source.json
@@ -2,7 +2,7 @@
"name": "Prometheus",
"type": "prometheus",
"access": "proxy",
- "url": "http://localhost:9090",
+ "url": "http://127.0.0.1:9090",
"basicAuth": false,
"isDefault": true,
"jsonData": {"timeInterval": "5s"},
diff --git a/prometheus.sh b/prometheus.sh
index 31f3d91..b5b0d94 100755
--- a/prometheus.sh
+++ b/prometheus.sh
@@ -38,10 +38,7 @@ lxc_do systemctl enable prometheus
lxc_restart
-until lxc_do curl http://admin:admin@localhost:3000/api/org
-do
- sleep 1
-done
+lxc_do /usr/bin/env sh -c "until curl http://admin:admin@localhost:3000/api/org ; do sleep 1 ; done"
echo
<$( cd "$( dirname "$0" )" && pwd )/priv/grafana_prometheus_data_source.json \