diff options
| -rw-r--r-- | chaos-at-home/ch-mimas.yml | 4 | ||||
| -rw-r--r-- | chaos-at-home/ch-pan.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mimas.yml | 18 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mon.yml | 7 | ||||
| -rw-r--r-- | inventory/host_vars/ch-pan.yml | 15 | ||||
| -rw-r--r-- | inventory/hosts.ini | 2 |
6 files changed, 43 insertions, 7 deletions
diff --git a/chaos-at-home/ch-mimas.yml b/chaos-at-home/ch-mimas.yml index a07f2e18..db661b0a 100644 --- a/chaos-at-home/ch-mimas.yml +++ b/chaos-at-home/ch-mimas.yml @@ -6,8 +6,12 @@ - role: core/base - role: core/sshd/base - role: core/zsh + - role: core/ntp - name: Payload Setup hosts: ch-mimas roles: - role: network/bind + - role: apt-repo/spreadspace + - role: nginx/base + - role: monitoring/prometheus/exporter diff --git a/chaos-at-home/ch-pan.yml b/chaos-at-home/ch-pan.yml index 906699bd..4c65b77f 100644 --- a/chaos-at-home/ch-pan.yml +++ b/chaos-at-home/ch-pan.yml @@ -6,8 +6,12 @@ - role: core/base - role: core/sshd/base - role: core/zsh + - role: core/ntp - name: Payload Setup hosts: ch-pan roles: - role: network/bind + - role: apt-repo/spreadspace + - role: nginx/base + - role: monitoring/prometheus/exporter diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml index ed292956..7994ed2d 100644 --- a/inventory/host_vars/ch-mimas.yml +++ b/inventory/host_vars/ch-mimas.yml @@ -8,6 +8,12 @@ install: apt_repo_provider: hetzner +spreadspace_apt_repo_components: + - prometheus + + +ntp_variant: systemd-timesyncd + bind_option_empty_zones_enable: no bind_option_allow_transfer: [] @@ -62,3 +68,15 @@ bind_slave_zones: - 10.in-addr.arpa - 150.33.193.in-addr.arpa - 151.33.193.in-addr.arpa + + +prometheus_scrape_endpoint: "116.203.212.131:9999" + +prometheus_job_multitarget_blackbox__probe: + ch-mon: + - instance: "ssh-{{ inventory_hostname }}" + target: "116.203.212.131:{{ ansible_port | default(22) }}" + module: ssh_banner + - instance: "https-mimas.chaos-at-home.org" + target: "https://mimas.chaos-at-home.org" + module: http_tls_2xx diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml index eda5122d..4e324830 100644 --- a/inventory/host_vars/ch-mon.yml +++ b/inventory/host_vars/ch-mon.yml @@ -127,13 +127,6 @@ prometheus_job_multitarget_blackbox__probe: # target: 1.1.1.1 # module: icmp - - instance: "https-pan.chaos-at-home.org" - target: "https://pan.chaos-at-home.org" - module: http_tls_2xx - - instance: "https-mimas.chaos-at-home.org" - target: "https://mimas.chaos-at-home.org" - module: http_tls_2xx - - instance: "ssh-{{ inventory_hostname }}" target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner diff --git a/inventory/host_vars/ch-pan.yml b/inventory/host_vars/ch-pan.yml index 30a6b491..4198d252 100644 --- a/inventory/host_vars/ch-pan.yml +++ b/inventory/host_vars/ch-pan.yml @@ -31,6 +31,11 @@ network: - *_network_primary_ +spreadspace_apt_repo_components: + - prometheus + + +ntp_variant: systemd-timesyncd bind_option_empty_zones_enable: no @@ -92,3 +97,13 @@ bind_slave_zones: - 10.in-addr.arpa - 150.33.193.in-addr.arpa - 151.33.193.in-addr.arpa + + +prometheus_job_multitarget_blackbox__probe: + ch-mon: + - instance: "ssh-{{ inventory_hostname }}" + target: "{{ network.primary.address | ipaddr('address') }}:{{ ansible_port | default(22) }}" + module: ssh_banner + - instance: "https-pan.chaos-at-home.org" + target: "https://pan.chaos-at-home.org" + module: http_tls_2xx diff --git a/inventory/hosts.ini b/inventory/hosts.ini index b4c933ed..2c58a812 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -420,6 +420,8 @@ ch-prometheus ch-epimetheus ch-apps ch-sensors1 +ch-pan +ch-mimas [promzone-chaos-at-home:children] chaos-at-home-ap #chaos-at-home-ups |