Changeset 726

Timestamp:

03/22/13 13:45:32 (10 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:

• graph.php (modified) (2 diffs)
• libtoga.php (modified) (3 diffs)
• overview.php (modified) (1 diff)
• templates/footer.tpl (modified) (1 diff)

branches/0.4/web/addons/job_monarch/graph.php

@@ -151 +151 @@
             foreach( $bmetric as $mname => $mval )
             {
-                if( ( $mname == 'zplugin-monarch-rj' ) || ($mname == 'zplugin-monarch-qj') )
+                if( ( $mname == 'zplugin_monarch_rj' ) || ($mname == 'zplugin_monarch_qj') )
                 {
                     $rjqj_host      = $bhost;
@@ -160 +160 @@
         $rrd_dir = $conf['rrds'] . "/$clustername/$rjqj_host/";
 
-        $rj_rrd    = $rrd_dir . "zplugin-monarch-rj.rrd";
-        $qj_rrd    = $rrd_dir . "zplugin-monarch-qj.rrd";
+        $rj_rrd    = $rrd_dir . "zplugin_monarch_rj.rrd";
+        $qj_rrd    = $rrd_dir . "zplugin_monarch_qj.rrd";
 
         $sorted_hosts    = array();

branches/0.4/web/addons/job_monarch/libtoga.php

@@ -711 +711 @@
             }
         }
-        else if( $name == 'METRIC' and strstr( $attrs['NAME'], 'zplugin-monarch' ) and $this->proc_cluster == $this->clustername )
-        {
-            if( strstr( $attrs['NAME'], 'zplugin-monarch-heartbeat' ) )
+        else if( $name == 'METRIC' and strstr( $attrs['NAME'], 'zplugin_monarch' ) and $this->proc_cluster == $this->clustername )
+        {
+            if( strstr( $attrs['NAME'], 'zplugin_monarch_heartbeat' ) )
             {
                 $this->heartbeat['time'] = $attrs['VAL'];
             }
-            else if( strstr( $attrs['NAME'], 'zplugin-monarch-down' ) )
+            else if( strstr( $attrs['NAME'], 'zplugin_monarch_down' ) )
             {
                 $fields        = explode( ' ', $attrs['VAL'] );
@@ -753 +753 @@
                 }
             }
-            else if( strstr( $attrs['NAME'], 'zplugin-monarch-offline' ) )
+            else if( strstr( $attrs['NAME'], 'zplugin_monarch_offline' ) )
             {
                 $fields        = explode( ' ', $attrs['VAL'] );
@@ -789 +789 @@
                 }
             }
-            else if( strstr( $attrs['NAME'], 'zplugin-monarch-job' ) )
-            {
-                sscanf( $attrs['NAME'], 'zplugin-monarch-job-%d-%d', $jobid, $monincr );
+            else if( strstr( $attrs['NAME'], 'zplugin_monarch_job' ) )
+            {
+                sscanf( $attrs['NAME'], 'zplugin_monarch_job_%d_%s$', $monincr, $jobid );
 
                 if( !isset( $jobs[$jobid] ) )

branches/0.4/web/addons/job_monarch/overview.php

@@ -582 +582 @@
         foreach( $bmetric as $mname => $mval )
         {
-            if( ( $mname == 'zplugin-monarch-rj' ) || ($mname == 'zplugin-monarch-qj') )
+            if( ( $mname == 'zplugin_monarch_rj' ) || ($mname == 'zplugin_monarch_qj') )
             {
                 $rjqj_host      = $bhost;

branches/0.4/web/addons/job_monarch/templates/footer.tpl

@@ -8 +8 @@
 
 Downloading and parsing ganglia's XML tree took {parsetime}.<BR>
-Images created with <A HREF="http://www.rrdtool.com/">RRDTool</A>.<BR>
+Images created with <A HREF="http://www.rrdtool.org/">RRDTool</A>.<BR>
 </FONT>
 </CENTER>