From e8dbe8bdadf44c6ff8da31a962917773f65cfebd Mon Sep 17 00:00:00 2001 From: mischa Date: Tue, 12 Mar 2019 16:18:30 +0100 Subject: [PATCH] move watermark to variable --- cores.sh | 3 ++- cpu_load.sh | 3 ++- interface.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cores.sh b/cores.sh index 2bb32e1..bf0e38d 100755 --- a/cores.sh +++ b/cores.sh @@ -17,6 +17,7 @@ HOST="$1" COMMUNITY="public" RRDFILES="/var/rrdtool" IMAGES="/var/www/htdocs" +WATERMARK="OpenBSD Amsterdam - https://obsda.ms" RRDTOOL="/usr/local/bin/rrdtool" CPUINFO="/tmp/${HOST}-cores.txt" UPTIME=$(cat /tmp/${HOST}-uptime.txt) @@ -53,7 +54,7 @@ ${RRDTOOL} graph ${IMAGES}/${HOST}-cores.png \ --start -432000 \ --title "${HOST} - CPU" \ --vertical-label "% CPU Used" \ - --watermark "OpenBSD Amsterdam - https://obsda.ms" \ + --watermark "${WATERMARK}" \ DEF:CORE0=${RRDFILES}/${HOST}-cores.rrd:ds0:AVERAGE \ DEF:CORE1=${RRDFILES}/${HOST}-cores.rrd:ds1:AVERAGE \ DEF:CORE2=${RRDFILES}/${HOST}-cores.rrd:ds2:AVERAGE \ diff --git a/cpu_load.sh b/cpu_load.sh index 4363ea7..6fc1eb8 100755 --- a/cpu_load.sh +++ b/cpu_load.sh @@ -17,6 +17,7 @@ HOST="$1" COMMUNITY="public" RRDFILES="/var/rrdtool" IMAGES="/var/www/htdocs" +WATERMARK="OpenBSD Amsterdam - https://obsda.ms" RRDTOOL="/usr/local/bin/rrdtool" CPUINFO="/tmp/${HOST}-cpu.txt" UPTIME=$(cat /tmp/${HOST}-uptime.txt) @@ -42,7 +43,7 @@ ${RRDTOOL} graph ${IMAGES}/${HOST}-cpu.png \ --start -43200 \ --title "${HOST} - CPU" \ --vertical-label "% CPU Used" \ - --watermark "OpenBSD Amsterdam - https://obsda.ms" \ + --watermark "${WATERMARK}" \ DEF:CPU=${RRDFILES}/${HOST}-cpu.rrd:ds0:AVERAGE \ AREA:CPU#FFCC00 \ LINE2:CPU#CC0033:"CPU" \ diff --git a/interface.sh b/interface.sh index 4084f4c..5485c41 100755 --- a/interface.sh +++ b/interface.sh @@ -19,6 +19,7 @@ INTERFACE="$2" COMMUNITY="public" RRDFILES="/var/rrdtool" IMAGES="/var/www/htdocs" +WATERMARK="OpenBSD Amsterdam - https://obsda.ms" RRDTOOL="/usr/local/bin/rrdtool" UPTIME=$(cat /tmp/${HOST}-uptime.txt) NOW=$(date "+%Y-%m-%d %H:%M:%S %Z" | sed 's/:/\\:/g') @@ -50,7 +51,7 @@ ${RRDTOOL} graph ${IMAGES}/${HOST}-${INTERFACE}.png \ --start -43200 \ --title "${HOST} - ${DESCR}" \ --vertical-label "Bits per Second" \ - --watermark "OpenBSD Amsterdam - https://obsda.ms" \ + --watermark "${WATERMARK}" \ DEF:IN=${RRDFILES}/${HOST}-${INTERFACE}.rrd:ds0:AVERAGE \ DEF:OUT=${RRDFILES}/${HOST}-${INTERFACE}.rrd:ds1:AVERAGE \ CDEF:IN_CDEF="IN,8,*" \