From 86ad8e4ba0e010215357bcbfe1a3725e92c2d9f9 Mon Sep 17 00:00:00 2001
From: mischa <mischa@rx.high5.nl>
Date: Sat, 4 May 2019 18:20:26 +0200
Subject: [PATCH] change --border 0, --color BACK#ffffff

---
 cores.sh     |  4 ++--
 cpu_load.sh  |  9 ++++++---
 interface.sh |  9 ++++++---
 uptime.sh    |  3 ++-
 wrapper.sh   | 18 +++++++++++++-----
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/cores.sh b/cores.sh
index bf0e38d..c38ea58 100755
--- a/cores.sh
+++ b/cores.sh
@@ -15,8 +15,8 @@
 test -n "$1" || exit 1
 HOST="$1"
 COMMUNITY="public"
-RRDFILES="/var/rrdtool"
-IMAGES="/var/www/htdocs"
+RRDFILES="/home/mischa/rrd"
+IMAGES="/var/www/mrtg/obsda.ms"
 WATERMARK="OpenBSD Amsterdam - https://obsda.ms"
 RRDTOOL="/usr/local/bin/rrdtool"
 CPUINFO="/tmp/${HOST}-cores.txt"
diff --git a/cpu_load.sh b/cpu_load.sh
index 6fc1eb8..e083ac3 100755
--- a/cpu_load.sh
+++ b/cpu_load.sh
@@ -15,12 +15,13 @@
 test -n "$1" || exit 1
 HOST="$1"
 COMMUNITY="public"
-RRDFILES="/var/rrdtool"
-IMAGES="/var/www/htdocs"
+RRDFILES="/home/mischa/rrd"
+IMAGES="/var/www/mrtg/obsda.ms"
 WATERMARK="OpenBSD Amsterdam - https://obsda.ms"
 RRDTOOL="/usr/local/bin/rrdtool"
 CPUINFO="/tmp/${HOST}-cpu.txt"
 UPTIME=$(cat /tmp/${HOST}-uptime.txt)
+VERSION=$(cat /tmp/${HOST}-version.txt)
 NOW=$(date "+%Y-%m-%d %H:%M:%S %Z" | sed 's/:/\\:/g')
 
 if ! test -f "${RRDFILES}/${HOST}-cpu.rrd"
@@ -41,9 +42,11 @@ ${RRDTOOL} update ${RRDFILES}/${HOST}-cpu.rrd N:${CPU_LOAD}
 
 ${RRDTOOL} graph ${IMAGES}/${HOST}-cpu.png \
 	--start -43200 \
-	--title "${HOST} - CPU" \
+	--title "${HOST} - ${VERSION} - CPU" \
 	--vertical-label "% CPU Used" \
 	--watermark "${WATERMARK}" \
+	--color BACK#ffffff \
+	--border 0 \
 	DEF:CPU=${RRDFILES}/${HOST}-cpu.rrd:ds0:AVERAGE \
 	AREA:CPU#FFCC00 \
 	LINE2:CPU#CC0033:"CPU" \
diff --git a/interface.sh b/interface.sh
index 5485c41..ce80b0d 100755
--- a/interface.sh
+++ b/interface.sh
@@ -17,11 +17,12 @@ test -n "$2" || exit 1
 HOST="$1"
 INTERFACE="$2"
 COMMUNITY="public"
-RRDFILES="/var/rrdtool"
-IMAGES="/var/www/htdocs"
+RRDFILES="/home/mischa/rrd"
 WATERMARK="OpenBSD Amsterdam - https://obsda.ms"
+IMAGES="/var/www/mrtg/obsda.ms"
 RRDTOOL="/usr/local/bin/rrdtool"
 UPTIME=$(cat /tmp/${HOST}-uptime.txt)
+VERSION=$(cat /tmp/${HOST}-version.txt)
 NOW=$(date "+%Y-%m-%d %H:%M:%S %Z" | sed 's/:/\\:/g')
 
 if ! test -f "${RRDFILES}/${HOST}-${INTERFACE}.rrd"
