diff --git a/jigasi.yml b/jigasi.yml index f97279e..326accb 100644 --- a/jigasi.yml +++ b/jigasi.yml @@ -44,6 +44,7 @@ services: - JIGASI_SIP_PORT - JIGASI_SIP_TRANSPORT - JIGASI_SIP_DEFAULT_ROOM + - JIGASI_STATS_ID - JIGASI_XMPP_USER - JIGASI_XMPP_PASSWORD - JIGASI_BREWERY_MUC diff --git a/jigasi/rootfs/defaults/sip-communicator.properties b/jigasi/rootfs/defaults/sip-communicator.properties index 0b64897..7323d2d 100644 --- a/jigasi/rootfs/defaults/sip-communicator.properties +++ b/jigasi/rootfs/defaults/sip-communicator.properties @@ -65,6 +65,10 @@ org.jitsi.jigasi.LOCAL_REGION={{ $JIGASI_LOCAL_REGION }} org.jitsi.jigasi.xmpp.acc.BOSH_URL_PATTERN={{ $BOSH_URL_PATTERN }} {{ end }} +{{ if .Env.JIGASI_STATS_ID -}} +org.jitsi.jigasi.STATS_ID={{ .Env.JIGASI_STATS_ID }} +{{- end }} + {{ if .Env.JIGASI_CONFIGURATION -}} {{ join "\n" (splitList "," .Env.JIGASI_CONFIGURATION | compact) }} {{ end -}} diff --git a/jigasi/rootfs/etc/cont-init.d/10-config b/jigasi/rootfs/etc/cont-init.d/10-config index 15c4974..b2aa965 100644 --- a/jigasi/rootfs/etc/cont-init.d/10-config +++ b/jigasi/rootfs/etc/cont-init.d/10-config @@ -24,6 +24,9 @@ fi # set random jigasi nickname for the instance if is not set [ -z "${JIGASI_INSTANCE_ID}" ] && export JIGASI_INSTANCE_ID="jigasi-$(date +%N)" +# set stats id for the instance +[ -z "${JIGASI_STATS_ID}" ] && export JIGASI_STATS_ID="$JIGASI_INSTANCE_ID" + # check for AUTOSCALER_URL, AUTOSCALER_SIDECAR_KEY_FILE and AUTOSCALER_SIDECAR_KEY_ID as indicator that sidecar should be enabled if [ -n "$AUTOSCALER_URL" ]; then if [ -z "$AUTOSCALER_SIDECAR_KEY_FILE" ]; then diff --git a/transcriber.yml b/transcriber.yml index 5d6f7bb..9cd1f7c 100644 --- a/transcriber.yml +++ b/transcriber.yml @@ -37,6 +37,7 @@ services: - JIGASI_XMPP_USER - JIGASI_XMPP_PASSWORD - JIGASI_BREWERY_MUC + - JIGASI_STATS_ID - JIGASI_TRANSCRIBER_ADVERTISE_URL - JIGASI_TRANSCRIBER_CUSTOM_SERVICE - JIGASI_TRANSCRIBER_CUSTOM_TRANSLATION_SERVICE