Index: branches/0.4/web/addons/job_monarch/graph.php
===================================================================
--- branches/0.4/web/addons/job_monarch/graph.php (revision 725)
+++ branches/0.4/web/addons/job_monarch/graph.php (revision 726)
@@ -151,5 +151,5 @@
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,6 +160,6 @@
$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();
Index: branches/0.4/web/addons/job_monarch/libtoga.php
===================================================================
--- branches/0.4/web/addons/job_monarch/libtoga.php (revision 725)
+++ branches/0.4/web/addons/job_monarch/libtoga.php (revision 726)
@@ -711,11 +711,11 @@
}
}
- 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,5 +753,5 @@
}
}
- else if( strstr( $attrs['NAME'], 'zplugin-monarch-offline' ) )
+ else if( strstr( $attrs['NAME'], 'zplugin_monarch_offline' ) )
{
$fields = explode( ' ', $attrs['VAL'] );
@@ -789,7 +789,7 @@
}
}
- 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] ) )
Index: branches/0.4/web/addons/job_monarch/overview.php
===================================================================
--- branches/0.4/web/addons/job_monarch/overview.php (revision 725)
+++ branches/0.4/web/addons/job_monarch/overview.php (revision 726)
@@ -582,5 +582,5 @@
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;
Index: branches/0.4/web/addons/job_monarch/templates/footer.tpl
===================================================================
--- branches/0.4/web/addons/job_monarch/templates/footer.tpl (revision 725)
+++ branches/0.4/web/addons/job_monarch/templates/footer.tpl (revision 726)
@@ -8,5 +8,5 @@
Downloading and parsing ganglia's XML tree took {parsetime}.
-Images created with RRDTool.
+Images created with RRDTool.