From 1173ad5704ce725916e0c332416aff326d850d06 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Mar 2018 16:53:27 +0100 Subject: gentoo resync : 29.03.2018 --- app-metrics/Manifest.gz | Bin 1750 -> 1754 bytes app-metrics/prometheus-mysqld_exporter/Manifest | 4 +- .../files/prometheus-mysqld_exporter-r1.initd | 73 +++++++++++++++++++++ .../files/prometheus-mysqld_exporter.initd | 68 ------------------- .../prometheus-mysqld_exporter-0.10.0-r1.ebuild | 61 +++++++++++++++++ .../prometheus-mysqld_exporter-0.10.0.ebuild | 61 ----------------- 6 files changed, 136 insertions(+), 131 deletions(-) create mode 100644 app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd delete mode 100644 app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd create mode 100644 app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild delete mode 100644 app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0.ebuild (limited to 'app-metrics') diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz index e594bbe625f8..7e8c38e6fc2a 100644 Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ diff --git a/app-metrics/prometheus-mysqld_exporter/Manifest b/app-metrics/prometheus-mysqld_exporter/Manifest index 77ebb4f46a53..5d5d99eafcba 100644 --- a/app-metrics/prometheus-mysqld_exporter/Manifest +++ b/app-metrics/prometheus-mysqld_exporter/Manifest @@ -1,6 +1,6 @@ +AUX prometheus-mysqld_exporter-r1.initd 2073 BLAKE2B 1835f0d606ca7e20538e3d1ba454dbde42b22afe5e9f7a41292a94f935ac35c07ea797edc9b184e915e7ce4cf8558cf32996397842203f4ddb6c6d1a81107f47 SHA512 463271c71976aff2a9e51a24da3f9a775405edc16a727f466c6069360d8e0b6de0211d713491ba899e7ad4e3a44a5e3fa428ff4f39cb6dd5c0bbe5ff17185b19 AUX prometheus-mysqld_exporter.confd 935 BLAKE2B 10e6937bdeb7e462941ad0a12e9f748d653d5f03170156920eaaf7f275f3b7e31316dc4457129da9c86a3dd1eeaa7c5b442a3dc0c5623e9d8c599e8080cb05f9 SHA512 ec21a62cd9a58e16b4ee089570ac2c6872db241952809a211b278df750f732982a46d941fa50fab1ea4ca0dcdd782c754bd53d9042a2a1c22a37fd05a05e0ce9 -AUX prometheus-mysqld_exporter.initd 1993 BLAKE2B f084c1f4c0e2643b4b1eac18c0a240846099aadb7fcd4b158b6001b104850fa89cb7a5738c124096fdcb91ce158de59ce2554bf5ff5dc10b551b67710471f3a9 SHA512 0b263c286cb493ca536094999df9ed9d5c46ef296a8ac1c38cb1a45de8ed299d43d36eaefa945c14196a9e045e910bc3c24d2c64ea82e0e7d15f73aeaa35f878 AUX prometheus-mysqld_exporter.logrotate 68 BLAKE2B 04a9a0df5dae2a2afd3374cd6f6fd5d04df7629bc85ed63792ecc9e2b4772668d1f5b1fe4baf14b17c26a495ffa1ed3a7d748719db9a72f427587243505158d1 SHA512 3eb2e6bfa0eae0847c0b1e2e7fd990068cb0ad570d14463c88a8860d70ebc378b2e3bc4141f0a98e95304c972c765ae48dbff726b208ba825fe1f4e58765e462 DIST prometheus-mysqld_exporter-0.10.0.tar.gz 971604 BLAKE2B ec077b7b6a15f6173e5cc04e741c51c4d26a214601da8eb1aede49ee325f52bea2140b8e5b3bdbc2a1e527e40c95099dca2a57501d44a26e787cdc330f4aa8b8 SHA512 0a7b0ff537ad59a9b64aa18dfe1d1eb9253b12ae566d5c151555fbd4457b7e65890b6569632b452ae317b3acbfa94c12d96f6fb6e4f982b9b2161fc4747330f5 -EBUILD prometheus-mysqld_exporter-0.10.0.ebuild 1585 BLAKE2B 706eb1262e62918ebf1effb600ccebe73163a55a30dd9d14b71b418a8da0d059a1ccd7e0178cd31a3735c83803ea1e76d2cadce6d74193bf484704828b6748d9 SHA512 83325d18d6de9ffebcb6132ac1575765f1ab717f6df6e3a23aa96610b066aefa024ee8ee00403f1ac1d391be47add2bcec0a1cb4b0d1e5c238f9f5ac24420696 +EBUILD prometheus-mysqld_exporter-0.10.0-r1.ebuild 1564 BLAKE2B e7342d8cd4a1b80c4ab3379bc2a4167a6127685c34e520929d1095b04c348b57d9d082ff5daa87f32c46df9f3d252acb205c63fe5e8e0941d625b1b85753c2f8 SHA512 6c2d62e603163bfc42b2508765da807322cdaae0d4534a96a319c5f3751d0a52178d2e3c110fe50ed0b87e563a87c91a1d9009c881b84c64fe79699cc52c3dbf MISC metadata.xml 342 BLAKE2B c99db8a7ba47d8b948f5e8623c98ff234a67d14485a09a412d55155b878fe2cff4594934f2e1aef749072f4f52ca8c0b660e52764cc20b40aedc3ae2280d8fdd SHA512 55dcb15bda103364487e98359157961d7859af7e38cef4030e53fe2fb50ded0e34d27a1607171e62d60dd53e93b2cd1f30becded706dcb362ce3f45052cd0203 diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd new file mode 100644 index 000000000000..07d0483022c1 --- /dev/null +++ b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd @@ -0,0 +1,73 @@ +#!/sbin/openrc-run +# Copyright 2016-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Prometheus exporter for MySQL server metrics" + +EXPORTER_FLAGS=${EXPORTER_FLAGS:-""} +EXPORTER_USER=${EXPORTER_USER:-"prometheus-mysqld_exporter"} +EXPORTER_GROUP=${EXPORTER_GROUP:-prometheus-mysqld_exporter} +EXPORTER_PIDFILE=${EXPORTER_PIDFILE:-"/run/${RC_SVCNAME}.pid"} +EXPORTER_SSDARGS=${EXPORTER_SSDARGS:-"--wait 1000"} +EXPORTER_TERMTIMEOUT=${EXPORTER_TERMTIMEOUT:-"TERM/60/KILL/5"} + +command="/usr/bin/mysqld_exporter" +command_args="${EXPORTER_FLAGS}" +command_background="true" +start_stop_daemon_args="${EXPORTER_SSDARGS}" +start_stop_daemon_args="${start_stop_daemon_args} --user ${EXPORTER_USER}" +start_stop_daemon_args="${start_stop_daemon_args} --group ${EXPORTER_GROUP}" + +# We are forcing log files because upstream is going to remove syslog support :/ +start_stop_daemon_args="${start_stop_daemon_args} --stdout /var/log/mysqld_exporter/${RC_SVCNAME}.log" +start_stop_daemon_args="${start_stop_daemon_args} --stderr /var/log/mysqld_exporter/${RC_SVCNAME}.log" + +getconfig() { + local key="$1" + local value_default="$2" + local value= + + if service_started; then + value="$(service_get_value "${key}")" + fi + + if [ -z "${value}" ]; then + # Value not explicitly set + echo "${value_default}" + else + echo "${value}" + fi + + return 0 +} + +pidfile="$(getconfig pidfile ${EXPORTER_PIDFILE})" +retry="$(getconfig retry ${EXPORTER_TERMTIMEOUT})" + +configtest() { + if test "${command_args#*config\.my-cnf}" = "${command_args}"; then + local _default_config_file="/var/lib/mysqld_exporter/.my.cnf" + if [ ! -s "${_default_config_file}" ]; then + eerror "No MySQL credentials found in \"${_default_config_file}\"!" + eerror "Either create that file and add credentials or specify another file via \"-config.my-cnf\" flag." + return 1 + fi + fi + + return 0 +} + +depend() { + after net + use mysql +} + +start_pre() { + if [ "${RC_CMD}" != "restart" ]; then + configtest || return 1 + fi +} + +start_post() { + service_set_value retry "${EXPORTER_TERMTIMEOUT}" +} diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd deleted file mode 100644 index 10a7ac1f1ab3..000000000000 --- a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd +++ /dev/null @@ -1,68 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2016-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Prometheus exporter for MySQL server metrics" - -EXPORTER_FLAGS=${EXPORTER_FLAGS:-""} -EXPORTER_USER=${EXPORTER_USER:-"prometheus-mysqld_exporter"} -EXPORTER_GROUP=${EXPORTER_GROUP:-prometheus-mysqld_exporter} -EXPORTER_PIDFILE=${EXPORTER_PIDFILE:-"/run/${RC_SVCNAME}.pid"} -EXPORTER_SSDARGS=${EXPORTER_SSDARGS:-"--wait 1000"} -EXPORTER_TERMTIMEOUT=${EXPORTER_TERMTIMEOUT:-"TERM/60/KILL/5"} - -command="/usr/bin/mysqld_exporter" -command_args="${EXPORTER_FLAGS}" -command_background="true" -start_stop_daemon_args="${EXPORTER_SSDARGS}" -start_stop_daemon_args="${start_stop_daemon_args} --user ${EXPORTER_USER}" -start_stop_daemon_args="${start_stop_daemon_args} --group ${EXPORTER_GROUP}" - -# We are forcing log files because upstream is going to remove syslog support :/ -start_stop_daemon_args="${start_stop_daemon_args} --stdout /var/log/mysqld_exporter/${RC_SVCNAME}.log" -start_stop_daemon_args="${start_stop_daemon_args} --stderr /var/log/mysqld_exporter/${RC_SVCNAME}.log" - -getconfig() { - local key="$1" - local value_default="$2" - local value= - - if service_started; then - value="$(service_get_value "${key}")" - fi - - if [ -z "${value}" ]; then - # Value not explicitly set - echo "${value_default}" - else - echo "${value}" - fi - - return 0 -} - -pidfile="$(getconfig pidfile ${EXPORTER_PIDFILE})" -retry="$(getconfig retry ${EXPORTER_TERMTIMEOUT})" - -configtest() { - if test "${command_args#*config\.my-cnf}" = "${command_args}"; then - local _default_config_file="/var/lib/mysqld_exporter/.my.cnf" - if [ ! -s "${_default_config_file}" ]; then - eerror "No MySQL credentials found in \"${_default_config_file}\"!" - eerror "Either create that file and add credentials or specify another file via \"-config.my-cnf\" flag." - return 1 - fi - fi - - return 0 -} - -depend() { - after net -} - -start_pre() { - if [ "${RC_CMD}" != "restart" ]; then - configtest || return 1 - fi -} diff --git a/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild b/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild new file mode 100644 index 000000000000..77a69fda97f7 --- /dev/null +++ b/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +inherit user golang-build golang-vcs-snapshot + +EGO_PN="github.com/prometheus/mysqld_exporter" +EGIT_COMMIT="v${PV/_rc/-rc.}" +MYSQLD_EXPORTER_COMMIT="8068006" +ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="Prometheus exporter for MySQL server metrics" +HOMEPAGE="https://github.com/prometheus/mysqld_exporter" +SRC_URI="${ARCHIVE_URI}" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +DEPEND="dev-util/promu" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/mysqld_exporter ${PN} +} + +src_prepare() { + default + sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die +} + +src_compile() { + pushd src/${EGO_PN} || die + mkdir -p bin || die + GOPATH="${S}" promu build -v --prefix bin || die + popd || die +} + +src_install() { + pushd src/${EGO_PN} || die + dobin bin/mysqld_exporter + dodoc {README,CHANGELOG,CONTRIBUTING}.md + popd || die + + keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter + fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter + fperms 0770 /var/lib/mysqld_exporter + + newinitd "${FILESDIR}"/${PN}-r1.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/${PN}.logrotate ${PN} +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + elog "Create \"${EROOT%/}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file." + fi +} diff --git a/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0.ebuild b/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0.ebuild deleted file mode 100644 index c7e66857e6ad..000000000000 --- a/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit user golang-build golang-vcs-snapshot - -EGO_PN="github.com/prometheus/mysqld_exporter" -EGIT_COMMIT="v${PV/_rc/-rc.}" -MYSQLD_EXPORTER_COMMIT="8068006" -ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - -DESCRIPTION="Prometheus exporter for MySQL server metrics" -HOMEPAGE="https://github.com/prometheus/mysqld_exporter" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -DEPEND="dev-util/promu" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/mysqld_exporter ${PN} -} - -src_prepare() { - default - sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die -} - -src_compile() { - pushd src/${EGO_PN} || die - mkdir -p bin || die - GOPATH="${S}" promu build -v --prefix mysqld_exporter || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dobin mysqld_exporter/mysqld_exporter - dodoc {README,CHANGELOG,CONTRIBUTING}.md - popd || die - - keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter - fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter - fperms 0770 /var/lib/mysqld_exporter - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/${PN}.logrotate ${PN} -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Create \"${EROOT%/}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file." - fi -} -- cgit v1.2.3