Changeset 726


Ignore:
Timestamp:
03/22/13 13:45:32 (9 years ago)
Author:
ramonb
Message:

templates/footer.tpl:

  • changed URL for rrdtool

graph.php,
overview.php,
libtoga.php:

  • changed seperator to _

libtoga.php:

  • changed job-id-incr to job_incr_id
Location:
branches/0.4/web/addons/job_monarch
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/web/addons/job_monarch/graph.php

    r725 r726  
    151151            foreach( $bmetric as $mname => $mval )
    152152            {
    153                 if( ( $mname == 'zplugin-monarch-rj' ) || ($mname == 'zplugin-monarch-qj') )
     153                if( ( $mname == 'zplugin_monarch_rj' ) || ($mname == 'zplugin_monarch_qj') )
    154154                {
    155155                    $rjqj_host      = $bhost;
     
    160160        $rrd_dir = $conf['rrds'] . "/$clustername/$rjqj_host/";
    161161
    162         $rj_rrd    = $rrd_dir . "zplugin-monarch-rj.rrd";
    163         $qj_rrd    = $rrd_dir . "zplugin-monarch-qj.rrd";
     162        $rj_rrd    = $rrd_dir . "zplugin_monarch_rj.rrd";
     163        $qj_rrd    = $rrd_dir . "zplugin_monarch_qj.rrd";
    164164
    165165        $sorted_hosts    = array();
  • branches/0.4/web/addons/job_monarch/libtoga.php

    r725 r726  
    711711            }
    712712        }
    713         else if( $name == 'METRIC' and strstr( $attrs['NAME'], 'zplugin-monarch' ) and $this->proc_cluster == $this->clustername )
    714         {
    715             if( strstr( $attrs['NAME'], 'zplugin-monarch-heartbeat' ) )
     713        else if( $name == 'METRIC' and strstr( $attrs['NAME'], 'zplugin_monarch' ) and $this->proc_cluster == $this->clustername )
     714        {
     715            if( strstr( $attrs['NAME'], 'zplugin_monarch_heartbeat' ) )
    716716            {
    717717                $this->heartbeat['time'] = $attrs['VAL'];
    718718            }
    719             else if( strstr( $attrs['NAME'], 'zplugin-monarch-down' ) )
     719            else if( strstr( $attrs['NAME'], 'zplugin_monarch_down' ) )
    720720            {
    721721                $fields        = explode( ' ', $attrs['VAL'] );
     
    753753                }
    754754            }
    755             else if( strstr( $attrs['NAME'], 'zplugin-monarch-offline' ) )
     755            else if( strstr( $attrs['NAME'], 'zplugin_monarch_offline' ) )
    756756            {
    757757                $fields        = explode( ' ', $attrs['VAL'] );
     
    789789                }
    790790            }
    791             else if( strstr( $attrs['NAME'], 'zplugin-monarch-job' ) )
    792             {
    793                 sscanf( $attrs['NAME'], 'zplugin-monarch-job-%d-%d', $jobid, $monincr );
     791            else if( strstr( $attrs['NAME'], 'zplugin_monarch_job' ) )
     792            {
     793                sscanf( $attrs['NAME'], 'zplugin_monarch_job_%d_%s$', $monincr, $jobid );
    794794
    795795                if( !isset( $jobs[$jobid] ) )
  • branches/0.4/web/addons/job_monarch/overview.php

    r723 r726  
    582582        foreach( $bmetric as $mname => $mval )
    583583        {
    584             if( ( $mname == 'zplugin-monarch-rj' ) || ($mname == 'zplugin-monarch-qj') )
     584            if( ( $mname == 'zplugin_monarch_rj' ) || ($mname == 'zplugin_monarch_qj') )
    585585            {
    586586                $rjqj_host      = $bhost;
  • branches/0.4/web/addons/job_monarch/templates/footer.tpl

    r725 r726  
    88
    99Downloading and parsing ganglia's XML tree took {parsetime}.<BR>
    10 Images created with <A HREF="http://www.rrdtool.com/">RRDTool</A>.<BR>
     10Images created with <A HREF="http://www.rrdtool.org/">RRDTool</A>.<BR>
    1111</FONT>
    1212</CENTER>
Note: See TracChangeset for help on using the changeset viewer.