From 439686f8c19854103557f01ea31c7135e6b134d5 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 15 Mar 2024 00:42:10 +0100 Subject: upgraded some prometheus components --- .../common/openwrt/chrony_prometheus-node-exporter.lua | 17 +++++++++++++++++ inventory/group_vars/promzone-chaos-at-home/vars.yml | 10 +++++----- inventory/group_vars/promzone-elevate-festival/vars.yml | 8 ++++---- .../prometheus/exporter/chrony/defaults/main.yml | 1 + .../prometheus/exporter/ipmi/defaults/main.yml | 2 ++ 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/files/common/openwrt/chrony_prometheus-node-exporter.lua b/files/common/openwrt/chrony_prometheus-node-exporter.lua index a3c4b292..0e4271c1 100644 --- a/files/common/openwrt/chrony_prometheus-node-exporter.lua +++ b/files/common/openwrt/chrony_prometheus-node-exporter.lua @@ -4,6 +4,7 @@ local chrony_sources_cmd = 'chronyc -n -c sources' local chrony_tracking_cmd = 'chronyc -n -c tracking' +local chrony_serverstats_cmd = 'chronyc -n -c serverstats' local source_states = {} source_states['*'] = "sync" @@ -44,6 +45,7 @@ end local function scrape() local chrony_tracking = get_cmdoutput(chrony_tracking_cmd) local chrony_sources = get_cmdoutput(chrony_sources_cmd) + local chrony_serverstats = get_cmdoutput(chrony_serverstats_cmd) local metric_up = metric("chrony_up", "gauge") if chrony_tracking == nil or chrony_sources == nil then @@ -98,6 +100,21 @@ local function scrape() local items = comma_split(line) metric_sources_stratum({ source_address = items[3], source_name = items[3] }, tonumber(items[4])) end + + for _, line in ipairs(chrony_serverstats) do + local items = comma_split(line) + metric("chrony_serverstats_ntp_packets_received_total", "counter", nil, tonumber(items[1])) + metric("chrony_serverstats_nts_ke_connections_accepted_total", "counter", nil, tonumber(items[6])) + metric("chrony_serverstats_command_packets_received_total", "counter", nil, tonumber(items[3])) + metric("chrony_serverstats_ntp_packets_dropped_total", "counter", nil, tonumber(items[2])) + metric("chrony_serverstats_nts_ke_connections_dropped_total", "counter", nil, tonumber(items[7])) + metric("chrony_serverstats_command_packets_dropped_total", "counter", nil, tonumber(items[4])) + metric("chrony_serverstats_client_log_records_dropped_total", "counter", nil, tonumber(items[5])) + metric("chrony_serverstats_authenticated_ntp_packets_total", "counter", nil, tonumber(items[8])) + metric("chrony_serverstats_interleaved_ntp_packets_total", "counter", nil, tonumber(items[9])) + metric("chrony_serverstats_ntp_timestamps_held", "gauge", nil, tonumber(items[10])) + metric("chrony_serverstats_ntp_timestamp_span_seconds", "gauge", nil, tonumber(items[11])) + end end return { scrape = scrape } diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml index 1e3c2ada..187f3b37 100644 --- a/inventory/group_vars/promzone-chaos-at-home/vars.yml +++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml @@ -6,18 +6,18 @@ prometheus_exporters_default: - node prometheus_exporter_node_version: 1.7.0 -prometheus_exporter_ipmi_version: 1.7.0 +prometheus_exporter_ipmi_version: 1.8.0 prometheus_exporter_ssl_version: 2.4.2 prometheus_exporter_blackbox_version: 0.24.0 prometheus_exporter_nut_version: 3.1.1 -prometheus_exporter_smokeping_version: 0.7.1 +prometheus_exporter_smokeping_version: 0.7.3 prometheus_exporter_bind_version: 0.7.0 -prometheus_exporter_chrony_version: 0.7.0 +prometheus_exporter_chrony_version: 0.9.1 prometheus_exporter_chrony_disable_dns_lookups: yes prometheus_exporter_mosquitto_version: 0.7.2 -prometheus_server_version: 2.48.1 -prometheus_alertmanager_version: 0.26.0 +prometheus_server_version: 2.50.1 +prometheus_alertmanager_version: 0.27.0 prometheus_server: ch-mon prometheus_server_jobs: diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml index 61877110..1df25d06 100644 --- a/inventory/group_vars/promzone-elevate-festival/vars.yml +++ b/inventory/group_vars/promzone-elevate-festival/vars.yml @@ -6,15 +6,15 @@ prometheus_exporters_default: - node prometheus_exporter_node_version: 1.7.0 -prometheus_exporter_ipmi_version: 1.7.0 +prometheus_exporter_ipmi_version: 1.8.0 prometheus_exporter_ssl_version: 2.4.2 prometheus_exporter_blackbox_version: 0.24.0 prometheus_exporter_nut_version: 3.1.1 -prometheus_exporter_chrony_version: 0.7.0 +prometheus_exporter_chrony_version: 0.9.1 prometheus_exporter_chrony_disable_dns_lookups: yes -prometheus_server_version: 2.48.1 -prometheus_alertmanager_version: 0.26.0 +prometheus_server_version: 2.50.1 +prometheus_alertmanager_version: 0.27.0 prometheus_server: ele-calypso prometheus_server_jobs: diff --git a/roles/monitoring/prometheus/exporter/chrony/defaults/main.yml b/roles/monitoring/prometheus/exporter/chrony/defaults/main.yml index 2cac4bed..0908ff35 100644 --- a/roles/monitoring/prometheus/exporter/chrony/defaults/main.yml +++ b/roles/monitoring/prometheus/exporter/chrony/defaults/main.yml @@ -5,3 +5,4 @@ prometheus_exporter_chrony_disable_dns_lookups: no prometheus_exporter_chrony_enable_collectors: - sources - tracking + - serverstats diff --git a/roles/monitoring/prometheus/exporter/ipmi/defaults/main.yml b/roles/monitoring/prometheus/exporter/ipmi/defaults/main.yml index fa9de646..f455c78e 100644 --- a/roles/monitoring/prometheus/exporter/ipmi/defaults/main.yml +++ b/roles/monitoring/prometheus/exporter/ipmi/defaults/main.yml @@ -10,7 +10,9 @@ prometheus_exporter_ipmi_modules: # - chassis # - dcmi # - sel + # - sel-events # - sm-lan-mode + # - bmc-watchdog # exclude_sensor_ids: # - 2 # - 29 -- cgit v1.2.3