Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-21 18:41:03 +00:00
Code Issues Releases Wiki Activity

[isp/internode] Fix (some) issues with DIRTYCONFIG

Browse source 
We need to set the date for all plugins, otherwise the lagging `daily`
one is assumed for all, and confuses spoolfetch and other time-based
sanity checks.

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
This commit is contained in:
Olivier Mehani 2019-09-29 20:39:31 +10:00 • committed by Lars Kruse
parent e5af569b4f
commit f6c627bd56
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/isp/internode_usage
View file

@ -106,6 +106,7 @@ fetch() {
}
get_data() {
CURRENT_TIMESTAMP="$(date +%s)"
SERVICE_USERNAME='n/a'
SERVICE_QUOTA='n/a'
SERVICE_PLAN='n/a'
@ -121,11 +122,10 @@ get_data() {
SERVICE_ROLLOVER="$(echo "${SERVICE_XML}" | xpath_extract "internode/api/service/rollover")"
SERVICE_INTERVAL="$(echo "${SERVICE_XML}" | xpath_extract "internode/api/service/plan-interval" | sed 's/ly$//')"
TODAY="$(date +%s)"
FIRST_DAY="$(date +%s --date "${SERVICE_ROLLOVER} -1 ${SERVICE_INTERVAL}")"
LAST_DAY="$(date +%s --date "${SERVICE_ROLLOVER}")"
BILLING_PERIOD="(${LAST_DAY}-${FIRST_DAY})"
IDEAL_USAGE="$(echo "${SERVICE_QUOTA}-(${SERVICE_QUOTA}*(${LAST_DAY}-${TODAY})/${BILLING_PERIOD})" | bc -ql)"
IDEAL_USAGE="$(echo "${SERVICE_QUOTA}-(${SERVICE_QUOTA}*(${LAST_DAY}-${CURRENT_TIMESTAMP})/${BILLING_PERIOD})" | bc -ql)"
USAGE_CRITICAL="${SERVICE_QUOTA}"
fi
@ -219,14 +219,14 @@ graph_data() {
echo "multigraph internode_usage_${SERVICE_ID}${graph}"
case "${graph}" in
.current)
echo "hourly_rate.value ${SERVICE_USAGE:-U}"
echo "hourly_rate.value ${CURRENT_TIMESTAMP}:${SERVICE_USAGE:-U}"
;;
.daily)
echo "daily_rate.value ${DAILY_TIMESTAMP}:${DAILY_USAGE:-U}"
;;
*)
echo "usage.value ${SERVICE_USAGE:-U}"
echo "ideal.value ${IDEAL_USAGE:-U}"
echo "usage.value ${CURRENT_TIMESTAMP}:${SERVICE_USAGE:-U}"
echo "ideal.value ${CURRENT_TIMESTAMP}:${IDEAL_USAGE:-U}"
;;
esac
echo
@ -240,8 +240,8 @@ main() {
fi
graph_config
graph_config usage
graph_config current
graph_config daily
graph_config current
if [ "${MUNIN_CAP_DIRTYCONFIG:-0}" = "1" ]; then
main
fi
@ -249,8 +249,8 @@ main() {
*)
graph_data
graph_data usage
graph_data current
graph_data daily
graph_data current
;;
esac
}