From 9e4b8c250985c5de74bf299f7a818fc2d8d715fa Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 1 Jan 2022 17:15:11 +0100 Subject: [PATCH] prometheus: remove ipmi target --- playbooks/prometheus.yml | 12 ------------ roles/prometheus/templates/prometheus.yml.j2 | 18 ------------------ .../templates/prometheus.yml.j2 | 1 - 3 files changed, 31 deletions(-) diff --git a/playbooks/prometheus.yml b/playbooks/prometheus.yml index a82e41d..6f16471 100755 --- a/playbooks/prometheus.yml +++ b/playbooks/prometheus.yml @@ -15,8 +15,6 @@ {{ groups['fleming_pve'] + groups['fleming_vm'] | list | sort }} prometheus_unifi_snmp_targets: | {{ groups['fleming_unifi'] | list | sort }} - prometheus_ipmi_targets: | - {{ groups['fleming_pve'] + groups['fleming_server'] | list | sort }} prometheus_ilo_snmp_targets: | {{ groups['fleming_ilo'] | list | sort }} @@ -45,8 +43,6 @@ prometheus_ups_snmp_targets: - ups-pn-1.ups.auro.re - ups-ps-1.ups.auro.re - prometheus_ipmi_targets: | - {{ groups['pacaterie_pve'] | list | sort }} prometheus_ilo_snmp_targets: | {{ groups['pacaterie_ilo'] | list | sort }} @@ -76,8 +72,6 @@ {{ groups['edc_pve'] + groups['edc_vm'] + groups['edc_server'] | list | sort }} prometheus_unifi_snmp_targets: | {{ groups['edc_unifi'] | list | sort }} - prometheus_ipmi_targets: | - {{ groups['edc_pve'] + groups['edc_server'] | list | sort }} prometheus_ilo_snmp_targets: | {{ groups['edc_ilo'] | list | sort }} @@ -107,8 +101,6 @@ - ups-gk-1.ups.auro.re prometheus_apc_pdu_snmp_targets: - pdu-ga-1.ups.auro.re - prometheus_ipmi_targets: | - {{ groups['gs_pve'] | list | sort }} prometheus_ilo_snmp_targets: | {{ groups['gs_ilo'] | list | sort }} @@ -137,8 +129,6 @@ {{ groups['rives_pve'] + groups['rives_vm'] | list | sort }} prometheus_unifi_snmp_targets: | {{ groups['rives_unifi'] | list | sort }} - prometheus_ipmi_targets: | - {{ groups['rives_pve'] | list | sort }} prometheus_ilo_snmp_targets: | {{ groups['rives_ilo'] | list | sort }} @@ -179,8 +169,6 @@ - sw-ec-core.switch.auro.re - sw-gk-core.switch.auro.re - sw-r3-core.switch.auro.re - prometheus_ipmi_targets: | - {{ groups['aurore_pve'] | list | sort }} prometheus_ilo_snmp_targets: | {{ groups['aurore_ilo'] | list | sort }} diff --git a/roles/prometheus/templates/prometheus.yml.j2 b/roles/prometheus/templates/prometheus.yml.j2 index bcaa598..9fd0531 100644 --- a/roles/prometheus/templates/prometheus.yml.j2 +++ b/roles/prometheus/templates/prometheus.yml.j2 @@ -140,24 +140,6 @@ scrape_configs: replacement: 127.0.0.1:9116 {% endif %} -{% if prometheus_ipmi_targets is defined %} - - job_name: ipmi - static_configs: - - targets: {{ prometheus_ipmi_targets | to_json }} - metrics_path: /metrics - params: - module: [default] - relabel_configs: - # Do not put :9290 in instance name, rather here - - source_labels: [__address__] - target_label: __param_target - - source_labels: [__param_target] - target_label: instance - - source_labels: [__param_target] - target_label: __address__ - replacement: '$1:9290' -{% endif %} - {% if prometheus_ilo_snmp_targets is defined %} - job_name: ilo_snmp static_configs: diff --git a/roles/prometheus_federate/templates/prometheus.yml.j2 b/roles/prometheus_federate/templates/prometheus.yml.j2 index 8feabaa..e1271df 100644 --- a/roles/prometheus_federate/templates/prometheus.yml.j2 +++ b/roles/prometheus_federate/templates/prometheus.yml.j2 @@ -38,6 +38,5 @@ scrape_configs: - '{job="apc_pdu_snmp"}' - '{job="docker"}' - '{job="switch_snmp"}' - - '{job="ipmi"}' - '{job="ilo_snmp"}' ...