added web dir to store metric details

docker/etf-cms/docker-entrypoint.sh

@@ -81,6 +81,7 @@ if [[ "${ETF_ALERTS_ENABLED}" -eq "1" ]] && [[ -f /etc/check_mk/notifications.mk
     sed -i "s/ETF_NAGIOS_HOST/${ETF_NAGIOS_HOST}/" /opt/omd/sites/${CHECK_MK_SITE}/etc/check_mk/conf.d/wato/notifications.mk
 fi
 touch /var/www/html/status_snapshot.json && chown etf.etf /var/www/html/status_snapshot.json
+mkdir -p /var/www/html/etf-raw && chown etf.etf /var/www/html/etf-raw
 
 echo "Configuring HT-Condor ..."
 if [[ -f /usr/bin/condor_status ]]; then

docker/etf-cms/docker-entrypoint_ipv6.sh

@@ -80,6 +80,18 @@ if [[ "${ETF_ALERTS_ENABLED}" -eq "1" ]] && [[ -f /etc/check_mk/notifications.mk
     sed -i "s/ETF_HOSTED_BY/${ETF_HOSTED_BY}/" /opt/omd/sites/${CHECK_MK_SITE}/etc/check_mk/conf.d/wato/notifications.mk
     sed -i "s/ETF_NAGIOS_HOST/${ETF_NAGIOS_HOST}/" /opt/omd/sites/${CHECK_MK_SITE}/etc/check_mk/conf.d/wato/notifications.mk
 fi
+touch /var/www/html/status_snapshot.json && chown etf.etf /var/www/html/status_snapshot.json
+mkdir -p /var/www/html/etf-raw && chown etf.etf /var/www/html/etf-raw
+
+echo "Configuring HT-Condor ..."
+if [[ -f /usr/bin/condor_status ]]; then
+    /usr/bin/condor_status -schedd -af MyAddress -pool $(hostname) > /var/lib/condor/spool/.schedd_address
+fi
+if [[ ! -s /var/lib/condor/spool/.schedd_address ]]; then
+    echo "Schedd address file empty, waiting 5 seconds before restarting ..."
+    sleep 5
+    exit 1
+fi
 
 cp /etc/ncgx/templates/generic/handlers.cfg /opt/omd/sites/etf/etc/nagios/conf.d/
 
@@ -97,11 +109,12 @@ echo "Configuring ETF ..."
 if [[ -z "${ETF_NAGIOS_HOST}" ]]; then
     echo "   Variable ETF_NAGIOS_HOST is not defined, using hostname"
     ETF_NAGIOS_HOST=`hostname`
-    grep -qF "${ETF_NAGIOS_HOST}" /etc/ncgx/ncgx.cfg || echo "NAGIOS_HOST = \"${ETF_NAGIOS_HOST}\"" >> /etc/ncgx/ncgx.cfg
-else
-    grep -qF "${ETF_NAGIOS_HOST}" /etc/ncgx/ncgx.cfg || echo "NAGIOS_HOST = \"${ETF_NAGIOS_HOST}\"" >> /etc/ncgx/ncgx.cfg
 fi
 
+grep -qF "${ETF_NAGIOS_HOST}" /etc/ncgx/ncgx.cfg || echo "NAGIOS_HOST = \"${ETF_NAGIOS_HOST}\"" >> /etc/ncgx/ncgx.cfg
+sed -i "s/ETF_NAGIOS_HOST/${ETF_NAGIOS_HOST}/" /etc/httpd/conf.d/welcome.conf
+sed -i "s/ETF_NAGIOS_HOST/${ETF_NAGIOS_HOST}/" /var/www/html/index.html
+
 su etf -c "ncgx --ipv6 --log | tee /opt/omd/sites/etf/var/log/ncgx.log"
 su - etf -c "cmk -II; cmk -O"
 if [[ "${NSTREAM_ENABLED}" -eq "1" ]] ; then

nagios/config/wlcg_cms.cfg

@@ -93,6 +93,7 @@ metrics = {
          "--job-schedule" : 12,
          "--env-file" : "/tmp/etf-env.sh",
          "--wnfm-config" : "/tmp/etf_wnfm.json",
+         "--web-dir" : "/var/www/html/etf-raw",
       },
       "docurl" : "https://etf.cern.ch/docs",
       "doc" : "https://etf.cern.ch/docs",