aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kochie <superq@gmail.com>2019-02-17 17:57:15 +0100
committerGitHub <noreply@github.com>2019-02-17 17:57:15 +0100
commitf028b816152f6d5650ca2cd707e45cda7333fdc1 (patch)
tree8b56f396a7fc0f483e1ad199631948caf3013eb9
parentdc4c58671de96f35b82e74232d882f64cd66ccd9 (diff)
downloadprometheus_node_collector-f028b816152f6d5650ca2cd707e45cda7333fdc1.tar.bz2
prometheus_node_collector-f028b816152f6d5650ca2cd707e45cda7333fdc1.tar.xz
prometheus_node_collector-f028b816152f6d5650ca2cd707e45cda7333fdc1.zip
Update systemd blacklist (#1255)
Include additional unit types in the default systemd collector blacklist. Signed-off-by: Ben Kochie <superq@gmail.com>
-rw-r--r--CHANGELOG.md2
-rw-r--r--collector/systemd_linux.go2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bd7ee4..cf17e7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
9* Bonding collector now uses `mii_status` instead of `operstatus` #1124 9* Bonding collector now uses `mii_status` instead of `operstatus` #1124
10* Several systemd metrics have been turned off by default to improve performance #1254 10* Several systemd metrics have been turned off by default to improve performance #1254
11 These include unit_tasks_current, unit_tasks_max, service_restart_total, and unit_start_time_seconds 11 These include unit_tasks_current, unit_tasks_max, service_restart_total, and unit_start_time_seconds
12* The systemd collector blacklist now includes automount, device, mount, and slice units by default. #1255
12 13
13### Changes 14### Changes
14 15
@@ -19,6 +20,7 @@
19* [CHANGE] Add a limit to the number of in-flight requests #1166 20* [CHANGE] Add a limit to the number of in-flight requests #1166
20* [CHANGE] Add separate cpufreq and scaling metrics #1248 21* [CHANGE] Add separate cpufreq and scaling metrics #1248
21* [CHANGE] Several systemd metrics have been turned off by default to improve performance #1254 22* [CHANGE] Several systemd metrics have been turned off by default to improve performance #1254
23* [CHANGE] Expand systemd collector blacklist #1255
22* [ENHANCEMENT] Add Infiniband counters #1120 24* [ENHANCEMENT] Add Infiniband counters #1120
23* [ENHANCEMENT] Move network_up labels into new metric network_info #1236 25* [ENHANCEMENT] Move network_up labels into new metric network_info #1236
24* [FEATURE] Add a flag to disable exporter metrics #1148 26* [FEATURE] Add a flag to disable exporter metrics #1148
diff --git a/collector/systemd_linux.go b/collector/systemd_linux.go
index faccded..ae55499 100644
--- a/collector/systemd_linux.go
+++ b/collector/systemd_linux.go
@@ -31,7 +31,7 @@ import (
31 31
32var ( 32var (
33 unitWhitelist = kingpin.Flag("collector.systemd.unit-whitelist", "Regexp of systemd units to whitelist. Units must both match whitelist and not match blacklist to be included.").Default(".+").String() 33 unitWhitelist = kingpin.Flag("collector.systemd.unit-whitelist", "Regexp of systemd units to whitelist. Units must both match whitelist and not match blacklist to be included.").Default(".+").String()
34 unitBlacklist = kingpin.Flag("collector.systemd.unit-blacklist", "Regexp of systemd units to blacklist. Units must both match whitelist and not match blacklist to be included.").Default(".+\\.scope").String() 34 unitBlacklist = kingpin.Flag("collector.systemd.unit-blacklist", "Regexp of systemd units to blacklist. Units must both match whitelist and not match blacklist to be included.").Default(".+\\.(automount|device|mount|scope|slice)").String()
35 systemdPrivate = kingpin.Flag("collector.systemd.private", "Establish a private, direct connection to systemd without dbus.").Bool() 35 systemdPrivate = kingpin.Flag("collector.systemd.private", "Establish a private, direct connection to systemd without dbus.").Bool()
36 enableTaskMetrics = kingpin.Flag("collector.systemd.enable-task-metrics", "Enables service unit tasks metrics unit_tasks_current and unit_tasks_max").Bool() 36 enableTaskMetrics = kingpin.Flag("collector.systemd.enable-task-metrics", "Enables service unit tasks metrics unit_tasks_current and unit_tasks_max").Bool()
37 enableRestartsMetrics = kingpin.Flag("collector.systemd.enable-restarts-metrics", "Enables service unit metric service_restart_total").Bool() 37 enableRestartsMetrics = kingpin.Flag("collector.systemd.enable-restarts-metrics", "Enables service unit metric service_restart_total").Bool()