diff --git a/roles/alertmanager/defaults/main.yml b/roles/alertmanager/defaults/main.yml index 5f06730c..04a45127 100644 --- a/roles/alertmanager/defaults/main.yml +++ b/roles/alertmanager/defaults/main.yml @@ -55,7 +55,7 @@ alertmanager_cluster: # listen-address: "{{ ansible_default_ipv4.address }}:6783" # peers: # - "{{ ansible_default_ipv4.address }}:6783" -# - "demo.cloudalchemy.org:6783" +# - "alertmanager.demo.do.prometheus.io:6783" alertmanager_receivers: [] # alertmanager_receivers: diff --git a/roles/alertmanager/molecule/alternative/converge.yml b/roles/alertmanager/molecule/alternative/converge.yml index 59691dcb..638a4a9e 100644 --- a/roles/alertmanager/molecule/alternative/converge.yml +++ b/roles/alertmanager/molecule/alternative/converge.yml @@ -32,4 +32,4 @@ listen-address: "127.0.0.1:6783" peers: - "127.0.0.1:6783" - - "demo.cloudalchemy.org:6783" + - "alertmanager.demo.do.prometheus.io:6783" diff --git a/roles/blackbox_exporter/README.md b/roles/blackbox_exporter/README.md index 83a8a267..00e516da 100644 --- a/roles/blackbox_exporter/README.md +++ b/roles/blackbox_exporter/README.md @@ -31,7 +31,7 @@ All variables which can be overridden are stored in [defaults/main.yml](defaults - hosts: all become: true roles: - - cloudalchemy.blackbox-exporter + - prometheus.prometheus.blackbox-exporter ``` ### Demo site diff --git a/roles/node_exporter/README.md b/roles/node_exporter/README.md index 1c9852f6..72bd8bac 100644 --- a/roles/node_exporter/README.md +++ b/roles/node_exporter/README.md @@ -2,10 +2,6 @@ # Ansible Role: node exporter -## Warning - -Due to limitations of galaxy.ansible.com we had to move the role to https://galaxy.ansible.com/cloudalchemy/node_exporter and use `_` instead of `-` in role name. This is a breaking change and unfortunately, it affects all versions of node_exporter role as ansible galaxy doesn't offer any form of redirection. We are sorry for the inconvenience. - ## Description Deploy prometheus [node exporter](https://github.com/prometheus/node_exporter) using ansible. @@ -43,7 +39,7 @@ Use it in a playbook as follows: ```yaml - hosts: all roles: - - cloudalchemy.node_exporter + - prometheus.prometheus.node_exporter ``` ### TLS config @@ -66,7 +62,7 @@ Before running node_exporter role, the user needs to provision their own certifi privatekey_path: /etc/node_exporter/tls.key provider: selfsigned roles: - - cloudalchemy.node_exporter + - prometheus.prometheus.node_exporter vars: node_exporter_tls_server_config: cert_file: /etc/node_exporter/tls.cert diff --git a/roles/prometheus/README.md b/roles/prometheus/README.md index 8017b1c8..14566bfc 100644 --- a/roles/prometheus/README.md +++ b/roles/prometheus/README.md @@ -98,13 +98,13 @@ prometheus_scrape_configs: --- - hosts: all roles: - - cloudalchemy.prometheus + - prometheus.prometheus.prometheus vars: prometheus_targets: node: - targets: - localhost:9100 - - demo.cloudalchemy.org:9100 + - node.demo.do.prometheus.io labels: env: demosite ``` diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml index 9aa701ba..ea60b6e3 100644 --- a/roles/prometheus/defaults/main.yml +++ b/roles/prometheus/defaults/main.yml @@ -58,7 +58,7 @@ prometheus_remote_write: [] prometheus_remote_read: [] # prometheus_remote_read: -# - url: https://demo.cloudalchemy.org:9201/read +# - url: https://prometheus.demo.do.prometheus.io:9201/read # basic_auth: # password: FOO diff --git a/roles/prometheus/meta/argument_specs.yml b/roles/prometheus/meta/argument_specs.yml index e0883ecb..0a4a6c62 100644 --- a/roles/prometheus/meta/argument_specs.yml +++ b/roles/prometheus/meta/argument_specs.yml @@ -96,8 +96,7 @@ argument_specs: environment: "{{ ansible_fqdn | default(ansible_host) | default(inventory_hostname) }}" prometheus_targets: description: - - "Targets which will be scraped. Better example is provided in our - L(demo site,https://github.com/cloudalchemy/demo-site/blob/2a8a56fc10ce613d8b08dc8623230dace6704f9a/group_vars/all/vars#L8)" + - "Targets which will be scraped." type: "dict" elements: "str" prometheus_scrape_configs: diff --git a/roles/prometheus/molecule/alternative/converge.yml b/roles/prometheus/molecule/alternative/converge.yml index 98104385..7a6d2003 100644 --- a/roles/prometheus/molecule/alternative/converge.yml +++ b/roles/prometheus/molecule/alternative/converge.yml @@ -37,27 +37,27 @@ scrape_timeout: 2s evaluation_interval: 10s prometheus_remote_write: - - url: http://influx.cloudalchemy.org:8086/api/v1/prom/write?db=test + - url: http://influx.example.org:8086/api/v1/prom/write?db=test basic_auth: username: prometheus password: SuperSecret prometheus_remote_read: - - url: http://influx.cloudalchemy.org:8086/api/v1/prom/read?db=cloudalchemy + - url: http://influx.example.org:8086/api/v1/prom/read?db=demo prometheus_external_labels: environment: "alternative" prometheus_targets: node: - targets: - - demo.cloudalchemy.org:9100 - - influx.cloudalchemy.org:9100 + - node.demo.do.prometheus.io + - influx.example.org:9100 labels: - env: cloudalchemy + env: demo docker: - targets: - - demo.cloudalchemy.org:8080 - - influx.cloudalchemy.org:8080 + - demo.do.prometheus.io:8080 + - influx.example.org:8080 labels: - env: cloudalchemy + env: demo prometheus_scrape_configs: - job_name: "prometheus" metrics_path: "{{ prometheus_metrics_path }}" @@ -78,8 +78,8 @@ module: [http_2xx] static_configs: - targets: - - http://demo.cloudalchemy.org:9100 - - http://influx.cloudalchemy.org:9100 + - http://node.demo.do.prometheus.io + - http://influx.example.org:9100 relabel_configs: - source_labels: [__address__] target_label: __param_target