Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404430 )
Change subject: prometheus: tweak node_exporter ignored_devices
......................................................................
prometheus: tweak node_exporter ignored_devices
Also quote arguments to node_exporter, in case one of those contains a
whitespace
Change-Id: Ib71f482fa4fb7396dca7897921d812c5dbc330be
---
M modules/prometheus/manifests/node_exporter.pp
M modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/404430/1
diff --git a/modules/prometheus/manifests/node_exporter.pp
b/modules/prometheus/manifests/node_exporter.pp
index 44ce9a9..dec1dce 100644
--- a/modules/prometheus/manifests/node_exporter.pp
+++ b/modules/prometheus/manifests/node_exporter.pp
@@ -30,7 +30,7 @@
class prometheus::node_exporter (
- $ignored_devices = "^(ram|loop|fd)\\\\d+\$",
+ $ignored_devices =
'^(ram|loop|fd|(h|s|v|xv)d[a-z]|nvme\\\\d+n\\\\d+p)\\\\d+$',
$ignored_fs_types = '^(sys|proc|auto)fs$',
$ignored_mount_points = '^/(sys|proc|dev)($|/)',
$collectors_extra = [],
diff --git
a/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
b/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
index 2358c1a..98f2082 100644
--- a/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
+++ b/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
@@ -1 +1 @@
-ARGS='-collector.diskstats.ignored-devices=<%= @ignored_devices %>
-collector.filesystem.ignored-fs-types <%= @ignored_fs_types %>
-collector.filesystem.ignored-mount-points <%= @ignored_mount_points %>
-collector.textfile.directory=<%= @textfile_directory %>
-collectors.enabled=<%= @collectors_enabled %> -web.listen-address=<%=
@web_listen_address %>'
+ARGS='-collector.diskstats.ignored-devices="<%= @ignored_devices %>"
-collector.filesystem.ignored-fs-types "<%= @ignored_fs_types %>"
-collector.filesystem.ignored-mount-points "<%= @ignored_mount_points %>"
-collector.textfile.directory="<%= @textfile_directory %>"
-collectors.enabled="<%= @collectors_enabled %>" -web.listen-address="<%=
@web_listen_address %>"'
--
To view, visit https://gerrit.wikimedia.org/r/404430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib71f482fa4fb7396dca7897921d812c5dbc330be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
