[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus-mysqld_exporter/files/, ...
commit: 3b5a75f9855f432d9201bd3b3a1bb1f7c4b6b7d2 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Apr 4 01:48:51 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Apr 4 01:50:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5a75f9 app-metrics/mysqld_exporter: Move package from app-metrics/prometheus-mysqld_exporter Package-Manager: Portage-2.3.26, Repoman-2.3.7 app-metrics/mysqld_exporter/Manifest | 1 + .../files/mysqld_exporter-r1.initd} | 4 ++-- .../files/mysqld_exporter.confd} | 8 .../files/mysqld_exporter.logrotate} | 0 .../{prometheus-mysqld_exporter => mysqld_exporter}/metadata.xml | 0 .../mysqld_exporter-0.10.0-r1.ebuild} | 0 app-metrics/prometheus-mysqld_exporter/Manifest | 1 - profiles/updates/2Q-2018 | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app-metrics/mysqld_exporter/Manifest b/app-metrics/mysqld_exporter/Manifest new file mode 100644 index 000..e55c4730f1b --- /dev/null +++ b/app-metrics/mysqld_exporter/Manifest @@ -0,0 +1 @@ +DIST mysqld_exporter-0.10.0.tar.gz 971604 BLAKE2B ec077b7b6a15f6173e5cc04e741c51c4d26a214601da8eb1aede49ee325f52bea2140b8e5b3bdbc2a1e527e40c95099dca2a57501d44a26e787cdc330f4aa8b8 SHA512 0a7b0ff537ad59a9b64aa18dfe1d1eb9253b12ae566d5c151555fbd4457b7e65890b6569632b452ae317b3acbfa94c12d96f6fb6e4f982b9b2161fc4747330f5 diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd b/app-metrics/mysqld_exporter/files/mysqld_exporter-r1.initd similarity index 94% rename from app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd rename to app-metrics/mysqld_exporter/files/mysqld_exporter-r1.initd index 07d0483022c..0aecd1025b8 100644 --- a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter-r1.initd +++ b/app-metrics/mysqld_exporter/files/mysqld_exporter-r1.initd @@ -5,8 +5,8 @@ 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_USER=${EXPORTER_USER:-"mysqld_exporter"} +EXPORTER_GROUP=${EXPORTER_GROUP:-"mysqld_exporter"} EXPORTER_PIDFILE=${EXPORTER_PIDFILE:-"/run/${RC_SVCNAME}.pid"} EXPORTER_SSDARGS=${EXPORTER_SSDARGS:-"--wait 1000"} EXPORTER_TERMTIMEOUT=${EXPORTER_TERMTIMEOUT:-"TERM/60/KILL/5"} diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd b/app-metrics/mysqld_exporter/files/mysqld_exporter.confd similarity index 79% rename from app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd rename to app-metrics/mysqld_exporter/files/mysqld_exporter.confd index 811a48f31af..249ed7ea4aa 100644 --- a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd +++ b/app-metrics/mysqld_exporter/files/mysqld_exporter.confd @@ -1,4 +1,4 @@ -# /etc/conf.d/prometheus-mysqld_exporter +# /etc/conf.d/mysqld_exporter # PID file #EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid" @@ -9,10 +9,10 @@ #EXPORTER_TERMTIMEOUT="TERM/60/KILL/5" # User to run exporter as -#EXPORTER_USER="prometheus-mysqld_exporter" +#EXPORTER_USER="mysqld_exporter" # User group to run exporter as -#EXPORTER_GROUP="prometheus-mysqld_exporter" +#EXPORTER_GROUP="mysqld_exporter" # You can use this configuration option to pass additional options to the # start-stop-daemon, see start-stop-daemon(8) for more details. @@ -21,6 +21,6 @@ #EXPORTER_SSDARGS="--wait 1000" # Exporter flags -# See `prometheus-mysqld-exporter --help` for more details +# See `mysqld_exporter --help` for more details EXPORTER_FLAGS="-log.level=info" #EXPORTER_FLAGS="${EXPORTER_FLAGS} -yourAdditionalFlag" diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.logrotate b/app-metrics/mysqld_exporter/files/mysqld_exporter.logrotate similarity index 100% rename from app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.logrotate rename to app-metrics/mysqld_exporter/files/mysqld_exporter.logrotate diff --git a/app-metrics/prometheus-mysqld_exporter/metadata.xml b/app-metrics/mysqld_exporter/metadata.xml similarity index 100% rename from app-metrics/prometheus-mysqld_exporter/metadata.xml rename to app-metrics/mysqld_exporter/metadata.xml diff --git a/app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild b/app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild similarity index 100% rename from app-metrics/prometheus-mysqld_exporter/prometheus-mysqld_exporter-0.10.0-r1.ebuild rename to app-metrics/mysqld_exporter/mysqld_exporter-0.10.0-r1.ebuild diff --git a/app-metrics/pr
[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus-mysqld_exporter/files/
commit: 87c68809cee10bff305f03654f345fa9f31e4a40 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Mar 26 22:41:26 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Mar 26 22:41:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c68809 app-metrics/prometheus-mysqld_exporter: Fix comment in confd file Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd | 2 -- 1 file changed, 2 deletions(-) diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd index f55143b944e..811a48f31af 100644 --- a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd +++ b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd @@ -1,8 +1,6 @@ # /etc/conf.d/prometheus-mysqld_exporter # PID file -# If you should ever change this, remember to update -# "/etc/logrotate.d/rsyslog", too. #EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid" # The termination timeout (start-stop-daemon parameter "retry") ensures
[gentoo-commits] repo/gentoo:master commit in: app-metrics/prometheus-mysqld_exporter/files/, ...
commit: 101f87f123cbab566f5986c4f056a1c39f41e273 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Mar 26 22:38:59 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Mar 26 22:39:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=101f87f1 app-metrics/prometheus-mysqld_exporter: Initial version Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-metrics/prometheus-mysqld_exporter/Manifest| 1 + .../files/prometheus-mysqld_exporter.confd | 28 + .../files/prometheus-mysqld_exporter.initd | 68 ++ .../files/prometheus-mysqld_exporter.logrotate | 5 ++ .../prometheus-mysqld_exporter/metadata.xml| 11 .../prometheus-mysqld_exporter-0.10.0.ebuild | 61 +++ 6 files changed, 174 insertions(+) diff --git a/app-metrics/prometheus-mysqld_exporter/Manifest b/app-metrics/prometheus-mysqld_exporter/Manifest new file mode 100644 index 000..fe49b6e44fd --- /dev/null +++ b/app-metrics/prometheus-mysqld_exporter/Manifest @@ -0,0 +1 @@ +DIST prometheus-mysqld_exporter-0.10.0.tar.gz 971604 BLAKE2B ec077b7b6a15f6173e5cc04e741c51c4d26a214601da8eb1aede49ee325f52bea2140b8e5b3bdbc2a1e527e40c95099dca2a57501d44a26e787cdc330f4aa8b8 SHA512 0a7b0ff537ad59a9b64aa18dfe1d1eb9253b12ae566d5c151555fbd4457b7e65890b6569632b452ae317b3acbfa94c12d96f6fb6e4f982b9b2161fc4747330f5 diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd new file mode 100644 index 000..f55143b944e --- /dev/null +++ b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.confd @@ -0,0 +1,28 @@ +# /etc/conf.d/prometheus-mysqld_exporter + +# PID file +# If you should ever change this, remember to update +# "/etc/logrotate.d/rsyslog", too. +#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid" + +# The termination timeout (start-stop-daemon parameter "retry") ensures +# that the service will be terminated within a given time (60 + 5 seconds +# per default) when you are stopping the service. +#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5" + +# User to run exporter as +#EXPORTER_USER="prometheus-mysqld_exporter" + +# User group to run exporter as +#EXPORTER_GROUP="prometheus-mysqld_exporter" + +# You can use this configuration option to pass additional options to the +# start-stop-daemon, see start-stop-daemon(8) for more details. +# Per default we wait 1000ms after we have started the service to ensure +# that the daemon is really up and running. +#EXPORTER_SSDARGS="--wait 1000" + +# Exporter flags +# See `prometheus-mysqld-exporter --help` for more details +EXPORTER_FLAGS="-log.level=info" +#EXPORTER_FLAGS="${EXPORTER_FLAGS} -yourAdditionalFlag" diff --git a/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd new file mode 100644 index 000..10a7ac1f1ab --- /dev/null +++ b/app-metrics/prometheus-mysqld_exporter/files/prometheus-mysqld_exporter.initd @@ -0,0 +1,68 @@ +#!/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