diff --git a/includes/polling/cisco-sla.inc.php b/includes/polling/cisco-sla.inc.php index 3564a8f26..0e475e6e0 100644 --- a/includes/polling/cisco-sla.inc.php +++ b/includes/polling/cisco-sla.inc.php @@ -4,7 +4,7 @@ $uptime = snmp_get($device, "sysUpTime.0", "-Otv"); $time_offset = time() - intval($uptime) / 100; $slavals = snmp_walk($device, "ciscoRttMonMIB.ciscoRttMonObjects.rttMonCtrl.rttMonLatestRttOperTable", "-OUsqt", "+CISCO-RTTMON-MIB"); - + $sla_table = array(); foreach (explode("\n", $slavals) as $sla) { $key_val = explode(" ", $sla, 2); @@ -28,14 +28,14 @@ foreach (explode("\n", $slavals) as $sla) { foreach ($sla_table as &$sla) { $sla['UnixTime'] = intval($sla['Time'] / 100 + $time_offset); - $sla['TimeStr'] = strftime("%Y-%m-%d %H:%I:%S", $sla['UnixTime']); + $sla['TimeStr'] = strftime("%Y-%m-%d %H:%M:%S", $sla['UnixTime']); } unset($sla); foreach (dbFetchRows("SELECT * FROM `slas` WHERE `device_id` = ? AND `deleted` = 0 AND `status` = 1", array($device['device_id'])) as $sla) { echo("SLA " . $sla['sla_nr'] . ": " . $sla['rtt_type'] . " " . $sla['owner'] . " " . $sla['tag']. "... "); - + $slarrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("sla-" . $sla['sla_nr'] . ".rrd"); if (!is_file($slarrd)) @@ -52,18 +52,15 @@ foreach (dbFetchRows("SELECT * FROM `slas` WHERE `device_id` = ? AND `deleted` = { $slaval = $sla_table[$sla['sla_nr']]; echo($slaval['CompletionTime'] . "ms at " . $slaval['TimeStr']); - $ts = $slaval['UnixTime']; $val = $slaval['CompletionTime']; } else { echo("NaN"); - $ts = 'N'; $val = 'U'; } - rrdtool_update($slarrd,$ts.":".$val); echo("\n"); }