Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404324 )
Change subject: prometheus: allow override of fs-related node-exporter options
......................................................................
prometheus: allow override of fs-related node-exporter options
Bug: T184469
Change-Id: Ic756cb208a10982dba1197d80af1ed50554613bc
---
M modules/prometheus/manifests/node_exporter.pp
M modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/404324/1
diff --git a/modules/prometheus/manifests/node_exporter.pp
b/modules/prometheus/manifests/node_exporter.pp
index 541e61f..adc9c75 100644
--- a/modules/prometheus/manifests/node_exporter.pp
+++ b/modules/prometheus/manifests/node_exporter.pp
@@ -25,6 +25,8 @@
class prometheus::node_exporter (
$ignored_devices = "^(ram|loop|fd)\\\\d+\$",
+ $ignored_fs_types = "^(sys|proc|auto)fs$",
+ $ignored_mount_points = "^/(sys|proc|dev)($|/)",
$collectors_extra = [],
$web_listen_address = ':9100',
) {
diff --git
a/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
b/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
index 5353a08..2358c1a 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.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/404324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic756cb208a10982dba1197d80af1ed50554613bc
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
