Filippo Giunchedi has submitted this change and it was merged. ( 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, 9 insertions(+), 1 deletion(-) Approvals: Rush: Looks good to me, but someone else must approve jenkins-bot: Verified Filippo Giunchedi: Looks good to me, approved diff --git a/modules/prometheus/manifests/node_exporter.pp b/modules/prometheus/manifests/node_exporter.pp index 541e61f..44ce9a9 100644 --- a/modules/prometheus/manifests/node_exporter.pp +++ b/modules/prometheus/manifests/node_exporter.pp @@ -11,6 +11,12 @@ # [*$ignored_devices*] # Regular expression to exclude block devices from being reported # +# [*$ignored_fs_types*] +# Regular expression to exclude filesystem types from being reported +# +# [*$ignored_mount_points*] +# Regular expression to exclude mount points from being reported +# # [*$collectors_extra*] # List of extra collectors to be enabled. # @@ -25,6 +31,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: merged Gerrit-Change-Id: Ic756cb208a10982dba1197d80af1ed50554613bc Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Arturo Borrero Gonzalez <aborr...@wikimedia.org> Gerrit-Reviewer: Chasemp <r...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Madhuvishy <mviswanat...@wikimedia.org> Gerrit-Reviewer: Rush <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits