scoreboard: generalization of modules

symlinks to active will be created when calling init in the modules
ati_temper/init script is more general (holds hostname variable)
update README with last commit message.

9 files changed, 29 insertions, 13 deletions

diff --git a/gold/scoreboard/README b/gold/scoreboard/README
index 180cbd0d..8e59ab03 100644
--- a/gold/scoreboard/README
+++ b/gold/scoreboard/README
@@ -2,6 +2,20 @@ Scoreboard
 ==========
 a non-interactive gold logger/plotter
 
+scoreboard contains a number of modules which do a number of things:
+ati_temper: log temperature data of an ati_temper enabled host :
+  see //gold/miner/bin/ati_temper
+solidcoin : graph solidcoin informations
+bitcoin   : s.a.
+
+//gold/scoreboard/profile contains all the important paths and variables
+which are sourced by the modules. In a new installation this file needs
+to be customized. 
+
+//gold/scoreboard/util/schedule_logger is the scheduler for generating
+the graphs every 5 minutes.
+
+
 Install
 ======
 * install lighttpd
diff --git a/gold/scoreboard/modules/active/.placeholder b/gold/scoreboard/modules/active/.placeholder
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gold/scoreboard/modules/active/.placeholder
diff --git a/gold/scoreboard/modules/active/bitcoin b/gold/scoreboard/modules/active/bitcoin
deleted file mode 120000
index 86564edb..00000000
--- a/gold/scoreboard/modules/active/bitcoin
+++ /dev/null
@@ -1 +0,0 @@
-/root/btc_logger/modules/available/bitcoin/index
\ No newline at end of file
diff --git a/gold/scoreboard/modules/active/chinaman_temper b/gold/scoreboard/modules/active/chinaman_temper
deleted file mode 120000
index 31935833..00000000
--- a/gold/scoreboard/modules/active/chinaman_temper
+++ /dev/null
@@ -1 +0,0 @@
-/root/btc_logger/modules/available/ati_temper/index
\ No newline at end of file
diff --git a/gold/scoreboard/modules/active/solidcoin b/gold/scoreboard/modules/active/solidcoin
deleted file mode 120000
index 0062d804..00000000
--- a/gold/scoreboard/modules/active/solidcoin
+++ /dev/null
@@ -1 +0,0 @@
-/root/btc_logger/modules/available/solidcoin/index
\ No newline at end of file
diff --git a/gold/scoreboard/modules/available/ati_temper/init b/gold/scoreboard/modules/available/ati_temper/init
index 88a0ed10..af99bfbb 100755
--- a/gold/scoreboard/modules/available/ati_temper/init
+++ b/gold/scoreboard/modules/available/ati_temper/init
@@ -2,24 +2,27 @@
 #set -x
 HERE=$(dirname $(readlink -f $0))
 . $HERE/../../../profile
+MACHINE=chinaman
+ln -s $HERE/index $HERE/../../active/${MACHINE}_ati_temper
 mkdir -p $PDIR
-cat > $PDIR/chinaman.conf <<EOF 
+cat > $PDIR/$MACHINE.conf <<EOF 
 set terminal png transparent nocrop enhanced font arial 8 size 500
 set xdata time
 set autoscale
 set grid
-set title "Chinaman Temperature"
+set title "$MACHINE Temperature"
 set timefmt "%Y-%m-%dT%H:%M:%S"
 set format x "%d"
 set xlabel "Day"
-plot "$ADIR/chinaman_ati_temper" using 1:2 smooth bezier title "gpu0" with lines , \
-"$ADIR/chinaman_ati_temper" using 1:3 smooth bezier title "gpu1" with lines , \
-"$ADIR/chinaman_ati_temper" using 1:4 smooth bezier title "cpu0" with lines , \
-"$ADIR/chinaman_ati_temper" using 1:5 smooth bezier title "rack" with lines
+plot "$ADIR/${MACHINE}_ati_temper" using 1:2 smooth bezier title "gpu0" with lines , \
+"$ADIR/${MACHINE}_ati_temper" using 1:3 smooth bezier title "gpu1" with lines , \
+"$ADIR/${MACHINE}_ati_temper" using 1:4 smooth bezier title "cpu0" with lines , \
+"$ADIR/${MACHINE}_ati_temper" using 1:5 smooth bezier title "rack" with lines
 EOF
 
 sed -e 's/set xlabel.*/set xlabel "Time of Day"/' \
     -e 's/set format.*/set format x "%H"/' \
-    -e 's/set title.*/set title "Chinaman 24 hours Temperature"/' \
-    -e "s/chinaman_ati_temper/chinaman_last_day/g" \
-    $PDIR/chinaman.conf >$PDIR/chinaman_last_day.conf
+    -e "s/set title.*/set title \"${MACHINE} 24 hours Temperature\"/" \
+    -e "s/${MACHINE}_ati_temper/${MACHINE}_last_day/g" \
+    $PDIR/${MACHINE}.conf >$PDIR/${MACHINE}_last_day.conf
+
diff --git a/gold/scoreboard/modules/available/bitcoin/init b/gold/scoreboard/modules/available/bitcoin/init
index c4ddf32f..cc5688bd 100755
--- a/gold/scoreboard/modules/available/bitcoin/init
+++ b/gold/scoreboard/modules/available/bitcoin/init
@@ -3,6 +3,7 @@
 HERE=$(dirname $(readlink -f $0))
 . $HERE/../../../profile
 mkdir -p $PDIR
+ln -s $HERE/index $HERE/../../active/bitcoin
 cat > $PDIR/bitcoin.conf <<EOF 
 set terminal png transparent nocrop enhanced font arial 8 size 500 #size 640, 240
 set style function lines
diff --git a/gold/scoreboard/modules/available/bitcoin/render b/gold/scoreboard/modules/available/bitcoin/render
index 19545b21..7ef432ac 100644
--- a/gold/scoreboard/modules/available/bitcoin/render
+++ b/gold/scoreboard/modules/available/bitcoin/render
@@ -7,4 +7,4 @@ print today.strftime("%Y-%m-%dT%H:%M:%S"),
 print '%s' % result["blocks"],
 print '%s' % result["difficulty"],
 print '%s' % result["keypoololdest"],
-print '%s' % result["keypoolsize"]
+#print '%s' % result["keypoolsize"]
diff --git a/gold/scoreboard/modules/available/solidcoin/init b/gold/scoreboard/modules/available/solidcoin/init
index c12a6586..165569a4 100755
--- a/gold/scoreboard/modules/available/solidcoin/init
+++ b/gold/scoreboard/modules/available/solidcoin/init
@@ -3,6 +3,7 @@
 HERE=$(dirname $(readlink -f $0))
 . $HERE/../../../profile
 mkdir -p $PDIR
+ln -s $HERE/index $HERE/../../active/solidcoin
 cat > $PDIR/solidcoin.conf <<EOF 
 set terminal png transparent nocrop enhanced font arial 8 size 500 #size 640, 240
 set style function lines