浏览代码

feat(jigasi): STATS_ID property for use with rtcstats (#2083)

Aaron van Meerten 2 周之前
父节点
当前提交
511c2f1d6e
共有 4 个文件被更改,包括 9 次插入0 次删除
  1. 1 0
      jigasi.yml
  2. 4 0
      jigasi/rootfs/defaults/sip-communicator.properties
  3. 3 0
      jigasi/rootfs/etc/cont-init.d/10-config
  4. 1 0
      transcriber.yml

+ 1 - 0
jigasi.yml

@@ -44,6 +44,7 @@ services:
             - JIGASI_SIP_PORT
             - JIGASI_SIP_PORT
             - JIGASI_SIP_TRANSPORT
             - JIGASI_SIP_TRANSPORT
             - JIGASI_SIP_DEFAULT_ROOM
             - JIGASI_SIP_DEFAULT_ROOM
+            - JIGASI_STATS_ID
             - JIGASI_XMPP_USER
             - JIGASI_XMPP_USER
             - JIGASI_XMPP_PASSWORD
             - JIGASI_XMPP_PASSWORD
             - JIGASI_BREWERY_MUC
             - JIGASI_BREWERY_MUC

+ 4 - 0
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 }}
 org.jitsi.jigasi.xmpp.acc.BOSH_URL_PATTERN={{ $BOSH_URL_PATTERN }}
 {{ end }}
 {{ end }}
 
 
+{{ if .Env.JIGASI_STATS_ID -}}
+org.jitsi.jigasi.STATS_ID={{ .Env.JIGASI_STATS_ID }}
+{{- end }}
+
 {{ if .Env.JIGASI_CONFIGURATION -}}
 {{ if .Env.JIGASI_CONFIGURATION -}}
 {{ join "\n" (splitList "," .Env.JIGASI_CONFIGURATION | compact) }}
 {{ join "\n" (splitList "," .Env.JIGASI_CONFIGURATION | compact) }}
 {{ end -}}
 {{ end -}}

+ 3 - 0
jigasi/rootfs/etc/cont-init.d/10-config

@@ -24,6 +24,9 @@ fi
 # set random jigasi nickname for the instance if is not set
 # set random jigasi nickname for the instance if is not set
 [ -z "${JIGASI_INSTANCE_ID}" ] && export JIGASI_INSTANCE_ID="jigasi-$(date +%N)"
 [ -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
 # 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 [ -n "$AUTOSCALER_URL" ]; then
     if [ -z "$AUTOSCALER_SIDECAR_KEY_FILE" ]; then
     if [ -z "$AUTOSCALER_SIDECAR_KEY_FILE" ]; then

+ 1 - 0
transcriber.yml

@@ -37,6 +37,7 @@ services:
             - JIGASI_XMPP_USER
             - JIGASI_XMPP_USER
             - JIGASI_XMPP_PASSWORD
             - JIGASI_XMPP_PASSWORD
             - JIGASI_BREWERY_MUC
             - JIGASI_BREWERY_MUC
+            - JIGASI_STATS_ID
             - JIGASI_TRANSCRIBER_ADVERTISE_URL
             - JIGASI_TRANSCRIBER_ADVERTISE_URL
             - JIGASI_TRANSCRIBER_CUSTOM_SERVICE
             - JIGASI_TRANSCRIBER_CUSTOM_SERVICE
             - JIGASI_TRANSCRIBER_CUSTOM_TRANSLATION_SERVICE
             - JIGASI_TRANSCRIBER_CUSTOM_TRANSLATION_SERVICE