diff --git a/plugins/backup/fresh-backups b/plugins/backup/fresh-backups index 43b9ba5d..c81a6152 100755 --- a/plugins/backup/fresh-backups +++ b/plugins/backup/fresh-backups @@ -69,11 +69,11 @@ WARN=$((CRIT*(LIFETIME-1))) case ${1:-} in config) cat << EOF -graph_title Fresh (<=${LIFETIME}d) backups archives in ${BACKUP_DIR} -graph_vlabel number +graph_title Fresh backups +graph_info Number of fresh (<=${LIFETIME}d) backups archives in ${BACKUP_DIR} graph_args -l 0 graph_category backup -freshcount.label number +freshcount.label files fresher than ${LIFETIME}d freshcount.critical ${CRIT}: freshcount.warning ${WARN}: EOF diff --git a/plugins/isp/internode_usage b/plugins/isp/internode_usage index a467d9db..93f51054 100755 --- a/plugins/isp/internode_usage +++ b/plugins/isp/internode_usage @@ -209,7 +209,8 @@ graph_config() { case "$graph" in .current) - echo "graph_title Uplink usage rate for ${SERVICE_USERNAME} (hourly)" + echo "graph_title Uplink usage rate (hourly)" + echo "graph_info Username: ${SERVICE_USERNAME}; Service ID: ${SERVICE_ID}; Plan: ${SERVICE_PLAN}" echo 'graph_category network' # ${graph_period} is not a shell variable # shellcheck disable=SC2016 @@ -224,7 +225,9 @@ graph_config() { ;; .daily) - echo "graph_title Uplink usage rate for ${SERVICE_USERNAME} (daily)" + echo "graph_title Uplink usage rate (daily)" + echo "graph_info Username: ${SERVICE_USERNAME}; Service ID: ${SERVICE_ID}; Plan: ${SERVICE_PLAN}" + echo "graph_info Uplink usage rate (daily)" echo 'graph_category network' # ${graph_period} is not a shell variable # shellcheck disable=SC2016 @@ -237,14 +240,15 @@ graph_config() { ;; *) #.usage) - echo "graph_title Uplink usage for ${SERVICE_USERNAME}" + echo "graph_title Uplink usage" + echo "graph_info Username: ${SERVICE_USERNAME}; Service ID: ${SERVICE_ID}; Plan: ${SERVICE_PLAN}" echo 'graph_category network' echo 'graph_vlabel bytes' echo 'graph_period hour' echo "usage.label Total usage" echo "usage.draw AREA" - echo "usage.extinfo ${SERVICE_PLAN}; rollover: ${SERVICE_ROLLOVER}" + echo "ideal.extinfo Quota rollover: ${SERVICE_ROLLOVER}" echo "ideal.label Ideal usage" echo "ideal.draw LINE" echo "ideal.colour FFA500" diff --git a/plugins/network/hostsdeny b/plugins/network/hostsdeny index 2d4e7af3..1fdaab46 100755 --- a/plugins/network/hostsdeny +++ b/plugins/network/hostsdeny @@ -32,7 +32,8 @@ fi if [ "$1" = "config" ]; then - echo 'graph_title Hosts denied sshd access in /etc/hosts.deny' + echo 'graph_title Hosts denied sshd access' + echo 'graph_info Hosts denied sshd access in /etc/hosts.deny' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Hosts denied ' echo 'graph_category system' diff --git a/plugins/router/freebox b/plugins/router/freebox index 8d395b1a..edfe6848 100755 --- a/plugins/router/freebox +++ b/plugins/router/freebox @@ -364,23 +364,23 @@ graph_config() { echo 'redirect_udp.label UDP redirections' ;; *) - echo 'graph_title Freebox connection' + echo 'graph_title Uplink traffic' echo 'graph_category network' echo 'graph_vlabel bits per second in (+) / out (-)' echo 'graph_order main_atm_down main_atm main_wan_down main_wan' - # XXX: parameters duplicated from traffic + # XXX: summary data similar to (more detailed) traffic echo 'main_wan_down.label WAN down' echo 'main_wan_down.graph no' echo 'main_wan_down.cdef main_wan_down,8000,*' - echo 'main_wan.label WAN' + echo 'main_wan.label bps' echo 'main_wan.negative main_wan_down' echo 'main_wan.cdef main_wan,8000,*' echo 'main_atm_down.label ATM down' echo 'main_atm_down.graph no' echo 'main_atm_down.cdef main_atm_down,1000,*' - echo 'main_atm.label ATM sync' + echo 'main_atm.label bps (max)' echo 'main_atm.negative main_atm_down' echo 'main_atm.cdef main_atm,1000,*' ;; diff --git a/plugins/ssh/hostdenied b/plugins/ssh/hostdenied index 611c632e..a0e4854e 100755 --- a/plugins/ssh/hostdenied +++ b/plugins/ssh/hostdenied @@ -58,7 +58,8 @@ run_autoconf() { run_config() { cat << EOF -graph_title denied sshd access in $DENY +graph_title Hosts denied sshd access +graph_info Hosts denied sshd access in $DENY graph_args --base 1000 -l 0 graph_vlabel Hosts denied graph_category security diff --git a/plugins/ssh/sshd_log b/plugins/ssh/sshd_log index f9b19341..deb9a063 100755 --- a/plugins/ssh/sshd_log +++ b/plugins/ssh/sshd_log @@ -106,7 +106,8 @@ if [ "$1" = "autoconf" ]; then fi if [ "$1" = "config" ]; then - echo 'graph_title SSHD login stats from' "$LOG" + echo 'graph_title SSHD login stats' + echo 'graph_info SSHD login stats from' "$LOG" echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel logins' echo 'graph_category' security