From 1eeb47b885aef18aa26a5608d94a4f60a674565d Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Tue, 27 May 2014 10:13:30 +0000 Subject: [PATCH] power8top10.gplot/SM_DB_all.gplot: removed CR/LF (Forum #24017) git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5987 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- www/gplot/SM_DB_all.gplot | 72 ++++++++++++++++++------------------- www/gplot/power8top10.gplot | 60 +++++++++++++++---------------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/www/gplot/SM_DB_all.gplot b/www/gplot/SM_DB_all.gplot index e27fb6b03..d2399325e 100644 --- a/www/gplot/SM_DB_all.gplot +++ b/www/gplot/SM_DB_all.gplot @@ -1,36 +1,36 @@ -# SYSMON -# -# Anzeige verschiedener Statistiken aus SYSMON (DbLog) -# - -set terminal png transparent size crop -set output '.png' -set xdata time -set timefmt "%Y-%m-%d_%H:%M:%S" -set xlabel " " -set title '' -set ytics -set grid ytics y2tics -set ylabel "Temperatur" -set y2label "Last" - -#DbLog :cpu_temp::: -#DbLog :cpu_temp_avg::: -#DbLog :cpu_freq::: -#DbLog :loadavg:::$val=~s/([\d.]*).[\d.]*.[\d.]*/$1/eg -#DbLog :loadavg:::$val=~s/[\d.]*.([\d.]*).[\d.]*/$1/eg -#DbLog :loadavg:::$val=~s/[\d.]*.[\d.]*.([\d.]*)/$1/eg - -plot \ - "< awk '/load avg:/ {print $1, $4}' " \ - using 1:2 ls l0 axes x1y1 title 'Temp' lw 1 with lines \ - "< awk '/load avg5:/ {print $1, $4}' " \ - using 1:2 ls l1 axes x1y1 title 'Temp' lw 2 with lines \ - "< awk '/load avg:/ {print $1, $4}' " \ - using 1:2 ls l2 axes x1y1 title 'MHz' lw 1 with lines \ - "< awk '/load avg5:/ {print $1, $4}' " \ - using 1:2 ls l3 axes x1y2 title '1 Min' lw 2 with lines \ - "< awk '/load avg:/ {print $1, $4}' " \ - using 1:2 ls l4 axes x1y2 title '5 Min' lw 1 with lines \ - "< awk '/load avg5:/ {print $1, $4}' " \ - using 1:2 ls l5 axes x1y2 title '15 Min' lw 2 with lines \ \ No newline at end of file +# SYSMON +# +# Anzeige verschiedener Statistiken aus SYSMON (DbLog) +# + +set terminal png transparent size crop +set output '.png' +set xdata time +set timefmt "%Y-%m-%d_%H:%M:%S" +set xlabel " " +set title '' +set ytics +set grid ytics y2tics +set ylabel "Temperatur" +set y2label "Last" + +#DbLog :cpu_temp::: +#DbLog :cpu_temp_avg::: +#DbLog :cpu_freq::: +#DbLog :loadavg:::$val=~s/([\d.]*).[\d.]*.[\d.]*/$1/eg +#DbLog :loadavg:::$val=~s/[\d.]*.([\d.]*).[\d.]*/$1/eg +#DbLog :loadavg:::$val=~s/[\d.]*.[\d.]*.([\d.]*)/$1/eg + +plot \ + "< awk '/load avg:/ {print $1, $4}' " \ + using 1:2 ls l0 axes x1y1 title 'Temp' lw 1 with lines \ + "< awk '/load avg5:/ {print $1, $4}' " \ + using 1:2 ls l1 axes x1y1 title 'Temp' lw 2 with lines \ + "< awk '/load avg:/ {print $1, $4}' " \ + using 1:2 ls l2 axes x1y1 title 'MHz' lw 1 with lines \ + "< awk '/load avg5:/ {print $1, $4}' " \ + using 1:2 ls l3 axes x1y2 title '1 Min' lw 2 with lines \ + "< awk '/load avg:/ {print $1, $4}' " \ + using 1:2 ls l4 axes x1y2 title '5 Min' lw 1 with lines \ + "< awk '/load avg5:/ {print $1, $4}' " \ + using 1:2 ls l5 axes x1y2 title '15 Min' lw 2 with lines \ diff --git a/www/gplot/power8top10.gplot b/www/gplot/power8top10.gplot index 99defb913..df0760e3a 100644 --- a/www/gplot/power8top10.gplot +++ b/www/gplot/power8top10.gplot @@ -1,30 +1,30 @@ -############################ -# Display the power reported by the EM1000FM received bei CUL - -#set terminal png transparent size crop -set terminal png size crop -set output '.png' -set xdata time -set timefmt "%Y-%m-%d_%H:%M:%S" -set xlabel "Energiemonitor EM1000EM" - -set title '' -set ylabel "Power (kW)" -set y2label "Power (kWh)" -set grid -set ytics -set y2tics -set logscale y -set logscale y2 -set format y "%.1f" -set format y2 "%.1f" - -#FileLog 8::0: -#FileLog 10::0: - - -plot \ - "< awk '/5MIN:/ {print $1, $8}' "\ - using 1:2 axes x1y2 title 'kWh' with lines,\ - "< awk '/TOP:/ {print $1, $10}' "\ - using 1:2 axes x1y1 title 'Spitze kW' with lines +############################ +# Display the power reported by the EM1000FM received bei CUL + +#set terminal png transparent size crop +set terminal png size crop +set output '.png' +set xdata time +set timefmt "%Y-%m-%d_%H:%M:%S" +set xlabel "Energiemonitor EM1000EM" + +set title '' +set ylabel "Power (kW)" +set y2label "Power (kWh)" +set grid +set ytics +set y2tics +set logscale y +set logscale y2 +set format y "%.1f" +set format y2 "%.1f" + +#FileLog 8::0: +#FileLog 10::0: + + +plot \ + "< awk '/5MIN:/ {print $1, $8}' "\ + using 1:2 axes x1y2 title 'kWh' with lines,\ + "< awk '/TOP:/ {print $1, $10}' "\ + using 1:2 axes x1y1 title 'Spitze kW' with lines