summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2024-05-26 23:02:34 +0200
committerChristian Pointner <equinox@spreadspace.org>2024-05-26 23:02:34 +0200
commitbf377e72f920114489b027d6d1602a39f1950c70 (patch)
treed013d16262ea75acb6cb1e0c39998b8be63a020c
parentapt-cacher-ng: use nginx for publishing (diff)
ch-apt: add to prometheus monitoring and fix cache backends
-rw-r--r--chaos-at-home/ch-apt.yml2
-rw-r--r--inventory/host_vars/ch-apt.yml29
-rw-r--r--inventory/hosts.ini1
3 files changed, 28 insertions, 4 deletions
diff --git a/chaos-at-home/ch-apt.yml b/chaos-at-home/ch-apt.yml
index 29a28036..69919f00 100644
--- a/chaos-at-home/ch-apt.yml
+++ b/chaos-at-home/ch-apt.yml
@@ -12,5 +12,7 @@
hosts: ch-apt
roles:
- role: storage/lvm/base
+ - role: apt-repo/spreadspace
- role: nginx/base
+ - role: monitoring/prometheus/exporter
- role: apt-cacher-ng
diff --git a/inventory/host_vars/ch-apt.yml b/inventory/host_vars/ch-apt.yml
index c4a539f1..94373b61 100644
--- a/inventory/host_vars/ch-apt.yml
+++ b/inventory/host_vars/ch-apt.yml
@@ -39,6 +39,12 @@ network:
- *_network_primary_
+spreadspace_apt_repo_components:
+ - prometheus
+
+ntp_variant: systemd-timesyncd
+
+
lvm_groups:
storage:
pvs:
@@ -63,19 +69,34 @@ apt_cacher_ng_remaps:
path: /debian-security
backends:
- http://debian.anexia.at/debian-security
+ debian-archive:
+ path: /debian-archive
+ backends:
+ - http://archive.debian.org/debian
ubuntu:
path: /ubuntu
backends:
- http://ubuntu.anexia.at/ubuntu
+ kali:
+ path: /kali
+ backends:
+ - http://http.kali.org/kali
raspios:
path: /raspios
backends:
- http://archive.raspberrypi.com/debian
- kalirep:
- path: /kali
- backends:
- - http://http.kali.org/kali
apt_cacher_ng_admin_auth:
username: admin
password: "{{ vault_apt_cacher_ng_admin_auth_password }}"
+
+
+
+prometheus_job_multitarget_blackbox__probe:
+ ch-mon:
+ - 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
+ - instance: "http-apt.chaos-at-home.org"
+ target: "http://{{ apt_cacher_ng_hostname }}/acng-report.html"
+ module: "http_2xx"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 0f68afd1..b6e1fd32 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -474,6 +474,7 @@ ch-iot
ch-http-proxy
ch-imap-proxy
ch-greenbone
+ch-apt
[promzone-chaos-at-home:children]
chaos-at-home-ap
chaos-at-home-ups