Merge pull request 'feature/update-various-metrics' (#119) from feature/update-various-metrics into master
Some checks failed
continuous-integration/drone/push Build is failing

Reviewed-on: #119
This commit is contained in:
Manuel Friedli 2023-05-29 00:21:43 +02:00
commit 5b91525650
8 changed files with 60 additions and 14 deletions

View file

@ -2,8 +2,8 @@ AUX apache_exporter.confd 59 BLAKE2B 4466ae408352adc136fa882cf382c1562e8e0b6401e
AUX apache_exporter.initd 650 BLAKE2B 86d014a2bb4f98a54a5e98060884bb99d1ec4011ce028a981d9d39cc5a5292c39018a80df2a3f0ad4b97aa1a0da059e89ad151f0a0b3d13d6ba6386aa4a9d6d4 SHA512 42367bb35b79cb3c4946ae57e81fa918d94b9b5613469e1e070797ffc9ab7ae74aaa3ad244be35cef8fe5df043fb5e1a604449c3a416e01da7cb11ad95c2b5b1
AUX apache_exporter.service 196 BLAKE2B b7429d240256bdbe594741900bd1715d7806f604d420b668c83ed2b4f66b32ba1ff142a54e04687182c0b24f43d58c6d74f5b319d69aaa4619d4b561a9567913 SHA512 a93847eb9407e94388a606972373a2e9c51ca46f16b8a87365d8544b680d1d0fbf47a6eb86865621375015a58c8b6480aeefa247f37c31fa0a84383a27a915f7
AUX sysconfig.apache_exporter 11 BLAKE2B e83c8a1c6cf0d2269d032d80bfb5f37969adce8655298d49f942e19318e1fcabe7f618514ce65d9e0209959d5ccb38141e81fcccd65a754584eaf2db3b4fbd03 SHA512 f4d982f86de30c5b52b04c201cd38fffa87f860bef18af6ab85e856ae2081b919256b918b5f4821ee2fc4da0548d1a95c2522b29cddca57f694e2f26c1b1b2b9
DIST apache_exporter-0.11.0-deps.tar.xz 23603784 BLAKE2B b2e8f25b73dfc84a7108c42780ebb38412925218d11b18ce26f83c504d937b7ac026152e78913d71b92247d4514e0bf06f7d52267bbd5861e5fb1585e2651008 SHA512 8e1ece3be69284c0a0513c3aa18411f0ab9ff2f300b03ff0fea527413c4f4ae3a88287973fef2140497ad4298a2fb4f88c5476b0ef35870730c7e6ebc329d154
DIST apache_exporter-0.11.0.tar.gz 41172 BLAKE2B 7c03a62ad8d7c76c80fcd7bac6c73079ef6caf7d0924c00559d788cdab98d89342e453056e52ad7d5f908521fdebaf99b8103c69fa46e0da15789cca0e74e5e9 SHA512 98ba30804bbd9a46ff0728e8bd8b02f6820492e0e44a60122acc9727c4e3fbabefb135f66ee36820e90cf6322b5e7335578eb8568a8f1fe6aead279a050e8208
EBUILD apache_exporter-0.11.0.ebuild 981 BLAKE2B 8cee3805db997b416f0a8a5837a75a23bf6abd79bf7c2379a2e48022be7db33d279a9623290cd85c2f9ca9bca59902562442c73173cd821530b92b60bc55b373 SHA512 efe2729cc237aef147552ead474637999f2a8f2872e2b0065373f50b8c6db27f8896049a4ca1f5825a3006a2cc64500a602ad1f79a85d7eae391e29de9fbd52f
DIST apache_exporter-0.13.3-vendor.tar.xz 1311036 BLAKE2B d42c00dcb2617c2df730147f8711cea23bdfe231b4b27bca3962dc0c4396835bc520150758befc984e861f6d89e933c4a62990dd0b11fcd3119e73eb2c6b9b16 SHA512 09c221e21d49d3e9a3c4511b5122a36445ad877c34e3ce38e3600f98468588ccbaa185bd99fbc191e61a165c73306eb48d9ba4717bcccacc67defa4aaa45e97e
DIST apache_exporter-0.13.3.tar.gz 21352 BLAKE2B 159817b02e8721ab67745b586f9853ec2334ce43986cdfb42edfb372c8f7d873223918984aff5e01f4f2c998bdb743fe8ac28b463811a27fdf10a2bde5a04f3b SHA512 948190d1d97b13b1bbaba644941bbba960caea753806542211fbce33d783e5b53e01a02ab7de242965c83d336cb31b08556ee4a8caef5ff78607cc24601b7118
EBUILD apache_exporter-0.13.3.ebuild 983 BLAKE2B 475ca32da293ac16e95c54fe25250a079eb839b27097f13881768e3a2e1623964221ec32b90bc26ae82d01f87f1234030515307b9b06e547221750034c403389 SHA512 875befb9bbc4e6b564fc06a56ca3b684c52595adf44f4014bd415c38e34807b84097bd15566de675d224ac654c0ba811efda447bc35dffcace3b12b99870635d
MISC ChangeLog 1784 BLAKE2B 711840e812185617076bb46a0932cf788ecb858410369aef3032da3e5a4a655f004d6f03fe2ea978d60e67bed11fc38632c2b794e9e344e14a85e6c5e8722886 SHA512 b95c61c77c453a542a101ae5aeb017b5801b6fe79a427cf1f1667e66956c94bc03e3ad49b75b2bdfaf33ad977fa1a9ff152fc782d2b223a21d4f3ffb82d2186d
MISC metadata.xml 337 BLAKE2B bd72b6097fead5eaf80082790d3712ae0893b118140b62f58639f0e5c56bebf57dbd0ccd0ea19af82b2dce88c88c494d88290f98df4818e4fad3f4386398d171 SHA512 aee4825d8b90a8fd84fb558b9af4b7eb889fcf81bae6c7b317a9d69f62b06dd0f0bc2aa91aa2c32f10ff91fdbf64b341d7e5adc3c65a5225c7e0e92d7a6b7816

View file

@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -7,7 +7,7 @@ inherit go-module systemd
DESCRIPTION="Prometheus exporter for apache metrics"
HOMEPAGE="https://github.com/Lusitaniae/apache_exporter"
SRC_URI="https://github.com/Lusitaniae/apache_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI+=" https://manuel.friedli.info/gentoo-overlay/${P}-deps.tar.xz"
SRC_URI+=" https://manuel.friedli.info/gentoo-overlay/${P}-vendor.tar.xz"
LICENSE="MIT"
SLOT="0"

View file

@ -4,7 +4,8 @@ AUX mysqld_exporter-r1.initd 2050 BLAKE2B f36d0d954e577f939f613887f86952ebf24602
AUX mysqld_exporter.confd 891 BLAKE2B 340b8d6b5f3fdc0a52851197cfd94b1d9d20fa3cda349c581a016c6cc7edd53cb7d86b634487551f916fd5c84294add402397cb9bf0fc2efb211b589dd571dd2 SHA512 ed4f949c8f5f88ad54c536342adf90be5d74922b54c383735a957e571aba341057830c7e8cdc0e45b53e439c5297d3ad70ba7bd178f77d10615787ed51bcc03f
AUX mysqld_exporter.logrotate 68 BLAKE2B 04a9a0df5dae2a2afd3374cd6f6fd5d04df7629bc85ed63792ecc9e2b4772668d1f5b1fe4baf14b17c26a495ffa1ed3a7d748719db9a72f427587243505158d1 SHA512 3eb2e6bfa0eae0847c0b1e2e7fd990068cb0ad570d14463c88a8860d70ebc378b2e3bc4141f0a98e95304c972c765ae48dbff726b208ba825fe1f4e58765e462
AUX mysqld_exporter.service 200 BLAKE2B 1053fe71dd3a1066ad5512f8ad2b40e34411365816b40f9c8f79b49a125099d0dc479c8cafce4ef4a5ca214859100324d04a1d429403dd08c4107e013f221acf SHA512 aaf7d1eb499aea03b435be24c0949f503f69759ce3507ccf08b81136ccde19d7720f42892924a701931a5ce8fdf297bf889725b789a538fed5e2f87568a95e38
DIST mysqld_exporter-0.12.1_p20200622.tar.gz 1640334 BLAKE2B fa52fd7474af548bc9429026d7c92bc543cff7f2e2f5e17007a52adc647d6d022a4ec9d099376cc469b4fdc8bab285e0e699a1b10938fc6b7a6704dcc1466a50 SHA512 ccac9a718214c9ab82362deeb81949cecaa6c2fc6567ef7e3d099ca2dbf8385cb9c498837e41ad0bcdf5ec2c9d82fd159792245b97e53c182a30917e80a20cf1
EBUILD mysqld_exporter-0.12.1_p20200622-r1.ebuild 2124 BLAKE2B 3f562674f8fced90187c842a37c9693679a381aa287d4e2f318cbf98a3728410e4d68cf17a0c55bc2b7e1adf9803f73373fe03ca91d0f49f593285de2ecf69c6 SHA512 6933c29436c2f0ea48b5e58608c9b5d8a7de7f7bf7c10d17ef4c6380844ca82faa7ef301d2dc596deb1070494dc43225d309fe32955e32accd04965804a86c70
DIST mysqld_exporter-0.14.0_p20230328.tar.gz 92865 BLAKE2B 490219444b14006a356fa423b21c851693cf97f9aa6a9d20e8ee732ae8af5aed07aeda04a3419aebe26051f00c60f5655c3479c4ec3d5a2c9c18b44218cdc3b4 SHA512 a12aeb676ba81732310599344292f8cd5680abd14d8b380ae2d57198530de1969a5712619eca195e5d7b65abf518de7877789f494a9a4fbcebf42e3c8e35dac8
DIST mysqld_exporter-fad2c0ccd8c0df8fed91a81463e930e4485fdfee-vendor.tar.xz 1473744 BLAKE2B 64f4f9dfee04522dbebdc9682c2619cc0f5c63b0835cfca50a37d0cce542e6a926968e23fe94a13d2e76cfbf931026cdcff74823c6c464b1b2f551bf0c70a5cf SHA512 aa10101fd5bc5a2fdef367c855f85d10ebb38b8a92969c5ebf786f011a287f9992559805b8ed24ea39da4db8aedbaf12893a2c6049ea7e90e989adf1ed13d79f
EBUILD mysqld_exporter-0.14.0_p20230328.ebuild 2589 BLAKE2B 439197edcf1c0d9df088a27a05950f5a6073052eae709442feacb2249e75975aa529cc8e402cfd94527995945965e123cf436ecc88dedbe58adbf8b08e1707c2 SHA512 20322795b40814972ddc6a57515251f3b358fb84886b60f44d973315a453d05c460cb5d118948e5f5ceb4db1b7d034110a54f16a3e996a003756af811b56010c
MISC ChangeLog 733 BLAKE2B f524170f97aac958542aa79a0c383e2d018bb8aa7a886f34b8f801bd95199e6fec3d065b53ad91b793d48979fc33a8915a3d499eed52e3ea82fa2ae0ad1422d1 SHA512 9eb13634368e353219cf63f07167fb5841bd90041e6d2e1bb1026a37cb6dd141f016c07442547a1a3d79b290e478f27f80a8238725f92988e752342a58561da6
MISC metadata.xml 339 BLAKE2B cc95303dfddecf9c81e77995bca8719a87cc74b9c3a95142bea4bc13d9fba4767ea7d5bdc56731e45f59a27a66dfd1e7ecb6924c737961ff30cd690c9ab250b5 SHA512 21cf66c2810306d975812118206a29d21f8ae3ed887c41c43fc66603a5901e261fe86d80e04160a7a31eaceec759f128e09b127a7c885fea0a3d06415743d022

View file

@ -2,17 +2,30 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit go-module systemd
# uncomment the first setting of MY_PV for a normal release
# MY_PV="v${PV/_rc/-rc.}"
# set MY_PV to the full commit hash for a snapshot release
MY_PV=f5d5289f7627016d8b53b0b3fa7615da8a73b56a
MYSQLD_EXPORTER_COMMIT=f5d5289f
MY_PV_HASH=fad2c0ccd8c0df8fed91a81463e930e4485fdfee
: ${MY_PV_HASH_FOR_VENDOR:=${MY_PV_HASH}}
if [[ -n "${MY_PV_HASH}" ]]; then
MY_PV=${MY_PV_HASH}
MYSQLD_EXPORTER_COMMIT=${MY_PV_HASH:0:8}
SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/${MY_PV}.tar.gz"
else
MY_PV=$PV
MYSQLD_EXPORTER_COMMIT=
SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/refs/tags/v${PV}.tar.gz"
fi
MY_P=${PN}-${MY_PV}
SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"
DESCRIPTION="Prometheus exporter for MySQL server metrics"
HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
SRC_URI="https://github.com/prometheus/mysqld_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
SRC_URI="
${SRC_URI_UPSTREAM} -> ${P}.tar.gz
${SRC_URI_VENDOR}
"
LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
SLOT="0"
@ -34,7 +47,9 @@ PATCHES=( "${FILESDIR}"/${PN}-0.12.1-skip-tests.patch )
src_prepare() {
default
if [[ -n $MYSQLD_EXPORTER_COMMIT ]]; then
sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" .promu.yml || die
fi
}
src_compile() {

View file

@ -4,5 +4,5 @@ EAPI=8
INHERIT=acct-group
KEYWORDS=~amd64
SLOT=0
_eclasses_=user-info 83547b4df3e1ba5a6bf91a0837eaa664 acct-group c5bc6ab32cd6552df855b3fd22968f98
_eclasses_=user-info 83547b4df3e1ba5a6bf91a0837eaa664 acct-group 0bb035239369b7d25470e1b94989c2e7
_md5_=6223075d6587ef091669de9ca0d2fa63

View file

@ -5,5 +5,5 @@ INHERIT=acct-user
KEYWORDS=~amd64
RDEPEND=acct-group/apache_exporter
SLOT=0
_eclasses_=user-info 83547b4df3e1ba5a6bf91a0837eaa664 acct-user c2c51a8d8c646fbdbb4ae481366fca8c
_eclasses_=user-info 83547b4df3e1ba5a6bf91a0837eaa664 acct-user 952da1a27155226a1649650b8686da06
_md5_=75d24045e06b0a8e4cfe6b6e58a1c9d9

View file

@ -0,0 +1,15 @@
BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
DEFINED_PHASES=compile install unpack
DEPEND=acct-group/apache_exporter acct-user/apache_exporter
DESCRIPTION=Prometheus exporter for apache metrics
EAPI=8
HOMEPAGE=https://github.com/Lusitaniae/apache_exporter
INHERIT=go-module systemd
KEYWORDS=~amd64
LICENSE=MIT
RDEPEND=acct-group/apache_exporter acct-user/apache_exporter
RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/Lusitaniae/apache_exporter/archive/v0.13.3.tar.gz -> apache_exporter-0.13.3.tar.gz https://manuel.friedli.info/gentoo-overlay/apache_exporter-0.13.3-vendor.tar.xz
_eclasses_=multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e multilib 104e1332efb829e2f7cbf89307a474f1 go-module 9c75e51a48520b2f01471c1f91762882 systemd 5f4bb0758df2e483babf68cd517078ca
_md5_=b57e4e0ff138ae5f2618664d4b1b28cb

View file

@ -0,0 +1,15 @@
BDEPEND=dev-util/promu >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
DEFINED_PHASES=compile install postinst prepare unpack
DEPEND=acct-group/mysqld_exporter acct-user/mysqld_exporter
DESCRIPTION=Prometheus exporter for MySQL server metrics
EAPI=8
HOMEPAGE=https://github.com/prometheus/mysqld_exporter
INHERIT=go-module systemd
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
RDEPEND=acct-group/mysqld_exporter acct-user/mysqld_exporter
RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/prometheus/mysqld_exporter/archive/fad2c0ccd8c0df8fed91a81463e930e4485fdfee.tar.gz -> mysqld_exporter-0.14.0_p20230328.tar.gz https://dev.gentoo.org/~robbat2/distfiles/mysqld_exporter-fad2c0ccd8c0df8fed91a81463e930e4485fdfee-vendor.tar.xz
_eclasses_=multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 14a8ae365191b518fad51caad7a08f3e multilib 104e1332efb829e2f7cbf89307a474f1 go-module 9c75e51a48520b2f01471c1f91762882 systemd 5f4bb0758df2e483babf68cd517078ca
_md5_=3ff4c2be3ebc2f673a7e8c96c4a51bb7