| 1 |
commit: 89ff8af47a68d0c35f89266812ad40fe1251479e |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 31 13:16:16 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 31 13:16:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ff8af4 |
| 7 |
|
| 8 |
app-admin/diamond: drop unused files |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
app-admin/diamond/files/diamond-4.0-psutil.patch | 48 ------------------------ |
| 14 |
1 file changed, 48 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/diamond/files/diamond-4.0-psutil.patch b/app-admin/diamond/files/diamond-4.0-psutil.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index e5f5d3bfb39..00000000000 |
| 19 |
--- a/app-admin/diamond/files/diamond-4.0-psutil.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,48 +0,0 @@ |
| 22 |
-From 21ca284ffe6901b06e1136ce57dc07e0effd2a3e Mon Sep 17 00:00:00 2001 |
| 23 |
-From: Fabian Groffen <grobian@g.o> |
| 24 |
-Date: Mon, 3 Aug 2015 19:40:59 +0200 |
| 25 |
-Subject: [PATCH 1/2] NetworkCollector: psutil.network_io_counters was renamed |
| 26 |
- |
| 27 |
---- |
| 28 |
- src/collectors/network/network.py | 2 +- |
| 29 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 30 |
- |
| 31 |
-diff --git a/src/collectors/network/network.py b/src/collectors/network/network.py |
| 32 |
-index d835162..90c2f59 100644 |
| 33 |
---- a/src/collectors/network/network.py |
| 34 |
-+++ b/src/collectors/network/network.py |
| 35 |
-@@ -96,7 +96,7 @@ def collect(self): |
| 36 |
- self.log.error('No network metrics retrieved') |
| 37 |
- return None |
| 38 |
- |
| 39 |
-- network_stats = psutil.network_io_counters(True) |
| 40 |
-+ network_stats = psutil.net_io_counters(True) |
| 41 |
- for device in network_stats.keys(): |
| 42 |
- network_stat = network_stats[device] |
| 43 |
- results[device] = {} |
| 44 |
- |
| 45 |
-From 314d6057ca95bae6d3e6369556522574eb905c3f Mon Sep 17 00:00:00 2001 |
| 46 |
-From: Fabian Groffen <grobian@g.o> |
| 47 |
-Date: Mon, 3 Aug 2015 19:41:20 +0200 |
| 48 |
-Subject: [PATCH 2/2] MemoryCollector: psutil renamed phymem_usage and |
| 49 |
- virtmem_usage |
| 50 |
- |
| 51 |
---- |
| 52 |
- src/collectors/memory/memory.py | 4 ++-- |
| 53 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 54 |
- |
| 55 |
-diff --git a/src/collectors/memory/memory.py b/src/collectors/memory/memory.py |
| 56 |
-index 7c9b1fb..9057115 100644 |
| 57 |
---- a/src/collectors/memory/memory.py |
| 58 |
-+++ b/src/collectors/memory/memory.py |
| 59 |
-@@ -103,8 +103,8 @@ def collect(self): |
| 60 |
- self.log.error('No memory metrics retrieved') |
| 61 |
- return None |
| 62 |
- |
| 63 |
-- phymem_usage = psutil.phymem_usage() |
| 64 |
-- virtmem_usage = psutil.virtmem_usage() |
| 65 |
-+ phymem_usage = psutil.virtual_memory() |
| 66 |
-+ virtmem_usage = psutil.swap_memory() |
| 67 |
- units = 'B' |
| 68 |
- |
| 69 |
- for unit in self.config['byte_unit']: |
Archives