diff options
| -rw-r--r-- | dan/ele-helene.yml | 5 | ||||
| -rw-r--r-- | inventory/group_vars/promzone-elevate-festival/vars.yml | 12 | ||||
| -rw-r--r-- | inventory/host_vars/ele-helene.yml | 23 | ||||
| -rw-r--r-- | inventory/host_vars/ele-mon.yml | 15 | ||||
| -rw-r--r-- | inventory/hosts.ini | 9 | ||||
| -rw-r--r-- | roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.j2 | 2 |
6 files changed, 56 insertions, 10 deletions
diff --git a/dan/ele-helene.yml b/dan/ele-helene.yml index b2635fc0..3a138a97 100644 --- a/dan/ele-helene.yml +++ b/dan/ele-helene.yml @@ -8,11 +8,12 @@ - role: core/zsh - role: core/cpu-microcode - role: apt-repo/spreadspace -# - role: monitoring/prometheus/exporter + - role: nginx/base + - role: monitoring/prometheus/exporter - role: vm/host/base - role: vm/host/network - role: installer/debian/base -# - role: installer/openbsd/base + - role: installer/openbsd/base # post_tasks: # - name: install smstools # apt: diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml index b3321614..f6c063f8 100644 --- a/inventory/group_vars/promzone-elevate-festival/vars.yml +++ b/inventory/group_vars/promzone-elevate-festival/vars.yml @@ -5,12 +5,24 @@ prometheus_exporters_extra: [] prometheus_exporters_default: - node +prometheus_exporter_node_version: 1.3.1 +prometheus_exporter_ipmi_version: 1.5.1 +prometheus_exporter_ssl_version: 2.4.0 +prometheus_exporter_blackbox_version: 0.20.0 +prometheus_exporter_nut_version: 2.3.5 + +prometheus_server_version: 2.32.1 +prometheus_alertmanager_version: 0.23.0 + prometheus_server: ele-mon prometheus_server_jobs: - node - openwrt - nut - nut/ups + - blackbox + - blackbox/probe + - ipmi prometheus_zone_name: Elevate Festival prometheus_zone_targets: "{{ groups['promzone-elevate-festival'] }}" diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index e70cf2df..7947f05a 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -38,3 +38,26 @@ installer_storage: lv: installer size: 3G fs: ext4 + + +prometheus_exporter_node_textfile_collector_scripts: + - deleted-libraries + - smartmon + +prometheus_exporters_extra: + - ssl + - ipmi + +prometheus_exporter_ipmi_modules: + default: + collectors: + - bmc + - ipmi + - chassis + - sel + +prometheus_job_multitarget_blackbox__probe: + ele-mon: + - instance: "ssh-{{ inventory_hostname }}" + target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + module: ssh_banner diff --git a/inventory/host_vars/ele-mon.yml b/inventory/host_vars/ele-mon.yml index 66e87343..cec5adc5 100644 --- a/inventory/host_vars/ele-mon.yml +++ b/inventory/host_vars/ele-mon.yml @@ -64,6 +64,13 @@ prometheus_exporter_blackbox_modules_extra: prober: icmp +prometheus_job_multitarget_blackbox__probe: + ele-mon: + - instance: "ssh-{{ inventory_hostname }}" + target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + module: ssh_banner + + prometheus_alertmanager_web_external_url: "http://{{ network.primary.address | ipaddr('address') }}/alertmanager/" prometheus_alertmanager_smtp: smarthost: "mailrelay.chaos-at-home.org:587" @@ -75,10 +82,10 @@ prometheus_alertmanager_smtp: prometheus_alertmanager_route: receiver: equinox - # routes: - # - match_re: - # instance: ^$ - # receiver: empty + matchers: + - 'alertname != PrometheusAlertmanagerE2eDeadManSwitch' + group_by: + - instance prometheus_alertmanager_receivers: - name: empty diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 5cfb1225..cc5d6188 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -434,11 +434,14 @@ ele-mon ele-helene #ele-dione #ele-telesto -#ele-router +ele-router-hmtsaal +ele-ap-hmtsaal[0:3] +ele-ups-hmtsaal[0:2] +#ele-router-leslie #ele-thetys [promzone-elevate-festival:children] -ele-ap -ele-ups +#ele-ap +#ele-ups promzone-elevate-festival-server #emc diff --git a/roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.j2 b/roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.j2 index 2b17995d..0e7ad29f 100644 --- a/roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.j2 +++ b/roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.j2 @@ -2,7 +2,7 @@ server { {% if (inventory_hostname == prometheus_server) %} listen 127.0.0.1:{{ prometheus_exporter_listen_port }} ssl; {% else %} - listen {{ (prometheus_exporter_listen_addr is defined) | ternary(prometheus_exporter_listen_addr+':', '') }}{{ prometheus_exporter_listen_port }} ssl; + listen {% if prometheus_exporter_listen_addr is defined %}{{ prometheus_exporter_listen_addr }}:{% endif %}{{ prometheus_exporter_listen_port }} ssl; {% endif %} server_name _; |