grobian 15/08/03 17:59:54 Added: diamond-4.0-psutil.patch Log: Pull in fixes for psutil-3 usage, useful on non-Linux only (Portage version: 2.2.20-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.1 app-admin/diamond/files/diamond-4.0-psutil.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/files/diamond-4.0-psutil.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/files/diamond-4.0-psutil.patch?rev=1.1&content-type=text/plain Index: diamond-4.0-psutil.patch =================================================================== >From 21ca284ffe6901b06e1136ce57dc07e0effd2a3e Mon Sep 17 00:00:00 2001 From: Fabian Groffen <grob...@gentoo.org> Date: Mon, 3 Aug 2015 19:40:59 +0200 Subject: [PATCH 1/2] NetworkCollector: psutil.network_io_counters was renamed --- src/collectors/network/network.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/collectors/network/network.py b/src/collectors/network/network.py index d835162..90c2f59 100644 --- a/src/collectors/network/network.py +++ b/src/collectors/network/network.py @@ -96,7 +96,7 @@ def collect(self): self.log.error('No network metrics retrieved') return None - network_stats = psutil.network_io_counters(True) + network_stats = psutil.net_io_counters(True) for device in network_stats.keys(): network_stat = network_stats[device] results[device] = {} >From 314d6057ca95bae6d3e6369556522574eb905c3f Mon Sep 17 00:00:00 2001 From: Fabian Groffen <grob...@gentoo.org> Date: Mon, 3 Aug 2015 19:41:20 +0200 Subject: [PATCH 2/2] MemoryCollector: psutil renamed phymem_usage and virtmem_usage --- src/collectors/memory/memory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collectors/memory/memory.py b/src/collectors/memory/memory.py index 7c9b1fb..9057115 100644 --- a/src/collectors/memory/memory.py +++ b/src/collectors/memory/memory.py @@ -103,8 +103,8 @@ def collect(self): self.log.error('No memory metrics retrieved') return None - phymem_usage = psutil.phymem_usage() - virtmem_usage = psutil.virtmem_usage() + phymem_usage = psutil.virtual_memory() + virtmem_usage = psutil.swap_memory() units = 'B' for unit in self.config['byte_unit']:
