diff --git a/README.md b/README.md index 7e29ad2..1f17a3d 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Where gathering.org is the node you want to gather metrics from. SECRET_USERSFILE_VERSION=v1 ``` - Generate userslist with httpasswd hashed password - `abra app secret insert traefik.gathering.org userslist v1 'admin:'` + `abra app secret insert traefik.gathering.org usersfile v1 'admin:'` make sure there is no whitespace in between `admin:`, it seems to break stuff... - `abra app deploy -f traefik` 1. `abra app new monitoring-ng` @@ -58,12 +58,12 @@ Where gathering.org is the node you want to gather metrics from. - `abra app new monitoring-ng` - `abra app config monitoring.example.org` Uncomment all the stuff - - `abra app secret insert monitoring.example.org basic_auth v1 ` + - `abra app secret insert monitoring.example.org basic_auth_admin_password v1 ` this needs the plaintext traefik basic-auth secret, not the hashed one! - `abra app secret ls monitoring.example.org` - `abra app deploy monitoring.example.org` 1. add scrape config to prometheus - - `abra app cmd monitoring.example.org prometheus gathering.org` + - `abra app cmd monitoring.example.org prometheus add_node gathering.org` - or manually ``` cp scrape-config.example.yml gathering.org.yml diff --git a/abra.sh b/abra.sh index 73d63ae..0faaa7b 100644 --- a/abra.sh +++ b/abra.sh @@ -12,7 +12,6 @@ export PROMETHEUS_YML_VERSION=v2 # creates a default prometheus scrape config for a given node add_node(){ name=$1 - add_domain "$name" "$name:8082" add_domain "$name" "node.monitoring.$name" add_domain "$name" "cadvisor.monitoring.$name" cat "/prometheus/scrape_configs/$name.yml" diff --git a/scrape-config.example.yml b/scrape-config.example.yml index d2e7a55..58c06a7 100644 --- a/scrape-config.example.yml +++ b/scrape-config.example.yml @@ -1,4 +1,3 @@ - targets: - - 'example.org:8082' - 'node.monitoring.example.org' - 'cadvisor.monitoring.example.org'