Changeset 726 for branches/0.4/web/addons/job_monarch/libtoga.php

Timestamp:

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

File:

• branches/0.4/web/addons/job_monarch/libtoga.php (modified) (3 diffs)

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] ) )