summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2020-05-31 15:16:16 +0200
committerFabian Groffen <grobian@gentoo.org>2020-05-31 15:16:29 +0200
commit89ff8af47a68d0c35f89266812ad40fe1251479e (patch)
treefaae8362e30a9618d71b8f4bb38462a3002befb7 /app-admin
parentdev-vcs/hg-git: drop unused files (diff)
downloadgentoo-89ff8af47a68d0c35f89266812ad40fe1251479e.tar.gz
gentoo-89ff8af47a68d0c35f89266812ad40fe1251479e.tar.bz2
gentoo-89ff8af47a68d0c35f89266812ad40fe1251479e.zip
app-admin/diamond: drop unused files
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/diamond/files/diamond-4.0-psutil.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/app-admin/diamond/files/diamond-4.0-psutil.patch b/app-admin/diamond/files/diamond-4.0-psutil.patch
deleted file mode 100644
index e5f5d3bfb392..000000000000
--- a/app-admin/diamond/files/diamond-4.0-psutil.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 21ca284ffe6901b06e1136ce57dc07e0effd2a3e Mon Sep 17 00:00:00 2001
-From: Fabian Groffen <grobian@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 <grobian@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']: