From: Sven Hoexter Date: Fri, 28 Jan 2022 20:14:28 +0000 (+0100) Subject: Move from OpenWRT wget to curl X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fscripts.git;a=commitdiff_plain;h=8d0198c269d90ea3c1a7f60225aabb7577b7b194 Move from OpenWRT wget to curl The OpenWRT wget implementation aka uci-fetch did not play along well with the way the meteocontrol weblog HTTP server closes its connection. To simplify it all just use curl, we need it anyway here. Also fix up some spaces superflous port definition in the URL. --- diff --git a/home/pvmon2opsgenie.sh b/home/pvmon2opsgenie.sh index 34a5c5a..c5b970e 100755 --- a/home/pvmon2opsgenie.sh +++ b/home/pvmon2opsgenie.sh @@ -1,10 +1,9 @@ #!/bin/sh -# Checks inverter state as repoted by a metecontrol weblog +# Checks inverter state as repoted by a meteocontrol weblog # device HTML interface, reports issues via Atlassian # Opsgenie. Written with the intention to run via cron on # a LTE Router with either OpenWRT or Teltonika RutOS. -# Requires curl for the Opsgenie part, otherwise -# sh/cut/cat/wget/test are enough. +# Requires curl other stock sh/cut/cat/test are enough. # createAlert createAlert() { @@ -84,7 +83,7 @@ parseMcOutput() { return fi - grep "cLink" "${file}" | while read line; do + grep "cLink" "${file}" | while read line; do result="$(parseMcLine \"${line}\")" # good case if [ "${result}" = "OK" ]; then @@ -114,7 +113,7 @@ getMCstates() { rm -f "${outfile}" # ready to try to download the data from meteocontrol - if ! wget -q -O "${outfile}" "${url}"; then + if ! curl -s -o "${outfile}" "${url}"; then echo "ERROR: could not download ${url} into ${outfile}" exit 1 fi @@ -149,8 +148,8 @@ API_HOST="api.eu.opsgenie.com" API_KEY="" # adjust meteocontrol default password and IPs -mc1="http://admin:ist02@192.168.1.2:80/html/de/onlineOverWr.html" -mc2="http://admin:ist02@192.168.1.3:80/html/de/onlineOverWr.html" +mc1="http://admin:ist02@192.168.1.2/html/de/onlineOverWr.html" +mc2="http://admin:ist02@192.168.1.3/html/de/onlineOverWr.html" ### main loop for dev in mc1 mc2; do @@ -170,7 +169,7 @@ for dev in mc1 mc2; do createAlert "${dev}" "PV ${dev}" "${failures}" continue fi - + # update alert state close alert on state change checkAlertState "${statefile}" "OK" && \ closeAlert "${dev}"