patch
ActivePublic
Actions

Authored by aborrero on Oct 27 2017, 12:51 PM.

Tags

None

Referenced Files

	F10516883: patch
	Oct 30 2017, 12:42 PM

	F10467993: patch
	Oct 27 2017, 1:04 PM

	F10467684: patch
	Oct 27 2017, 12:51 PM

Subscribers

None

	diff --git a/modules/diamond/files/collector/nfsiostat.py b/modules/diamond/files/collector/nfsiostat.py
	index dcdc0b84d9..ad94778c13 100644
	--- a/modules/diamond/files/collector/nfsiostat.py
	+++ b/modules/diamond/files/collector/nfsiostat.py
	@@ -27,6 +27,7 @@ MA 02110-1301 USA

	from __future__ import print_function
	import diamond.collector
	+import re

	Iostats_version = '0.2'

	@@ -349,11 +350,16 @@ def nfs_iostat(new, devices):
	return iostat


	-def list_nfs_mounts(mountstats):
	+def list_nfs_mounts(mountstats, include_regex, exclude_regex):
	"""return a list of NFS mounts
	"""
	list = []
	+
	for device, descr in mountstats.items():
	+ if not include_regex.match(device):
	+ continue
	+ if exclude_regex.match(device):
	+ continue
	stats = DeviceData()
	stats.parse_stats(descr)
	if stats.is_nfs_mountpoint():
	@@ -377,10 +383,8 @@ class NfsiostatCollector(diamond.collector.Collector):
	config.update({
	'enabled': False,
	'path': 'nfsiostat',
	- 'devices': ['/home',
	- '/public/dumps',
	- '/data/scratch',
	- '/data/project'],
	+ 'devices_include': '/mnt/nfs/*',
	+ 'devices_exclude': '(?!)',
	'attributes': ['attr',
	'read',
	'write',
	@@ -422,15 +426,16 @@ class NfsiostatCollector(diamond.collector.Collector):
	mountstats = parse_stats_file('/proc/self/mountstats')

	# make certain devices contains only NFS mount points
	- devices = list_nfs_mounts(mountstats) or []
	- adevices = [d for d in devices if d in self.config['devices']]
	+ include_regex = re.compile(self.config['devices_include'])
	+ exclude_regex = re.compile(self.config['devices_exclude'])
	+ devices = list_nfs_mounts(mountstats, include_regex, exclude_regex)

	if len(devices) == 0:
	self.log.error('No NFS mount points were found')
	return

	metrics = {}
	- stats = nfs_iostat(mountstats, adevices)
	+ stats = nfs_iostat(mountstats, devices)

	nfs_ops = {}
	# ops are reported by mount point but this is disingenuous as

Event Timeline

aborrero created this paste.Oct 27 2017, 12:51 PM

aborrero edited the content of this paste. (Show Details)Oct 27 2017, 1:04 PM

aborrero edited the content of this paste. (Show Details)Oct 30 2017, 12:42 PM

patchActivePublicActions

Event Timeline

patch
ActivePublic
Actions