Changeset 5668


Ignorieren:
Zeitstempel:
31.08.2010 13:37:48 (vor 8 Jahren)
Autor:
cuma
Nachricht:

rrdstats:

  • it's not called rrdtool (since r5561)
  • fix codepage-error from last commit
  • fix digitemp-status is not visible (reported in IPPF)
Ort:
trunk/make/rrdstats/files/root
Dateien:
4 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/rrdstats/files/root/etc/init.d/rc.rrdstats

    r5653 r5668  
    3939    [ "$RRDSTATS_START_RESTORE" = yes ] && restore silent 
    4040 
     41    stop_status 
     42 
    4143    modlib_startdaemon start-stop-daemon -n rrdstats -a /etc/default.rrdstats/rrdstats $RRDSTATS_INTERVAL -b -q -S 
    4244    #wait for the correct pid 
     
    4850    [ -n "$DAEMON_PID" ] && echo $DAEMON_PID >${PID_FILE} 
    4951 
    50     stop_status 
    5152    if [ "$RRDSTATS_WEBENABLED" = "yes" -a "$RRDSTATS_WEB_INETD" != "yes" ]; then 
    5253        webcfg-rrd -P "$HTTPD_PID_RRD" 
  • trunk/make/rrdstats/files/root/usr/lib/cgi-bin/rrdstats/index-rrddt.cgi

    r5561 r5668  
    33. /usr/lib/libmodcgi.sh 
    44 
    5 cgi_begin "RRDtool for DigiTemp" 
     5cgi_begin "DigiTemp" 
    66 
    77source /usr/lib/cgi-bin/rrdstats/rrddt.cgi 
  • trunk/make/rrdstats/files/root/usr/lib/cgi-bin/rrdstats/main.cgi

    r5667 r5668  
    422422                    _SENSOR_GEN=" $_SENSOR_GEN \ 
    423423                     DEF:temp$_SENSOR_CUR=$FILE:temp:AVERAGE \ 
    424                      LINE3:temp$_SENSOR_CUR$_COLOR:$_ALIAS(min/avg/max/cur)[${_SENSOR_UOM:0:1}] \ 
     424                     LINE3:temp$_SENSOR_CUR$_COLOR:$_ALIAS(min/avg/max/cur)[°${_SENSOR_UOM:0:1}] \ 
    425425                     GPRINT:temp$_SENSOR_CUR:MIN:\t%8.3lf \ 
    426426                     GPRINT:temp$_SENSOR_CUR:AVERAGE:%8.3lf \ 
     
    474474    GROUP=$4 
    475475    [ $# -ge 4 ] && GROUP_URL="&group=$4" 
    476     sec_begin "$FNAME stats for last $LAPSE" 
     476    sec_begin "$FNAME" 
    477477    generate_graph "$SNAME" "$RRDSTATS_PERIODMAIN" "$SNAME" "" $GROUP 
    478478    echo "<center><a href=\"$SCRIPT_NAME?graph=$SNAME$GROUP_URL\" class=\"image\">" 
     
    486486    cpu|mem|swap|upt|tt0|tt1|tt2|tt3|diskio1|diskio2|diskio3|diskio4|if1|if2|if3|if4|one) 
    487487        set_lazy "$RRDSTATS_NOTLAZYS" 
    488         heading=$(echo $graph | sed "s/^upt$/Uptime/g;s/^cpu$/Processor/g;s/^mem$/Memory/g;s/^swap$/Swapspace/g;s/^tt0$/Thomson THG - basic/g;s/^tt1$/Thomson THG - System Uptime/;s/^tt2/Thomson THG - DS Frequency/;s/^tt3$/Thomson THG - Upstream Channel/;s/^diskio1$/$RRDSTATS_DISK_NAME1/g;s/^diskio2$/$RRDSTATS_DISK_NAME2/g;s/^diskio3$/$RRDSTATS_DISK_NAME3/g;s/^diskio4$/$RRDSTATS_DISK_NAME4/g;s/^if1$/$RRDSTATS_NICE_NAME1/g;s/^if2$/$RRDSTATS_NICE_NAME2/g;s/^if3$/$RRDSTATS_NICE_NAME3/g;s/^if4$/$RRDSTATS_NICE_NAME4/g;s/^one$/DigiTemp/g") 
    489488        GROUP_PERIOD=$(cgi_param group | tr -d .) 
    490         [ -n "$GROUP_PERIOD" ] && heading="$heading [$GROUP_PERIOD]" 
    491         echo "<center><h1>RRDtool Statistics - $heading</h1></center>" 
     489        if [ -z "$GROUP_PERIOD" ]; then 
     490            heading=$(echo $graph | sed "s/^upt$/Uptime/g;s/^cpu$/Processor/g;s/^mem$/Memory/g;s/^swap$/Swapspace/g;s/^tt0$/Thomson THG - basic/g;s/^tt1$/Thomson THG - System Uptime/;s/^tt2/Thomson THG - DS Frequency/;s/^tt3$/Thomson THG - Upstream Channel/;s/^diskio1$/$RRDSTATS_DISK_NAME1/g;s/^diskio2$/$RRDSTATS_DISK_NAME2/g;s/^diskio3$/$RRDSTATS_DISK_NAME3/g;s/^diskio4$/$RRDSTATS_DISK_NAME4/g;s/^if1$/$RRDSTATS_NICE_NAME1/g;s/^if2$/$RRDSTATS_NICE_NAME2/g;s/^if3$/$RRDSTATS_NICE_NAME3/g;s/^if4$/$RRDSTATS_NICE_NAME4/g;s/^one$/DigiTemp/g") 
     491        else 
     492            heading="$GROUP_PERIOD" 
     493        fi 
     494        echo "<center><h1>$heading stats</h1></center>" 
    492495 
    493496        if [ $(echo "$graph" | sed 's/^tt./yes/') = yes -a "$RRDSTATS_THOMSONADV" = yes ]; then 
     
    502505        for period in $RRDSTATS_PERIODSSUB; do 
    503506            set_period $period 
    504             sec_begin "$heading stats for last $periodnn" 
     507            sec_begin "last $periodnn" 
    505508            generate_graph "$graph" "$periodG" "$graph-$period" "" $GROUP_PERIOD 
    506509            echo "<center><a href=\"$SCRIPT_NAME\" class=\"image\">" 
     
    514517        set_lazy "$RRDSTATS_NOTLAZYM" 
    515518        set_period "$RRDSTATS_PERIODMAIN" 
    516         echo "<center><h1>RRDtool Statistics - Overview</h1></center>" 
     519        echo "<center><h1>Stats for last $periodnn</h1></center>" 
    517520        case $RRD_DISPLAY_TYPE in 
    518521            rrddt) 
  • trunk/make/rrdstats/files/root/usr/lib/cgi-bin/rrdstats/stats.cgi

    r5561 r5668  
    11#!/bin/sh 
    22 
    3 export RRD_DISPLAY_TYPE="rrdstats" 
     3export RRD_DISPLAY_TYPE="stats" 
    44source /usr/lib/cgi-bin/rrdstats/main.cgi 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.