From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-admin/diamond/Manifest | 9 +++ app-admin/diamond/diamond-4.0-r1.ebuild | 74 +++++++++++++++++++++++ app-admin/diamond/diamond-4.0.515.ebuild | 77 ++++++++++++++++++++++++ app-admin/diamond/diamond-9999.ebuild | 71 ++++++++++++++++++++++ app-admin/diamond/files/diamond-4.0-psutil.patch | 48 +++++++++++++++ app-admin/diamond/files/diamond.confd | 2 + app-admin/diamond/files/diamond.initd | 19 ++++++ app-admin/diamond/metadata.xml | 22 +++++++ 8 files changed, 322 insertions(+) create mode 100644 app-admin/diamond/Manifest create mode 100644 app-admin/diamond/diamond-4.0-r1.ebuild create mode 100644 app-admin/diamond/diamond-4.0.515.ebuild create mode 100644 app-admin/diamond/diamond-9999.ebuild create mode 100644 app-admin/diamond/files/diamond-4.0-psutil.patch create mode 100644 app-admin/diamond/files/diamond.confd create mode 100644 app-admin/diamond/files/diamond.initd create mode 100644 app-admin/diamond/metadata.xml (limited to 'app-admin/diamond') diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest new file mode 100644 index 000000000000..2a0572c7be40 --- /dev/null +++ b/app-admin/diamond/Manifest @@ -0,0 +1,9 @@ +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.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 +DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b +EBUILD diamond-4.0-r1.ebuild 2007 BLAKE2B 25abec3a500ca23844dc17a7e987be99be9f2c5692c717269ee171de875850a665626cff0d2c17b990f90293adcd9da99b2e355a42328f8c7bbb22749a54236e SHA512 9385587aed2660c5872baa3a224e7a74be1b49c903b814fdf353a44401c79008e9f325b5b68eefc610b453dc91bee10730d87fca55397f1b94202441a73e6b4a +EBUILD diamond-4.0.515.ebuild 2128 BLAKE2B e19b1e5cf4f88e92bcc46c620f5284fbe97d4b2988b498957b7d306a2780255d8ed48e2dd7f794c90df49f9c202fe0cb5a5a5593117df4ff25d8b96b2572e4bd SHA512 a05a1a5a48584a90d2384543d88520f1759cab46923eb028914f68c7b1246440fb8a80c7927ba2cefe4f4945871247124c551b17b68db3101fb1c7c113744152 +EBUILD diamond-9999.ebuild 1900 BLAKE2B cdd17d24f9817cf9110aa198ca8f11d468deb5b162215fa2b5ecc2c82072f4ebdeb6751ba047b6392b69b9a90c438912dabd627ce54ad088bafb4ccf62fc4a3d SHA512 f595d59ab69d2deb704e6a1ea739540a7760a37c786ba3d0da509029bf367ebd855e131bf187c423443bd107ea5db30489b17053c959955bf242607b3f1dc59e +MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild new file mode 100644 index 000000000000..90c4c2549e94 --- /dev/null +++ b/app-admin/diamond/diamond-4.0-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git" + S=${WORKDIR}/diamond-${PV} +else + SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz" + KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + S=${WORKDIR}/Diamond-${PV} +fi + +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 eutils prefix + +DESCRIPTION="Python daemon that collects and publishes system metrics" +HOMEPAGE="https://github.com/python-diamond/Diamond" + +LICENSE="MIT" +SLOT="0" +IUSE="test mongo mysql snmp redis" + +RDEPEND="dev-python/configobj + dev-python/setproctitle + mongo? ( dev-python/pymongo ) + mysql? ( dev-python/mysql-python ) + snmp? ( dev-python/pysnmp ) + redis? ( dev-python/redis-py ) + !kernel_linux? ( >=dev-python/psutil-3 )" +DEPEND="${RDEPEND} + test? ( dev-python/mock )" + +src_prepare() { + # adjust for Prefix + hprefixify bin/diamond* + + # fix necessary to make handlers honour their config, simple sed + # doing the same as upstream + # https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch + sed -i \ + -e '/cls_name =/s/\.__class__//' \ + src/diamond/utils/classes.py \ + || die + + epatch "${FILESDIR}"/${P}-psutil.patch + + distutils-r1_src_prepare +} + +python_test() { + "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" +} + +python_install() { + export VIRTUAL_ENV=1 + distutils-r1_python_install + mv "${ED}"/usr/etc "${ED}"/ || die + rm "${ED}"/etc/diamond/*.windows # won't need these + sed -i \ + -e '/pid_file =/s:/var/run:/run:' \ + "${ED}"/etc/diamond/diamond.conf.example || die + hprefixify "${ED}"/etc/diamond/diamond.conf.example +} + +src_install() { + distutils-r1_src_install + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + keepdir /var/log/diamond +} diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild new file mode 100644 index 000000000000..6c874d48ed22 --- /dev/null +++ b/app-admin/diamond/diamond-4.0.515.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git" + S=${WORKDIR}/diamond-${PV} +else + SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + S=${WORKDIR}/Diamond-${PV} +fi + +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 prefix + +DESCRIPTION="Python daemon that collects and publishes system metrics" +HOMEPAGE="https://github.com/python-diamond/Diamond" + +LICENSE="MIT" +SLOT="0" +IUSE="test mongo mysql snmp redis" + +RDEPEND="dev-python/configobj + dev-python/setproctitle + mongo? ( dev-python/pymongo ) + mysql? ( dev-python/mysql-python ) + snmp? ( dev-python/pysnmp ) + redis? ( dev-python/redis-py ) + !kernel_linux? ( >=dev-python/psutil-3 )" +DEPEND="${RDEPEND} + test? ( + dev-python/mock + dev-python/pysnmp + )" + +src_prepare() { + # adjust for Prefix + hprefixify bin/diamond* + + # fix the version (not set in GitHub archive) + sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die + # fix symlink out of place + rm README.md || die + cp docs/index.md README.md || die + + distutils-r1_src_prepare +} + +python_test() { + # don't want to depend on docker for just this + mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die + # fails on binding ports + mv src/collectors/portstat/tests/{test,no}_portstat.py || die + "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" +} + +python_install() { + export VIRTUAL_ENV=1 + distutils-r1_python_install + mv "${ED}"/usr/etc "${ED}"/ || die + rm "${ED}"/etc/diamond/*.windows # won't need these + sed -i \ + -e '/pid_file =/s:/var/run:/run:' \ + "${ED}"/etc/diamond/diamond.conf.example || die + hprefixify "${ED}"/etc/diamond/diamond.conf.example +} + +src_install() { + distutils-r1_src_install + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + keepdir /var/log/diamond +} diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild new file mode 100644 index 000000000000..57df76bc0741 --- /dev/null +++ b/app-admin/diamond/diamond-9999.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git" + S=${WORKDIR}/diamond-${PV} +else + SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz" + KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + S=${WORKDIR}/Diamond-${PV} +fi + +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 prefix + +DESCRIPTION="Python daemon that collects and publishes system metrics" +HOMEPAGE="https://github.com/python-diamond/Diamond" + +LICENSE="MIT" +SLOT="0" +IUSE="test mongo mysql snmp redis" + +RDEPEND="dev-python/configobj + dev-python/setproctitle + mongo? ( dev-python/pymongo ) + mysql? ( dev-python/mysql-python ) + snmp? ( dev-python/pysnmp ) + redis? ( dev-python/redis-py ) + !kernel_linux? ( >=dev-python/psutil-3 )" +DEPEND="${RDEPEND} + test? ( + dev-python/mock + dev-python/pysnmp + )" + +src_prepare() { + # adjust for Prefix + hprefixify bin/diamond* + + distutils-r1_src_prepare +} + +python_test() { + # don't want to depend on docker for just this + mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die + # fails on binding ports + mv src/collectors/portstat/tests/{test,no}_portstat.py || die + "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" +} + +python_install() { + export VIRTUAL_ENV=1 + distutils-r1_python_install + mv "${ED}"/usr/etc "${ED}"/ || die + rm "${ED}"/etc/diamond/*.windows # won't need these + sed -i \ + -e '/pid_file =/s:/var/run:/run:' \ + "${ED}"/etc/diamond/diamond.conf.example || die + hprefixify "${ED}"/etc/diamond/diamond.conf.example +} + +src_install() { + distutils-r1_src_install + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + keepdir /var/log/diamond +} diff --git a/app-admin/diamond/files/diamond-4.0-psutil.patch b/app-admin/diamond/files/diamond-4.0-psutil.patch new file mode 100644 index 000000000000..e5f5d3bfb392 --- /dev/null +++ b/app-admin/diamond/files/diamond-4.0-psutil.patch @@ -0,0 +1,48 @@ +From 21ca284ffe6901b06e1136ce57dc07e0effd2a3e Mon Sep 17 00:00:00 2001 +From: Fabian Groffen +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 +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']: diff --git a/app-admin/diamond/files/diamond.confd b/app-admin/diamond/files/diamond.confd new file mode 100644 index 000000000000..ad9939223182 --- /dev/null +++ b/app-admin/diamond/files/diamond.confd @@ -0,0 +1,2 @@ +# command line options for running diamond +DIAMOND_OPTS= diff --git a/app-admin/diamond/files/diamond.initd b/app-admin/diamond/files/diamond.initd new file mode 100644 index 000000000000..168b175a788c --- /dev/null +++ b/app-admin/diamond/files/diamond.initd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --exec /usr/bin/diamond --pidfile /run/${SVCNAME}.pid -- -c /etc/diamond/${SVCNAME}.conf ${DIAMOND_OPTS} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop -R 80 --pidfile /run/${SVCNAME}.pid + eend $? +} diff --git a/app-admin/diamond/metadata.xml b/app-admin/diamond/metadata.xml new file mode 100644 index 000000000000..0198be759037 --- /dev/null +++ b/app-admin/diamond/metadata.xml @@ -0,0 +1,22 @@ + + + + + grobian@gentoo.org + Fabian Groffen + + + Diamond is a python daemon that collects system metrics and + publishes them to Graphite (and others). It is capable of + collecting cpu, memory, network, i/o, load and disk metrics. + Additionally, it features an API for implementing custom + collectors for gathering metrics from almost any source. + + + Enable MongoDB support + Enable Redis support + + + python-diamond/Diamond + + -- cgit v1.2.3