Changeset 723 for branches/0.4/web/addons

Timestamp:

03/22/13 11:47:20 (10 years ago)

Author:

ramonb

Message:

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

• renamed MONARCH-metrics to zplugin-monarch-metrics

version.php:

• set to 0.4+SVN

Location:

branches/0.4/web/addons/job_monarch

Files:

• graph.php (modified) (2 diffs)
• libtoga.php (modified) (3 diffs)
• overview.php (modified) (1 diff)
• version.php (modified) (1 diff)

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

@@ -151 +151 @@
             foreach( $bmetric as $mname => $mval )
             {
-                if( ( $mname == 'MONARCH-RJ' ) || ($mname == 'MONARCH-QJ') )
+                if( ( $mname == 'zplugin-monarch-rj' ) || ($mname == 'zplugin-monarch-qj') )
                 {
                     $rjqj_host      = $bhost;
@@ -160 +160 @@
         $rrd_dir = "$rrds/$clustername/$rjqj_host/";
 
-        $rj_rrd    = $rrd_dir . "MONARCH-RJ.rrd";
-        $qj_rrd    = $rrd_dir . "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'], 'MONARCH' ) and $this->proc_cluster == $this->clustername )
-        {
-            if( strstr( $attrs['NAME'], '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'], 'MONARCH-DOWN' ) )
+            else if( strstr( $attrs['NAME'], 'zplugin-monarch-down' ) )
             {
                 $fields        = explode( ' ', $attrs['VAL'] );
@@ -753 +753 @@
                 }
             }
-            else if( strstr( $attrs['NAME'], 'MONARCH-OFFLINE' ) )
+            else if( strstr( $attrs['NAME'], 'zplugin-monarch-offline' ) )
             {
                 $fields        = explode( ' ', $attrs['VAL'] );
@@ -789 +789 @@
                 }
             }
-            else if( strstr( $attrs['NAME'], 'MONARCH-JOB' ) )
-            {
-                sscanf( $attrs['NAME'], 'MONARCH-JOB-%d-%d', $jobid, $monincr );
+            else if( strstr( $attrs['NAME'], 'zplugin-monarch-job' ) )
+            {
+                sscanf( $attrs['NAME'], 'zplugin-monarch-job-%d-%d', $jobid, $monincr );
 
                 if( !isset( $jobs[$jobid] ) )

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

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

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

@@ -22 +22 @@
  */
 
-$monarchversion = "0.3.1";
+$monarchversion = "0.4+SVN";
 ?>