@@ -49,9 +50,11 @@ ${RRDTOOL} update ${RRDFILES}/${HOST}-${INTERFACE}.rrd N:${IN}:${OUT}
 
 ${RRDTOOL} graph ${IMAGES}/${HOST}-${INTERFACE}.png \
 	--start -43200 \
-	--title "${HOST} - ${DESCR}" \
+	--title "${HOST} - ${VERSION} - ${DESCR}" \
 	--vertical-label "Bits per Second" \
 	--watermark "${WATERMARK}" \
+	--color BACK#ffffff \
+	--border 0 \
 	DEF:IN=${RRDFILES}/${HOST}-${INTERFACE}.rrd:ds0:AVERAGE \
 	DEF:OUT=${RRDFILES}/${HOST}-${INTERFACE}.rrd:ds1:AVERAGE \
 	CDEF:IN_CDEF="IN,8,*" \
diff --git a/uptime.sh b/uptime.sh
index 7950cb3..f567766 100755
--- a/uptime.sh
+++ b/uptime.sh
@@ -17,10 +17,11 @@ HOST="$1"
 COMMUNITY="public"
 UPTIMEINFO="/tmp/${HOST}-uptime.txt"
 
+rm -rf ${UPTIMEINFO}
 TICKS=$(snmpctl snmp get ${HOST} community ${COMMUNITY} oid hrSystemUptime.0 | cut -d= -f2)
 DAYS=$(echo "${TICKS}/8640000" | bc -l)
 HOURS=$(echo "0.${DAYS##*.} * 24" | bc -l)
 MINUTES=$(echo "0.${HOURS##*.} * 60" | bc -l)
 SECS=$(echo "0.${MINUTES##*.} * 60" | bc -l)
-test -n "$DAYS" && printf '%s days, ' "${DAYS%.*}" > ${UPTIMEINFO}
+test -n "${DAYS%.*}" && printf '%s days, ' "${DAYS%.*}" > ${UPTIMEINFO}
 printf '%02d\\:%02d\\:%02d\n' "${HOURS%.*}" "${MINUTES%.*}" "${SECS%.*}" >> ${UPTIMEINFO}
diff --git a/wrapper.sh b/wrapper.sh
index 3ff512b..85cbc5a 100755
--- a/wrapper.sh
+++ b/wrapper.sh
@@ -12,9 +12,17 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-SCRIPTS="/var/rrdtool"
+SCRIPTS="/home/mischa/rrdtool"
 
-for i in $(jot 2 1); do ${SCRIPTS}/uptime.sh host${i}.domain.tld; done
-for i in $(jot 2 1); do ${SCRIPTS}/cpu_load.sh host${i}.domain.tld; done
-${SCRIPTS}/interface.sh host1.domain.tld 12
-${SCRIPTS}/interface.sh host2.domain.tld 11
+for i in $(jot 8 0); do ${SCRIPTS}/uptime.sh s${i}.obsda.ms; done
+for i in $(jot 8 0); do ${SCRIPTS}/version.sh s${i}.obsda.ms; done
+for i in $(jot 8 0); do ${SCRIPTS}/cpu_load.sh s${i}.obsda.ms; done
+${SCRIPTS}/interface.sh s0.obsda.ms 9
+${SCRIPTS}/interface.sh s1.obsda.ms 12
+${SCRIPTS}/interface.sh s2.obsda.ms 8
+${SCRIPTS}/interface.sh s3.obsda.ms 12
+${SCRIPTS}/interface.sh s4.obsda.ms 12
+${SCRIPTS}/interface.sh s5.obsda.ms 12
+${SCRIPTS}/interface.sh s6.obsda.ms 12
+${SCRIPTS}/interface.sh s7.obsda.ms 11
+#${SCRIPTS}/cores.sh s3.obsda.ms