From 318c6f0b990943c8c97a26471fa791c691bdde11 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 7 Feb 2023 01:05:58 +0100 Subject: remove promzone-test --- inventory/group_vars/promzone-test/vars.yml | 32 ----------------- inventory/host_vars/ch-testvm-openwrt.yml | 18 ---------- inventory/host_vars/ch-testvm-phoebe.yml | 20 ----------- inventory/host_vars/ch-testvm-prometheus.yml | 53 ---------------------------- inventory/hosts.ini | 8 ----- 5 files changed, 131 deletions(-) delete mode 100644 inventory/group_vars/promzone-test/vars.yml (limited to 'inventory') diff --git a/inventory/group_vars/promzone-test/vars.yml b/inventory/group_vars/promzone-test/vars.yml deleted file mode 100644 index df27fb0b..00000000 --- a/inventory/group_vars/promzone-test/vars.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -prometheus_scrape_endpoint: "{{ network.primary.address | ansible.utils.ipaddr('address') }}:9999" - -prometheus_exporters_extra: [] -prometheus_exporters_default: - - node - -prometheus_exporter_node_version: 1.5.0 -prometheus_exporter_ipmi_version: 1.6.1 -prometheus_exporter_ssl_version: 2.4.2 -prometheus_exporter_blackbox_version: 0.23.0 -prometheus_exporter_nut_version: 2.5.2 -prometheus_exporter_smokeping_version: 0.6.1 -prometheus_exporter_bind_version: 0.6.0 - -prometheus_server_version: 2.41.0 -prometheus_alertmanager_version: 0.25.0 - -prometheus_server: ch-testvm-prometheus -prometheus_server_jobs: - - node - - openwrt - - blackbox - - blackbox/probe - - ssl - - ssl/probe - -prometheus_zone_name: chaos@test -prometheus_zone_targets: "{{ groups['promzone-test'] }}" - -prometheus_target_labels_default: - ansible_env_group: "{{ env_group }}" diff --git a/inventory/host_vars/ch-testvm-openwrt.yml b/inventory/host_vars/ch-testvm-openwrt.yml index 6f89e0f8..4e978fcf 100644 --- a/inventory/host_vars/ch-testvm-openwrt.yml +++ b/inventory/host_vars/ch-testvm-openwrt.yml @@ -38,8 +38,6 @@ openwrt_packages_add: - iperf - iperf3 - mtr - - prometheus-node-exporter-lua - - prometheus-node-exporter-lua-openwrt openwrt_mixin: /etc/dropbear/authorized_keys: @@ -81,17 +79,6 @@ openwrt_uci: RootPasswordAuth: 'off' Port: '{{ ansible_port | default(22) }}' - uhttpd: - - name: uhttpd main - options: - enabled: '0' - - prometheus-node-exporter-lua: - - name: prometheus-node-exporter-lua 'main' - options: - listen_interface: 'svc' - listen_port: '9100' - network: - name: globals 'globals' options: @@ -119,8 +106,3 @@ openwrt_uci: target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr('network') }}" netmask: "{{ network_zones.lan.prefix | ansible.utils.ipaddr('netmask') }}" gateway: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ansible.utils.ipaddr('address') }}" - - -prometheus_scrape_endpoint: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:9100" -prometheus_exporters_default: - - openwrt diff --git a/inventory/host_vars/ch-testvm-phoebe.yml b/inventory/host_vars/ch-testvm-phoebe.yml index 94c9eca3..d15e4142 100644 --- a/inventory/host_vars/ch-testvm-phoebe.yml +++ b/inventory/host_vars/ch-testvm-phoebe.yml @@ -39,23 +39,3 @@ network: address: "{{ network_zones.iot.prefix | ansible.utils.ipaddr(network_zones.iot.offsets[inventory_hostname]) }}" ntp_variant: systemd-timesyncd - - -spreadspace_apt_repo_components: - - prometheus - - -prometheus_exporters_extra: - - ssl - -prometheus_job_multitarget_blackbox__probe: - ch-testvm-prometheus: - - 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 - -prometheus_job_multitarget_ssl__probe: - ch-testvm-phoebe: - - instance: "sslcert-prometheus-{{ inventory_hostname }}" - target: "/etc/ssl/prometheus/**/*.pem" - module: file diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml index 2b3c3099..415e6774 100644 --- a/inventory/host_vars/ch-testvm-prometheus.yml +++ b/inventory/host_vars/ch-testvm-prometheus.yml @@ -35,56 +35,3 @@ network: - *_network_primary_ ntp_variant: systemd-timesyncd - - -spreadspace_apt_repo_components: - - prometheus - - -prometheus_server_storage: - type: lvm - vg: "{{ host_name }}" - lv: prometheus - size: 1G - fs: ext4 - -prometheus_server_external_labels: - environment: chaos-at-test - monitor: "{{ inventory_hostname }}" - -prometheus_server_web_external_url: "http://{{ network.primary.address | ansible.utils.ipaddr('address') }}/prometheus/" - -prometheus_server_auth_users: - server: "{{ vault_prometheus_server_auth_user_passwords['server'] }}" - admin: "{{ vault_prometheus_server_auth_user_passwords['admin'] }}" - -prometheus_server_selfscraping_auth: - username: server - password: "{{ vault_prometheus_server_auth_user_passwords['server'] }}" - - -prometheus_exporters_extra: - - blackbox - - ssl - - -prometheus_job_multitarget_blackbox__probe: - ch-testvm-prometheus: - - 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 - -prometheus_job_multitarget_ssl__probe: - ch-testvm-prometheus: - - instance: "sslcert-prometheus-{{ inventory_hostname }}" - target: "/etc/ssl/prometheus/**/*.pem" - module: file - - -prometheus_target_labels_extra: - blub: foo - - -monitoring_landingpage_hostnames: - - "mon-test.chaos-at-home.org" -monitoring_landingpage_title: "chaos@test Monitoring Host" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 0e03db50..515998aa 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -461,14 +461,6 @@ ele-telesto promzone-elevate-festival-server #elevate-mediachannel -[promzone-test-server] -ch-testvm-prometheus -[promzone-test] -ch-testvm-phoebe -ch-testvm-openwrt -[promzone-test:children] -promzone-test-server - ## openvpn # [ovpnzone-test-server] -- cgit v1.2.3