From acdfdbb23573cdf669ba3b3565fc2d7368893ca8 Mon Sep 17 00:00:00 2001 From: Guy Godfroy Date: Thu, 19 Dec 2024 08:33:55 +0000 Subject: [PATCH] testing/cortex-tenant: add config file --- testing/cortex-tenant/APKBUILD | 11 +++++++---- testing/cortex-tenant/cortex-tenant.confd | 1 + testing/cortex-tenant/cortex-tenant.initd | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/testing/cortex-tenant/APKBUILD b/testing/cortex-tenant/APKBUILD index 9fdf44306c3..4f5f4890aa2 100644 --- a/testing/cortex-tenant/APKBUILD +++ b/testing/cortex-tenant/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Guy Godfroy pkgname=cortex-tenant pkgver=1.15.2 -pkgrel=0 +pkgrel=1 pkgdesc="Prometheus remote write proxy that adds Cortex/Mimir tenant ID based on metric labels" url="https://github.com/blind-oracle/cortex-tenant" arch="all" @@ -26,15 +26,18 @@ check() { } package() { - install -m755 -D cortex-tenant "$pkgdir"/usr/bin/cortex-tenant + install -m755 -D cortex-tenant \ + "$pkgdir"/usr/bin/cortex-tenant install -m755 -D "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd \ "$pkgdir"/etc/conf.d/$pkgname + install -m644 -D config.yml \ + "$pkgdir"/etc/cortex-tenant/config.yml } sha512sums=" e34a25915ecdcb9ae4b26eb5c8a42b8fffb473457b77dc45c8c08ab0174367b488b80c2c6a9f725cd7c5be1ce26d4ae9650b165b91068d443904ec44049e63b6 cortex-tenant-1.15.2.tar.gz -c802a2170c9e66621d8fd312e0ec94105a17848d95912f609013e5779f13ece0320e998e96eb34c5f6e1308215b3c6e49096799aae3ebdd90feecc1a019b9daf cortex-tenant.initd -4b1f5249a91f34aca42111147a33b83462e8405de3fee5ef97ba77a1e1abe4eb15c21a3ef34527ad9ddc2f691f3aa2f0f620d5168a26ae9ed32de839efacc5c2 cortex-tenant.confd +3e98a5ac1867fef7b5aa6e2a1b96f4525cd3b71c319f61c2af8ba65b1dfd825bd5691174bb12f85a77c4984c407f5c377d8aa6b9426e4faeaeeb8afe40aa029e cortex-tenant.initd +e9f63683b488fb288db46d34546f39b01013bde41431660158c02d0de58bd3a259fb51a186ab7d5d7a489047b89fa0e4416915380df3697dc078548d39d596a4 cortex-tenant.confd " diff --git a/testing/cortex-tenant/cortex-tenant.confd b/testing/cortex-tenant/cortex-tenant.confd index ef329827b39..6c6ba4e1be0 100644 --- a/testing/cortex-tenant/cortex-tenant.confd +++ b/testing/cortex-tenant/cortex-tenant.confd @@ -5,6 +5,7 @@ # Additional arguments for cortex-tenant daemon. #command_args= +CONFIGFILE=/etc/cortex-tenant/config.yml # Comment out to disable process supervisor. supervisor=supervise-daemon diff --git a/testing/cortex-tenant/cortex-tenant.initd b/testing/cortex-tenant/cortex-tenant.initd index 0cc97ac4f37..c8bb780df48 100644 --- a/testing/cortex-tenant/cortex-tenant.initd +++ b/testing/cortex-tenant/cortex-tenant.initd @@ -6,7 +6,7 @@ description="Prometheus remote write proxy that adds Cortex/Mimir tenant ID base : ${command_user:="cortex-tenant"} command="/usr/bin/cortex-tenant" -command_args="command_args" +command_args="-config $CONFIGFILE $command_args" command_background="yes" pidfile="/run/$RC_SVCNAME.pid"