From 998ca69ddfa38a3b7d08f17038e33e0558df8fcd Mon Sep 17 00:00:00 2001 From: Ark74 Date: Wed, 3 Jul 2024 12:22:49 -0600 Subject: [PATCH] testing updates for grafana --- grafana.sh | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/grafana.sh b/grafana.sh index 94edc35..09f1e23 100644 --- a/grafana.sh +++ b/grafana.sh @@ -43,11 +43,21 @@ systemctl enable "$1" systemctl restart "$1" systemctl status "$1" } +test_match() { + if grep -q "$1" "$2" ; then + echo "$(basename "$2") - OK..." + else + echo "$(basename "$2"), FAIL..." + echo "Please report this to https://forge.switnet.net/switnet/quick-jibri-installer" + exit + fi +} MAIN_TEL="/etc/telegraf/telegraf.conf" TEL_JIT="/etc/telegraf/telegraf.d/jitsi.conf" GRAFANA_INI="/etc/grafana/grafana.ini" DOMAIN="$(find /etc/prosody/conf.d/ -name \*.lua|awk -F'.cfg' '!/localhost/{print $1}'|xargs basename)" WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf" +WS_MATCH1="# ensure all static content can always be found first" GRAFANA_PASS="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 14 | head -n1)" # Min requirements @@ -57,11 +67,17 @@ apt-get install -y gnupg2 \ wget \ jq +# Make sure we can rely on the match strings. +printf "> Testing match strings on config files.\n" +test_match "$WS_MATCH1" "$WS_CONF" + echo " # Setup InfluxDB Packages " -curl -s https://repos.influxdata.com/influxdata-archive.key > /etc/apt/trusted.gpg.d/influxdata-archive.key -echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.key] https://repos.influxdata.com/debian buster stable" | sudo tee /etc/apt/sources.list.d/influxdb.list +curl -s https://repos.influxdata.com/influxdata-archive.key > \ + /etc/apt/trusted.gpg.d/influxdata-archive.key +echo "deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.key] https://repos.influxdata.com/debian buster stable" | \ + sudo tee /etc/apt/sources.list.d/influxdb.list apt-get update && apt-get install influxdb -y run_service influxdb @@ -70,7 +86,8 @@ echo " " curl -s https://apt.grafana.com/gpg-full.key | \ gpg --dearmor | tee /etc/apt/trusted.gpg.d/grafana-full-key.gpg >/dev/null -add-apt-repository "deb https://packages.grafana.com/oss/deb stable main" +echo "deb https://packages.grafana.com/oss/deb stable main" | \ + sudo tee /etc/apt/sources.list.d/grafana_com_oss_deb.list apt-get update && apt-get install grafana -y run_service grafana-server @@ -138,11 +155,13 @@ echo ' # extra options to pass to the JVB daemon JVB_OPTS="--apis=rest,xmpp"' >> /etc/jitsi/videobridge/config sed -i "s|TRANSPORT=muc|TRANSPORT=muc,colibri|" /etc/jitsi/videobridge/sip-communicator.properties +# Enable videobridge REST API +hocon -f /etc/jitsi/videobridge/jvb.conf set videobridge.apis.rest.enabled true systemctl restart jitsi-videobridge2 echo -e "\n# Setup Grafana nginx domain\n" sed -i "s|;protocol =.*|protocol = http|" $GRAFANA_INI -sed -i "s|;http_addr =.*|http_addr = localhost|" $GRAFANA_INI +sed -i "s|;http_addr =.*|http_addr = 127.0.0.1|" $GRAFANA_INI sed -i "s|;http_port =.*|http_port = 3000|" $GRAFANA_INI sed -i "s|;domain =.*|domain = $DOMAIN|" $GRAFANA_INI sed -i "s|;enforce_domain =.*|enforce_domain = false|" $GRAFANA_INI @@ -160,10 +179,10 @@ while [ $secs -gt 0 ]; do done if [ -f "$WS_CONF" ]; then - sed -i "/# ensure all static content can always be found first/i \ \ \ \ location \~ \^\/(grafana\/|grafana\/login) {" "$WS_CONF" - sed -i "/# ensure all static content can always be found first/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:3000;" "$WS_CONF" - sed -i "/# ensure all static content can always be found first/i \ \ \ \ }" "$WS_CONF" - sed -i "/# ensure all static content can always be found first/i \\\n" "$WS_CONF" + sed -i "/$WS_MATCH1/i \ \ \ \ location \~ \^\/(grafana\/|grafana\/login) {" "$WS_CONF" + sed -i "/$WS_MATCH1/i \ \ \ \ \ \ \ \ proxy_pass http:\/\/localhost:3000;" "$WS_CONF" + sed -i "/$WS_MATCH1/i \ \ \ \ }" "$WS_CONF" + sed -i "/$WS_MATCH1/i \\\n" "$WS_CONF" systemctl restart nginx else echo "No app configuration done to server file, please report to: @@ -179,7 +198,7 @@ PUT -H "Content-Type: application/json;charset=UTF-8" -d \ \"oldPassword\": \"admin\", \"newPassword\": \"$GRAFANA_PASS\", \"confirmNew\": \"$GRAFANA_PASS\" -}" http://localhost:3000/api/user/password; echo "" +}" http://127.0.0.1:3000/api/user/password; echo "" echo " # Create InfluxDB datasource @@ -189,16 +208,16 @@ POST -H 'Content-Type: application/json;charset=UTF-8' -d \ '{ "name": "InfluxDB", "type": "influxdb", - "url": "http://localhost:8086", + "url": "http://127.0.0.1:8086", "access": "proxy", "isDefault": true, "database": "jitsi" -}' http://localhost:3000/api/datasources; echo "" +}' http://127.0.0.1:3000/api/datasources; echo "" echo " # Add Grafana Dashboard " -grafana_host="http://localhost:3000" +grafana_host="http://127.0.0.1:3000" grafana_cred="admin:$GRAFANA_PASS" grafana_datasource="InfluxDB" ds=(11969);