From 0cff41488436c7e9f8aa083e5974ba2537fca41e Mon Sep 17 00:00:00 2001 From: Evilham Date: Thu, 28 Apr 2022 17:28:46 +0200 Subject: [PATCH] [__jitsi_meet] Simplify exporter logic and update it to 1.2.0 This uses the newly merged __single_binary_service and: - Fixes the bug where once added, the exporter could not be removed - Simplifies keeping it up to date Sponsored by: camilion.eu, eXO.cat --- .../prometheus-jitsi-meet-explorer-version | 7 -- type/__jitsi_meet/manifest | 78 +++++-------------- 2 files changed, 18 insertions(+), 67 deletions(-) delete mode 100755 type/__jitsi_meet/explorer/prometheus-jitsi-meet-explorer-version diff --git a/type/__jitsi_meet/explorer/prometheus-jitsi-meet-explorer-version b/type/__jitsi_meet/explorer/prometheus-jitsi-meet-explorer-version deleted file mode 100755 index b1cec48..0000000 --- a/type/__jitsi_meet/explorer/prometheus-jitsi-meet-explorer-version +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -EXPORTER_VERSION_FILE="/usr/local/bin/.prometheus-jitsi-meet-exporter.cdist.version" - -if [ -f "${EXPORTER_VERSION_FILE}" ]; then - cat "${EXPORTER_VERSION_FILE}" -fi diff --git a/type/__jitsi_meet/manifest b/type/__jitsi_meet/manifest index 0b728c7..815d039 100755 --- a/type/__jitsi_meet/manifest +++ b/type/__jitsi_meet/manifest @@ -1,7 +1,6 @@ #!/bin/sh -e os="$(cat "${__global}/explorer/os")" -init="$(cat "${__global}/explorer/init")" case "${os}" in devuan|debian) ;; @@ -27,8 +26,6 @@ if [ -z "${TURN_SERVER}" ]; then TURN_SERVER="${JITSI_HOST}" fi -PROMETHEUS_JITSI_EXPORTER_IS_VERSION="$(cat "${__object}/explorer/prometheus-jitsi-meet-explorer-version")" - # The rest is loosely based on Jitsi's documentation # https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart @@ -203,65 +200,26 @@ export JITSI_HOST "${__type}/files/jicofo.conf.sh" | \ __file /etc/jitsi/jicofo/jicofo.conf --mode 0444 --source '-' + # These two should be changed on new release -PROMETHEUS_JITSI_EXPORTER_SHOULD_VERSION="1.1.5" -PROMETHEUS_JITSI_EXPORTER_CHECKSUM="sha256:3ddf43a48d9a2f62be1bc6db9e7ba75d61994f9423e5c5b28be019f41f06f745" -PROMETHEUS_JITSI_EXPORTER_URL="https://github.com/systemli/prometheus-jitsi-meet-exporter/releases/download/${PROMETHEUS_JITSI_EXPORTER_SHOULD_VERSION}/prometheus-jitsi-meet-exporter-linux-amd64" -PROMETHEUS_JITSI_EXPORTER_VERSION_FILE="/usr/local/bin/.prometheus-jitsi-meet-exporter.cdist.version" -if [ ! -f "${__object}/parameter/disable-prometheus-exporter" ]; then - case "${init}" in - init|sysvinit) - __runit - require="__runit" __runit_service \ - prometheus-jitsi-meet-exporter --log --source - <&1 -EOF - - export require="__runit_service/prometheus-jitsi-meet-exporter" - JITSI_MEET_EXPORTER_SERVICE="sv %s prometheus-jitsi-meet-exporter" - ;; - systemd) - __systemd_unit prometheus-jitsi-meet-exporter.service \ - --source "-" \ - --enablement-state "enabled" <