memcached and drbd application improvements

git-svn-id: http://www.observium.org/svn/observer/trunk@3099 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-30 15:13:13 +00:00
parent 571c9d5b0e
commit 6b7898b18c
8 changed files with 39 additions and 47 deletions

View File

@@ -1,11 +1,8 @@
<?php
$drbd_dev = $app['app_instance'];
$drbd_data = $agent_data['app']['drbd'][$drbd_dev];
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-drbd-".$app['app_instance'].".rrd";
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-drbd-".$drbd_dev.".rrd";
foreach (explode("|", $drbd_data) as $part)
foreach (explode("|", $agent_data['app']['drbd'][$app['app_instance']]) as $part)
{
list($stat, $val) = explode("=", $part);
if (!empty($stat))
@@ -29,6 +26,14 @@ $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-drbd-".$
DS:oos:GAUGE:600:0:125000000000 ".$config['rrd_rra']);
}
$ds_list = array('ns','nr','dw','dr','al','bm','lo','pe','ua','ap','oos');
foreach($ds_list as $ds)
{
if(empty($drbd[$ds])) { $drbd[$ds] = "U"; }
}
rrdtool_update($rrd_filename, "N:".$drbd['ns'].":".$drbd['nr'].":".$drbd['dw'].":".$drbd['dr'].":".$drbd['al'].":".$drbd['bm'].":".$drbd['lo'].":".$drbd['pe'].":".$drbd['ua'].":".$drbd['ap'].":".$drbd['oop']);
unset($drbd)
?>