Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00
Code Issues Releases Wiki Activity

Merge pull request #844 from mxjeff/missing_apiid

Browse Source 
Add missing appid in URL
This commit is contained in:
sumpfralle 2018-03-14 00:25:14 +01:00 committed by GitHub
commit 0bc714aa29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/weather/openweather_
View File

@ -18,12 +18,11 @@
# [openweather_*] # [openweather_*]
# env.apikey XYZ # env.apikey XYZ
query_string=$(printf '%s' "${0#*_}" | tr '_' '=') location=$(printf '%s' "${0#*_}" | tr '_' '=')
query_string="${location}&appid=${apikey}"
plugin_name=$( basename $0 ) plugin_name=$( basename $0 )
OWAPI=$( curl -s "http://api.openweathermap.org/data/2.5/weather?mode=xml&${query_string}") OWAPI=$( curl -s "http://api.openweathermap.org/data/2.5/weather?mode=xml&${query_string}")
# API returns temp in K, we have to convert it in C
# &units=metric would change that ;-)
KELVIN_BIAS=273 KELVIN_BIAS=273
CITY=$( expr "$OWAPI" : '.*\<city.*name=\"\(.*\)\"><coord.*' ) CITY=$( expr "$OWAPI" : '.*\<city.*name=\"\(.*\)\"><coord.*' )
@ -37,7 +36,7 @@ then
graph_category sensors graph_category sensors
graph_info This graph show the temperature in ${CITY} graph_info This graph show the temperature in ${CITY}
temp_avg.label avg temp_avg.label avg
temp_avg.cdef $KELVIN_BIAS,- temp_avg.cdef temp_avg,$KELVIN_BIAS,-
multigraph $plugin_name.temp multigraph $plugin_name.temp
graph_title Temperature in ${CITY} graph_title Temperature in ${CITY}
@ -45,25 +44,26 @@ then
graph_category sensors graph_category sensors
graph_info This graph show the temperature in ${CITY} graph_info This graph show the temperature in ${CITY}
temp_avg.label avg temp_avg.label avg
temp_avg.cdef $KELVIN_BIAS,- temp_avg.cdef temp_avg,$KELVIN_BIAS,-
temp_min.label min temp_min.label min
temp_min.cdef $KELVIN_BIAS,- temp_min.cdef temp_min,$KELVIN_BIAS,-
temp_max.label max temp_max.label max
temp_max.cdef $KELVIN_BIAS,- temp_max.cdef temp_max,$KELVIN_BIAS,-
multigraph $plugin_name.humidity multigraph $plugin_name.humidity
graph_title Humidity in ${CITY} graph_title Humidity in ${CITY}
graph_vlabel % graph_vlabel %
graph_category sensors graph_category sensors
graph_args --upper-limit 100 --lower-limit 0
graph_info This graph show the humidity in ${CITY} graph_info This graph show the humidity in ${CITY}
humidity.label humidity field_humidity.label humidity
multigraph $plugin_name.pressure multigraph $plugin_name.pressure
graph_title Pressure in ${CITY} graph_title Pressure in ${CITY}
graph_vlabel hPa graph_vlabel hPa
graph_category sensors graph_category sensors
graph_info This graph show the pressure in ${CITY} graph_info This graph show the pressure in ${CITY}
pressure.label pressure field_pressure.label pressure
multigraph $plugin_name.wind_speed multigraph $plugin_name.wind_speed
graph_title Wind Speed in ${CITY} graph_title Wind Speed in ${CITY}
@ -74,10 +74,12 @@ then
multigraph $plugin_name.wind_direction multigraph $plugin_name.wind_direction
graph_title Wind direction in ${CITY} graph_title Wind direction in ${CITY}
graph_vlabel m/s graph_vlabel direction
graph_category sensors graph_category sensors
graph_args --upper-limit 360 --lower-limit 0
graph_info This graph show the wind direction in ${CITY} graph_info This graph show the wind direction in ${CITY}
direction.label wind direction direction.label wind direction
EOF EOF
# Continue if dirty config is enabled # Continue if dirty config is enabled
@ -104,10 +106,10 @@ cat <<- EOF
temp_max.value $TEMP_MAX temp_max.value $TEMP_MAX
multigraph $plugin_name.humidity multigraph $plugin_name.humidity
humidity.value $HUMIDITY field_humidity.value $HUMIDITY
multigraph $plugin_name.pressure multigraph $plugin_name.pressure
pressure.value $PRESSURE field_pressure.value $PRESSURE
multigraph $plugin_name.wind_speed multigraph $plugin_name.wind_speed
speed.value $WD_SPEED speed.value $WD_SPEED