From e9ca5477f3de45452a09852bbd1e428c4dc6c541 Mon Sep 17 00:00:00 2001 From: Christian Dresel Date: Mon, 28 Feb 2022 08:30:34 +0100 Subject: [PATCH] Layer3: Remove alfred We don't need alfred on layer3 variante and remove it here We save the nodewatcher Data on /tmp/nodewatcher and send this data with mqtt und direct to the monitoring fix: #120 Signed-off-by: Christian Dresel --- .../files/usr/sbin/alfred-monitoring-proxy | 2 +- .../fff-mqtt-monitoring/files/usr/sbin/alfred-mqtt-proxy | 2 +- .../fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy index 8b241f62..086ea577 100755 --- a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy +++ b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy @@ -3,5 +3,5 @@ api_url="https://monitoring.freifunk-franken.de/api/alfred2" fetch_id="64" -/bin/alfred-json -r "$fetch_id" | \ +cat /tmp/nodewatcher | \ /usr/bin/curl -k -sS -H "Content-type: application/json; charset=UTF-8" --data-binary @- "$api_url" diff --git a/src/packages/fff/fff-mqtt-monitoring/files/usr/sbin/alfred-mqtt-proxy b/src/packages/fff/fff-mqtt-monitoring/files/usr/sbin/alfred-mqtt-proxy index 4f81b4ad..37cc5e30 100755 --- a/src/packages/fff/fff-mqtt-monitoring/files/usr/sbin/alfred-mqtt-proxy +++ b/src/packages/fff/fff-mqtt-monitoring/files/usr/sbin/alfred-mqtt-proxy @@ -3,6 +3,6 @@ MACADDR=$(cat /sys/class/net/br-client/address | /bin/sed 's/://g') fetch_id="64" if [ -n "$(uci -q get fff.mqtt.server)" ] ; then - mosquitto_pub -h "$(uci get fff.mqtt.server)" -p 1883 -t /monitoring/v1/$MACADDR -m "$(/bin/alfred-json -r "$fetch_id")" + mosquitto_pub -h "$(uci get fff.mqtt.server)" -p 1883 -t /monitoring/v1/$MACADDR -m "$(cat /tmp/nodewatcher)" fi diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index 9613a377..68c67b0e 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -43,7 +43,12 @@ crawl() { #write data to xml file that provides the data on httpd SCRIPT_DATA_DIR=$(dirname "$SCRIPT_DATA_FILE") test -d "$SCRIPT_DATA_DIR" || mkdir -p "$SCRIPT_DATA_DIR" - echo "$DATA" | gzip | tee "$SCRIPT_DATA_FILE" | alfred -s 64 + if alfred then + echo "$DATA" | gzip | tee "$SCRIPT_DATA_FILE" | alfred -s 64 + elfi + echo "$DATA" > /tmp/nodewatcher + fi + } LANG=C