summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-03-10 00:11:29 +0100
committerChristian Pointner <equinox@spreadspace.org>2022-03-10 00:11:29 +0100
commit8839a6f61383d679d60e4979dac871693a70ac9c (patch)
tree5df8692041285cfcf554a624eae8cd97f48ba8f7
parentMerge branch 'experiment/alerta' (diff)
add ch-apps to prometheus monitoring
-rw-r--r--chaos-at-home/ch-apps.yml2
-rw-r--r--inventory/host_vars/ch-apps.yml10
-rw-r--r--inventory/host_vars/ch-epimetheus.yml3
-rw-r--r--inventory/hosts.ini1
4 files changed, 13 insertions, 3 deletions
diff --git a/chaos-at-home/ch-apps.yml b/chaos-at-home/ch-apps.yml
index f0347216..66ae6446 100644
--- a/chaos-at-home/ch-apps.yml
+++ b/chaos-at-home/ch-apps.yml
@@ -10,6 +10,8 @@
- role: storage/zfs/pools
- role: storage/zfs/sanoid
- role: apt-repo/spreadspace
+ - role: nginx/base
+ - role: monitoring/prometheus/exporter
- role: kubernetes/base
- role: kubernetes/standalone/base
- role: monitoring/alerta
diff --git a/inventory/host_vars/ch-apps.yml b/inventory/host_vars/ch-apps.yml
index ed2aeb70..5fe4acd5 100644
--- a/inventory/host_vars/ch-apps.yml
+++ b/inventory/host_vars/ch-apps.yml
@@ -22,7 +22,7 @@ install:
system_lvm:
volumes:
- name: root
- size: 3G
+ size: 4G
filesystem: ext4
mountpoint: /
- name: var
@@ -63,12 +63,20 @@ apt_repo_components:
spreadspace_apt_repo_components:
- container
+ - prometheus
ssh_keys_root_extra:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZK9NBainiE0+A8pT8dbwlNZ0k0AZVhLTzUSo3YtKJt ZFS Backup syncoid@epimetheus
+prometheus_job_multitarget_blackbox__probe:
+ ch-mon:
+ - instance: "ssh-{{ inventory_hostname }}"
+ target: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}"
+ module: ssh_banner
+
+
zfs_arc_size:
min: 512MB
max: 2GB
diff --git a/inventory/host_vars/ch-epimetheus.yml b/inventory/host_vars/ch-epimetheus.yml
index 8ac909ab..3a59b484 100644
--- a/inventory/host_vars/ch-epimetheus.yml
+++ b/inventory/host_vars/ch-epimetheus.yml
@@ -107,8 +107,7 @@ zfs_syncoid_sources:
'ch-apps':
ssh_hostname: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-apps']) | ipaddr('address') }}"
ssh_port: "{{ hostvars['ch-apps'].ansible_port }}"
- ## TODO: enable this once ch-apps is part of prometheus
- # report_prometheus_textfile_path: "/var/lib/prometheus-node-exporter/textfile-collector"
+ report_prometheus_textfile_path: "/var/lib/prometheus-node-exporter/textfile-collector"
periodic:
schedule: "*-*-* 00,06,12,18:15:00"
timeout: 5h
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index cb0c0f6a..b24ebf96 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -409,6 +409,7 @@ ch-mon
ch-router
ch-phoebe
ch-prometheus
+ch-apps
[promzone-chaos-at-home:children]
chaos-at-home-ap
chaos-at-home-ups