Merge branch 'master' into vp

etc/needrestart/conf.d/exclude-xcache.conf

+$nrconf{override_rc}{qr(^systemd-nspawn\@xcache\.service$)} = 0;

var/local/xcache/icinga/check_openfiles.sh

+#!/bin/bash
+
+xrdpid=$(pgrep xrootd)
+nopen=$(lsof -p $xrdpid | wc -l)
+
+if [[ $nopen -gt 10000 ]]
+then
+    echo "WARNING: Currently $nopen open files"
+    exit 1
+else
+    echo "OK: No suspiciously high number of open files"
+fi
+
+exit 0

var/local/xcache/icinga/heartbeat_running.sh

+#!/bin/bash
+
+lastbeat=$(journalctl -eu xcache-vp-heartbeat.service  | grep OK | awk '{print $1}')
+lastbeat=$(date --date="$lastbeat" "+%s")
+now=$(date "+%s")
+
+if [[ $((now - lastbeat)) -gt 300 ]]
+then
+    echo "CRITICAL: last heartbeat to VP service more than 5 minutes ago"
+    exit 2
+else
+    echo "OK: heartbeats running fine"
+fi
+
+exit 0

var/local/xcache/icinga/xcache_running.sh

+#!/bin/bash
+
+if systemctl is-active systemd-nspawn@xcache --quiet
+then
+    echo "OK: xrootd service running"
+else
+    echo "CRITICAL: xrootd service not active"
+    exit 2
+fi
+
+exit 0