diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
| commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
| tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /app-admin/diamond | |
| parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) | |
gentoo resync : 13.06.2020
Diffstat (limited to 'app-admin/diamond')
| -rw-r--r-- | app-admin/diamond/Manifest | 1 | ||||
| -rw-r--r-- | app-admin/diamond/files/diamond-4.0-psutil.patch | 48 |
2 files changed, 0 insertions, 49 deletions
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest index 8ed0f00bfbed..e94558518836 100644 --- a/app-admin/diamond/Manifest +++ b/app-admin/diamond/Manifest @@ -1,4 +1,3 @@ -AUX diamond-4.0-psutil.patch 1842 BLAKE2B 21774c34c5557c84b5ae217acfe468b7d55a4e3b818f501ee72cec43cc01d24e7121f9fe302bdc317d60c39e39e7d4587a5caee4ddc73dcc1e87e1605499be40 SHA512 4f59e7811df1419dcf29d231f62844de6db9e5a3f6e7600b11432d1bda994b62973172cce98d257d6ce03e940645df76dee2c3cd4fced18e960527bb23b1f1ea AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55 AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a596037608bd794c3fd68a78a03659295ce2021b70809edc01340f5ee39348e35275cae0b00a5042 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3 DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd 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']: |