Add additional eventlog severity levels (#5879)

This commit is contained in:
Richard Mayhew
2017-02-13 22:32:02 +00:00
committed by Neil Lathwood
co-authored by Neil Lathwood
parent a44d4254f8
commit e4f48e661e
17 changed files with 57 additions and 57 deletions
+2 -2
View File
@@ -30,10 +30,10 @@ if (!empty($ifName) && is_numeric($port_id)) {
$device = device_by_id_cache($device_id);
if ($descr === 'repoll') {
del_dev_attrib($device, 'ifName:'.$ifName);
log_event("$ifName Port ifAlias cleared manually", $device, 'interface', $port_id);
log_event("$ifName Port ifAlias cleared manually", $device, 'interface', 3, $port_id);
} else {
set_dev_attrib($device, 'ifName:'.$ifName, 1);
log_event("$ifName Port ifAlias set manually: $descr", $device, 'interface', $port_id);
log_event("$ifName Port ifAlias set manually: $descr", $device, 'interface', 3, $port_id);
}
$status = 'ok';
} else {
+1 -1
View File
@@ -68,7 +68,7 @@ foreach ($vrfs_lite_cisco as $vrf) {
$old_mac = $existing_data[$index]['mac_address'];
if ($mac != $old_mac && $mac != '') {
d_echo("Changed mac address for $ip from $old_mac to $mac\n");
log_event("MAC change: $ip : " . mac_clean_to_readable($old_mac) . ' -> ' . mac_clean_to_readable($mac), $device, 'interface', $port_id);
log_event("MAC change: $ip : " . mac_clean_to_readable($old_mac) . ' -> ' . mac_clean_to_readable($mac), $device, 'interface', 4, $port_id);
dbUpdate(array('mac_address' => $mac), 'ipv4_mac', 'port_id=? AND ipv4_address=? AND context_name=?', array($port_id, $ip, $context));
}
d_echo(null, '.');
+1 -1
View File
@@ -53,7 +53,7 @@ foreach (dbFetchRows($sql, array($deviceid)) as $entry) {
if (!match_network($config['nets'], $ip)) {
echo 'i';
log_event("Ignored $ip", $deviceid, 'interface', $if);
log_event("Ignored $ip", $deviceid, 'interface', 3, $if);
continue;
}
+16 -16
View File
@@ -32,7 +32,7 @@ function discover_new_device($hostname, $device = '', $method = '', $interface =
// $ip isn't a valid IP so it must be a name.
if ($ip == $hostname) {
d_echo("name lookup of $hostname failed\n");
log_event("$method discovery of " . $hostname . " failed - Check name lookup", $device['device_id'], 'discovery');
log_event("$method discovery of " . $hostname . " failed - Check name lookup", $device['device_id'], 'discovery', 5);
return false;
}
@@ -40,7 +40,7 @@ function discover_new_device($hostname, $device = '', $method = '', $interface =
// gethostbyname returned a valid $ip, was $dst_host an IP?
if ($config['discovery_by_ip'] === false) {
d_echo('Discovery by IP disabled, skipping ' . $hostname);
log_event("$method discovery of " . $hostname . " failed - Discovery by IP disabled", $device['device_id'], 'discovery');
log_event("$method discovery of " . $hostname . " failed - Discovery by IP disabled", $device['device_id'], 'discovery', 4);
return false;
}
@@ -70,16 +70,16 @@ function discover_new_device($hostname, $device = '', $method = '', $interface =
$extra_log = ' (port ' . $int['label'] . ') ';
}
log_event('Device ' . $remote_device['hostname'] . " ($ip) $extra_log autodiscovered through $method on " . $device['hostname'], $remote_device_id, 'discovery');
log_event('Device ' . $remote_device['hostname'] . " ($ip) $extra_log autodiscovered through $method on " . $device['hostname'], $remote_device_id, 'discovery', 1);
} else {
log_event("$method discovery of " . $remote_device['hostname'] . " ($ip) failed - Check ping and SNMP access", $device['device_id'], 'discovery');
log_event("$method discovery of " . $remote_device['hostname'] . " ($ip) failed - Check ping and SNMP access", $device['device_id'], 'discovery', 5);
}
return $remote_device_id;
} catch (HostExistsException $e) {
// already have this device
} catch (Exception $e) {
log_event("$method discovery of " . $hostname . " ($ip) failed - " . $e->getMessage());
log_event("$method discovery of " . $hostname . " ($ip) failed - " . $e->getMessage(), null, null, 5);
}
} else {
d_echo("$ip not in a matched network - skipping\n");
@@ -247,7 +247,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
d_echo("( $inserted inserted )\n");
echo '+';
log_event('Sensor Added: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr), $device, 'sensor', $inserted);
log_event('Sensor Added: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr), $device, 'sensor', 3, $inserted);
} else {
$sensor_entry = dbFetchRow('SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? AND `sensor_type` = ? AND `sensor_index` = ?', array($class, $device['device_id'], $type, $index));
@@ -282,7 +282,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
d_echo("( $updated updated )\n");
echo 'H';
log_event('Sensor High Limit Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr) . ' (' . $high_limit . ')', $device, 'sensor', $sensor_id);
log_event('Sensor High Limit Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr) . ' (' . $high_limit . ')', $device, 'sensor', 3, $sensor_id);
}
if ($sensor_entry['sensor_limit_low'] != $low_limit && $sensor_entry['sensor_custom'] == 'No') {
@@ -291,7 +291,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
d_echo("( $updated updated )\n");
echo 'L';
log_event('Sensor Low Limit Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr) . ' (' . $low_limit . ')', $device, 'sensor', $sensor_id);
log_event('Sensor Low Limit Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr) . ' (' . $low_limit . ')', $device, 'sensor', 3, $sensor_id);
}
if ($warn_limit != $sensor_entry['sensor_limit_warn'] && $sensor_entry['sensor_custom'] == 'No') {
@@ -300,7 +300,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
d_echo("( $updated updated )\n");
echo 'WH';
log_event('Sensor Warn High Limit Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr) . ' (' . $warn_limit . ')', $device, 'sensor', $sensor_id);
log_event('Sensor Warn High Limit Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr) . ' (' . $warn_limit . ')', $device, 'sensor', 3, $sensor_id);
}
if ($sensor_entry['sensor_limit_low_warn'] != $low_warn_limit && $sensor_entry['sensor_custom'] == 'No') {
@@ -309,7 +309,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
d_echo("( $updated updated )\n");
echo 'WL';
log_event('Sensor Warn Low Limit Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr) . ' (' . $low_warn_limit . ')', $device, 'sensor', $sensor_id);
log_event('Sensor Warn Low Limit Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr) . ' (' . $low_warn_limit . ')', $device, 'sensor', 3, $sensor_id);
}
if ($oid == $sensor_entry['sensor_oid'] && $descr == $sensor_entry['sensor_descr'] && $multiplier == $sensor_entry['sensor_multiplier'] && $divisor == $sensor_entry['sensor_divisor'] && $entPhysicalIndex_measured == $sensor_entry['entPhysicalIndex_measured'] && $entPhysicalIndex == $sensor_entry['entPhysicalIndex']) {
@@ -325,7 +325,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr,
);
$updated = dbUpdate($update, 'sensors', '`sensor_id` = ?', array($sensor_entry['sensor_id']));
echo 'U';
log_event('Sensor Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr), $device, 'sensor', $sensor_id);
log_event('Sensor Updated: ' . mres($class) . ' ' . mres($type) . ' ' . mres($index) . ' ' . mres($descr), $device, 'sensor', 3, $sensor_id);
d_echo("( $updated updated )\n");
}
}//end if
@@ -449,7 +449,7 @@ function check_valid_sensors($device, $class, $valid, $poller_type = 'snmp')
dbDelete('sensors_to_state_indexes', '`sensor_id` = ?', array($entry['sensor_id']));
}
dbDelete('sensors', '`sensor_id` = ?', array($entry['sensor_id']));
log_event('Sensor Deleted: ' . $entry['sensor_class'] . ' ' . $entry['sensor_type'] . ' ' . $entry['sensor_index'] . ' ' . $entry['sensor_descr'], $device, 'sensor', $sensor_id);
log_event('Sensor Deleted: ' . $entry['sensor_class'] . ' ' . $entry['sensor_type'] . ' ' . $entry['sensor_index'] . ' ' . $entry['sensor_descr'], $device, 'sensor', 3, $sensor_id);
}
unset($oid);
@@ -469,7 +469,7 @@ function discover_juniAtmVp(&$valid, $port_id, $vp_id, $vp_descr)
d_echo("( $inserted inserted )\n");
// FIXME vv no $device!
log_event('Juniper ATM VP Added: port ' . mres($port_id) . ' vp ' . mres($vp_id) . ' descr' . mres($vp_descr), 'juniAtmVp', $inserted);
log_event('Juniper ATM VP Added: port ' . mres($port_id) . ' vp ' . mres($vp_id) . ' descr' . mres($vp_descr), 'juniAtmVp', 3, $inserted);
} else {
echo '.';
}
@@ -602,7 +602,7 @@ function discover_processor(&$valid, $device, $oid, $index, $type, $descr, $prec
$inserted = dbInsert($insert_data, 'processors');
echo '+';
log_event('Processor added: type ' . mres($type) . ' index ' . mres($index) . ' descr ' . mres($descr), $device, 'processor', $inserted);
log_event('Processor added: type ' . mres($type) . ' index ' . mres($index) . ' descr ' . mres($descr), $device, 'processor', 3, $inserted);
} else {
echo '.';
$update_data = array(
@@ -648,7 +648,7 @@ function discover_mempool(&$valid, $device, $index, $type, $descr, $precision =
$inserted = dbInsert($insert_data, 'mempools');
echo '+';
log_event('Memory pool added: type ' . mres($type) . ' index ' . mres($index) . ' descr ' . mres($descr), $device, 'mempool', $inserted);
log_event('Memory pool added: type ' . mres($type) . ' index ' . mres($index) . ' descr ' . mres($descr), $device, 'mempool', 3, $inserted);
} else {
echo '.';
$update_data = array(
@@ -678,7 +678,7 @@ function discover_toner(&$valid, $device, $oid, $index, $type, $descr, $capacity
if (dbFetchCell('SELECT COUNT(toner_id) FROM `toner` WHERE device_id = ? AND toner_type = ? AND `toner_index` = ? AND `toner_oid` =?', array($device['device_id'], $type, $index, $oid)) == '0') {
$inserted = dbInsert(array('device_id' => $device['device_id'], 'toner_oid' => $oid, 'toner_capacity_oid' => $capacity_oid, 'toner_index' => $index, 'toner_type' => $type, 'toner_descr' => $descr, 'toner_capacity' => $capacity, 'toner_current' => $current), 'toner');
echo '+';
log_event('Toner added: type ' . mres($type) . ' index ' . mres($index) . ' descr ' . mres($descr), $device, 'toner', $inserted);
log_event('Toner added: type ' . mres($type) . ' index ' . mres($index) . ' descr ' . mres($descr), $device, 'toner', 3, $inserted);
} else {
$toner_entry = dbFetchRow('SELECT * FROM `toner` WHERE `device_id` = ? AND `toner_type` = ? AND `toner_index` =?', array($device['device_id'], $type, $index));
if ($oid == $toner_entry['toner_oid'] && $descr == $toner_entry['toner_descr'] && $capacity == $toner_entry['toner_capacity'] && $capacity_oid == $toner_entry['toner_capacity_oid']) {
+2 -2
View File
@@ -117,7 +117,7 @@ if ($config['enable_libvirt'] == '1' && $device['os'] == 'linux') {
if (count($result['device_id']) == 0) {
$inserted_id = dbInsert(array('device_id' => $device['device_id'], 'vm_type' => 'libvirt', 'vmwVmVMID' => $dom_id, 'vmwVmDisplayName' => mres($vmwVmDisplayName), 'vmwVmGuestOS' => mres($vmwVmGuestOS), 'vmwVmMemSize' => mres($vmwVmMemSize), 'vmwVmCpus' => mres($vmwVmCpus), 'vmwVmState' => mres($vmwVmState)), 'vminfo');
echo '+';
log_event("Virtual Machine added: $vmwVmDisplayName ($vmwVmMemSize MB)", $device, 'vm', $inserted_id);
log_event("Virtual Machine added: $vmwVmDisplayName ($vmwVmMemSize MB)", $device, 'vm', 3, $inserted_id);
} else {
if ($result['vmwVmState'] != $vmwVmState
|| $result['vmwVmDisplayName'] != $vmwVmDisplayName
@@ -153,7 +153,7 @@ if ($config['enable_libvirt'] == '1' && $device['os'] == 'linux') {
if (!in_array($db_vm['vmwVmVMID'], $libvirt_vmlist)) {
dbDelete('vminfo', '`id` = ?', array($db_vm['id']));
echo '-';
log_event('Virtual Machine removed: ' . $db_vm['vmwVmDisplayName'], $device, 'vm', $db_vm['id']);
log_event('Virtual Machine removed: ' . $db_vm['vmwVmDisplayName'], $device, 'vm', 4, $db_vm['id']);
}
}
+1 -1
View File
@@ -20,7 +20,7 @@ foreach (dbFetchRows($sql) as $test_processor) {
if (!$valid['processor'][$processor_type][$processor_index]) {
echo '-';
dbDelete('processors', '`processor_id` = ?', array($test_processor['processor_id']));
log_event('Processor removed: type ' . $processor_type . ' index ' . $processor_index . ' descr ' . $test_processor['processor_descr'], $device, 'processor', $test_processor['processor_id']);
log_event('Processor removed: type ' . $processor_type . ' index ' . $processor_index . ' descr ' . $test_processor['processor_descr'], $device, 'processor', 4, $test_processor['processor_id']);
}
unset($processor_oid);
+2 -2
View File
@@ -97,13 +97,13 @@ if ($stpprotocol == 'ieee8021d' || $stpprotocol == 'unknown') {
if (!$stp_db['bridgeAddress'] && $stp['bridgeAddress']) {
dbInsert($stp, 'stp');
log_event('STP added, bridge address: ' . $stp['bridgeAddress'], $device, 'stp');
log_event('STP added, bridge address: ' . $stp['bridgeAddress'], $device, 'stp', 3);
echo '+';
}
if ($stp_db['bridgeAddress'] && !$stp['bridgeAddress']) {
dbDelete('stp', 'device_id = ?', array($device['device_id']));
log_event('STP removed', $device, 'stp');
log_event('STP removed', $device, 'stp', 4);
echo '-';
}
+2 -2
View File
@@ -42,7 +42,7 @@ if (($device['os'] == 'vmware') || ($device['os'] == 'linux')) {
*/
if (dbFetchCell("SELECT COUNT(id) FROM `vminfo` WHERE `device_id` = ? AND `vmwVmVMID` = ? AND vm_type='vmware'", array($device['device_id'], $index)) == 0) {
$vmid = dbInsert(array('device_id' => $device['device_id'], 'vm_type' => 'vmware', 'vmwVmVMID' => $index, 'vmwVmDisplayName' => mres($vmwVmDisplayName), 'vmwVmGuestOS' => mres($vmwVmGuestOS), 'vmwVmMemSize' => mres($vmwVmMemSize), 'vmwVmCpus' => mres($vmwVmCpus), 'vmwVmState' => mres($vmwVmState)), 'vminfo');
log_event(mres($vmwVmDisplayName) . " ($vmwVmMemSize GB / $vmwVmCpus vCPU) Discovered", $device, 'system', $vmid);
log_event(mres($vmwVmDisplayName) . " ($vmwVmMemSize GB / $vmwVmCpus vCPU) Discovered", $device, 'system', 3, $vmid);
echo '+';
// FIXME eventlog
} else {
@@ -69,7 +69,7 @@ if (($device['os'] == 'vmware') || ($device['os'] == 'linux')) {
if (!in_array($db_vm['vmwVmVMID'], $vmw_vmlist)) {
dbDelete('vminfo', '`id` = ?', array($db_vm['id']));
log_event(mres($db_vm['vmwVmDisplayName']) . ' Removed', $device, 'system', $db_vm['vmwVmVMID']);
log_event(mres($db_vm['vmwVmDisplayName']) . ' Removed', $device, 'system', 4, $db_vm['vmwVmVMID']);
echo '-';
// FIXME eventlog
}
+3 -3
View File
@@ -135,11 +135,11 @@ if ($config['enable_bgp']) {
if ($bgpPeerFsmEstablishedTime) {
if (!(is_array($config['alerts']['bgp']['whitelist']) && !in_array($peer['bgpPeerRemoteAs'], $config['alerts']['bgp']['whitelist'])) && ($bgpPeerFsmEstablishedTime < $peer['bgpPeerFsmEstablishedTime'] || $bgpPeerState != $peer['bgpPeerState'])) {
if ($peer['bgpPeerState'] == $bgpPeerState) {
log_event('BGP Session Flap: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ')', $device, 'bgpPeer', $bgpPeer_id);
log_event('BGP Session Flap: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ')', $device, 'bgpPeer', 4, $bgpPeer_id);
} elseif ($bgpPeerState == 'established') {
log_event('BGP Session Up: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ')', $device, 'bgpPeer', $bgpPeer_id);
log_event('BGP Session Up: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ')', $device, 'bgpPeer', 1, $bgpPeer_id);
} elseif ($peer['bgpPeerState'] == 'established') {
log_event('BGP Session Down: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ')', $device, 'bgpPeer', $bgpPeer_id);
log_event('BGP Session Down: ' . $peer['bgpPeerIdentifier'] . ' (AS' . $peer['bgpPeerRemoteAs'] . ')', $device, 'bgpPeer', 5, $bgpPeer_id);
}
}
}
+2 -2
View File
@@ -93,13 +93,13 @@ foreach (array('sysLocation', 'sysContact') as $elem) {
foreach (array('sysContact', 'sysObjectID', 'sysName', 'sysDescr') as $elem) {
if ($poll_device[$elem] != $device[$elem]) {
$update_array[$elem] = $poll_device[$elem];
log_event("$elem -> " . $poll_device[$elem], $device, 'system');
log_event("$elem -> " . $poll_device[$elem], $device, 'system', 3);
}
}
if ($poll_device['sysLocation'] && $device['location'] != $poll_device['sysLocation'] && $device['override_sysLocation'] == 0) {
$update_array['location'] = $poll_device['sysLocation'];
log_event('Location -> ' . $poll_device['sysLocation'], $device, 'system');
log_event('Location -> ' . $poll_device['sysLocation'], $device, 'system', 3);
}
if ($config['geoloc']['latlng'] === true) {
+5 -5
View File
@@ -168,13 +168,13 @@ function poll_sensor($device, $class)
// FIXME also warn when crossing WARN level!!
if ($sensor['sensor_limit_low'] != '' && $sensor['sensor_current'] > $sensor['sensor_limit_low'] && $sensor_value < $sensor['sensor_limit_low'] && $sensor['sensor_alert'] == 1) {
echo 'Alerting for '.$device['hostname'].' '.$sensor['sensor_descr']."\n";
log_event(ucfirst($class) . ' ' . $sensor['sensor_descr'] . ' under threshold: ' . $sensor_value . " $unit (< " . $sensor['sensor_limit_low'] . " $unit)", $device, $class, $sensor['sensor_id']);
log_event(ucfirst($class) . ' ' . $sensor['sensor_descr'] . ' under threshold: ' . $sensor_value . " $unit (< " . $sensor['sensor_limit_low'] . " $unit)", $device, $class, 4, $sensor['sensor_id']);
} elseif ($sensor['sensor_limit'] != '' && $sensor['sensor_current'] < $sensor['sensor_limit'] && $sensor_value > $sensor['sensor_limit'] && $sensor['sensor_alert'] == 1) {
echo 'Alerting for '.$device['hostname'].' '.$sensor['sensor_descr']."\n";
log_event(ucfirst($class) . ' ' . $sensor['sensor_descr'] . ' above threshold: ' . $sensor_value . " $unit (> " . $sensor['sensor_limit'] . " $unit)", $device, $class, $sensor['sensor_id']);
log_event(ucfirst($class) . ' ' . $sensor['sensor_descr'] . ' above threshold: ' . $sensor_value . " $unit (> " . $sensor['sensor_limit'] . " $unit)", $device, $class, 4, $sensor['sensor_id']);
}
if ($sensor['sensor_class'] == 'state' && $sensor['sensor_current'] != $sensor_value) {
log_event($class . ' sensor has changed from ' . $sensor['sensor_current'] . ' to ' . $sensor_value, $device, $class, $sensor['sensor_id']);
log_event($class . ' sensor has changed from ' . $sensor['sensor_current'] . ' to ' . $sensor_value, $device, $class, 3, $sensor['sensor_id']);
}
dbUpdate(array('sensor_current' => $sensor_value, 'sensor_prev' => $sensor['sensor_current'], 'lastupdate' => array('NOW()')), 'sensors', "`sensor_class` = '?' AND `sensor_id` = ?", array($class,$sensor['sensor_id']));
unset($supported_sensors);
@@ -203,7 +203,7 @@ function poll_device($device, $options)
$ip = dnslookup($device);
if (!empty($ip) && $ip != inet6_ntop($device['ip'])) {
log_event('Device IP changed to ' . $ip, $device, 'system');
log_event('Device IP changed to ' . $ip, $device, 'system', 3);
$db_ip = inet_pton($ip);
dbUpdate(array('ip' => $db_ip), 'devices', 'device_id=?', array($device['device_id']));
}
@@ -264,7 +264,7 @@ function poll_device($device, $options)
dbUpdate(array('status' => $status, 'status_reason' => $response['status_reason']), 'devices', 'device_id=?', array($device['device_id']));
log_event('Device status changed to ' . ($status == '1' ? 'Up' : 'Down') . ' from ' . $response['status_reason'] . ' check.', $device, ($status == '1' ? 'up' : 'down'));
log_event('Device status changed to ' . ($status == '1' ? 'Up' : 'Down') . ' from ' . $response['status_reason'] . ' check.', $device, ($status == '1' ? 'up' : 'down'), 4);
}
if ($status == '1') {
+5 -5
View File
@@ -12,27 +12,27 @@ if (is_file($config['install_dir'].'/includes/polling/os/'.$device['os'].'.inc.p
if ($device['version'] != $version) {
$update_array['version'] = $version;
log_event('OS Version -> ' . $version, $device, 'system');
log_event('OS Version -> ' . $version, $device, 'system', 3);
}
if ($features != $device['features']) {
$update_array['features'] = $features;
log_event('OS Features -> ' . $features, $device, 'system');
log_event('OS Features -> ' . $features, $device, 'system', 3);
}
if ($hardware != $device['hardware']) {
$update_array['hardware'] = $hardware;
log_event('Hardware -> ' . $hardware, $device, 'system');
log_event('Hardware -> ' . $hardware, $device, 'system', 3);
}
if ($serial != $device['serial']) {
$update_array['serial'] = $serial;
log_event('Serial -> ' . $serial, $device, 'system');
log_event('Serial -> ' . $serial, $device, 'system', 3);
}
if ($icon != $device['icon']) {
$update_array['icon'] = $icon;
log_event('Icon -> ' . $icon, $device, 'system');
log_event('Icon -> ' . $icon, $device, 'system', 3);
}
echo 'Hardware: ' . $hardware . PHP_EOL;
+1 -1
View File
@@ -83,7 +83,7 @@ foreach ($db_info_list as $db_info) {
// FIXME - this should loop building a query and then run the query after the loop (bad geert!)
dbUpdate(array($property => $vm_info[$property]), 'vminfo', '`id` = ?', array($db_info['id']));
if ($db_info['vmwVmDisplayName'] != null) {
log_event($db_info['vmwVmDisplayName'] . ' (' . preg_replace('/^vmwVm/', '', $property) . ') -> ' . $vm_info[$property], $device);
log_event($db_info['vmwVmDisplayName'] . ' (' . preg_replace('/^vmwVm/', '', $property) . ') -> ' . $vm_info[$property], $device, null, 3);
}
}
}
+5 -5
View File
@@ -476,7 +476,7 @@ foreach ($ports as $port) {
if ($port[$oid] != $this_port[$oid] && !isset($this_port[$oid])) {
$port['update'][$oid] = array('NULL');
log_event($oid . ': ' . $port[$oid] . ' -> NULL', $device, 'interface', $port['port_id']);
log_event($oid . ': ' . $port[$oid] . ' -> NULL', $device, 'interface', 4, $port['port_id']);
if ($debug) {
d_echo($oid.': '.$port[$oid].' -> NULL ');
} else {
@@ -504,7 +504,7 @@ foreach ($ports as $port) {
$port['update'][$oid.'_prev'] = $port[$oid];
}
log_event($oid . ': ' . $port[$oid] . ' -> ' . $this_port[$oid], $device, 'interface', $port['port_id']);
log_event($oid . ': ' . $port[$oid] . ' -> ' . $this_port[$oid], $device, 'interface', 3, $port['port_id']);
if ($debug) {
d_echo($oid.': '.$port[$oid].' -> '.$this_port[$oid].' ');
} else {
@@ -536,7 +536,7 @@ foreach ($ports as $port) {
}
$port['update'][$attrib_key] = $port_ifAlias[$attrib];
log_event($attrib . ': ' . $port[$attrib_key] . ' -> ' . $log_port, $device, 'interface', $port['port_id']);
log_event($attrib . ': ' . $port[$attrib_key] . ' -> ' . $log_port, $device, 'interface', 3, $port['port_id']);
unset($log_port);
}
}
@@ -605,7 +605,7 @@ foreach ($ports as $port) {
$saturation_threshold = ($this_port['ifSpeed'] * ( $config['alerts']['port_util_perc'] / 100 ));
echo 'IN: '.$port['stats']['ifInBits_rate'].' OUT: '.$port['stats']['ifOutBits_rate'].' THRESH: '.$saturation_threshold;
if (($port['stats']['ifInBits_rate'] >= $saturation_threshold || $port['stats']['ifOutBits_rate'] >= $saturation_threshold) && $saturation_threshold > 0) {
log_event('Port reached saturation threshold: ' . formatRates($port['stats']['ifInBits_rate']) . '/' . formatRates($port['stats']['ifOutBits_rate']) . ' - ifspeed: ' . formatRates($this_port['stats']['ifSpeed']), $device, 'interface', $port['port_id']);
log_event('Port reached saturation threshold: ' . formatRates($port['stats']['ifInBits_rate']) . '/' . formatRates($port['stats']['ifOutBits_rate']) . ' - ifspeed: ' . formatRates($this_port['stats']['ifSpeed']), $device, 'interface', 4, $port['port_id']);
}
}
@@ -675,7 +675,7 @@ foreach ($ports as $port) {
// If data has changed, build a query
$port['update'][$oid] = $this_port[$oid];
echo 'PAgP ';
log_event("$oid -> " . $this_port[$oid], $device, 'interface', $port['port_id']);
log_event("$oid -> " . $this_port[$oid], $device, 'interface', 3, $port['port_id']);
}
}
}
+3 -3
View File
@@ -92,12 +92,12 @@ if ($stpprotocol == 'ieee8021d' || $stpprotocol == 'unknown') {
if ($stp_db['bridgeAddress'] && $stp['bridgeAddress']) {
// Logging if designated root changed since last db update
if ($stp_db['designatedRoot'] != $stp['designatedRoot']) {
log_event('STP designated root changed: ' . $stp_db['designatedRoot'] . ' > ' . $stp['designatedRoot'], $device, 'stp');
log_event('STP designated root changed: ' . $stp_db['designatedRoot'] . ' > ' . $stp['designatedRoot'], $device, 'stp', 4);
}
// Logging if designated root port changed since last db update
if (isset($stp['rootPort']) && $stp_db['rootPort'] != $stp['rootPort']) {
log_event('STP root port changed: ' . $stp_db['rootPort'] . ' > ' . $stp['rootPort'], $device, 'stp');
log_event('STP root port changed: ' . $stp_db['rootPort'] . ' > ' . $stp['rootPort'], $device, 'stp', 4);
}
// Logging if topology changed since last db update
@@ -110,7 +110,7 @@ if ($stpprotocol == 'ieee8021d' || $stpprotocol == 'unknown') {
// ToDo fix log_event()
//
//log_event('STP topology changed after: '.formatUptime($stp['timeSinceTopologyChange']), $device, 'stp', $stp['timeSinceTopologyChange']);
log_event('STP topology changed after: ' . formatUptime($stp['timeSinceTopologyChange']), $device, 'stp');
log_event('STP topology changed after: ' . formatUptime($stp['timeSinceTopologyChange']), $device, 'stp', 4);
}
// Write to db
dbUpdate($stp, 'stp', 'device_id = ?', array($device['device_id']));
+3 -3
View File
@@ -19,13 +19,13 @@ foreach ($toner_data as $toner) {
// Log empty supplies (but only once)
if ($tonerperc == 0 && $toner['toner_current'] > 0) {
log_event('Toner ' . $toner['toner_descr'] . ' is empty', $device, 'toner', $toner['toner_id']);
log_event('Toner ' . $toner['toner_descr'] . ' is empty', $device, 'toner', 5, $toner['toner_id']);
}
// Log toner swap
if ($tonerperc > $toner['toner_current']) {
log_event('Toner ' . $toner['toner_descr'] . ' was replaced (new level: ' . $tonerperc . '%)', $device, 'toner', $toner['toner_id']);
log_event('Toner ' . $toner['toner_descr'] . ' was replaced (new level: ' . $tonerperc . '%)', $device, 'toner', 3, $toner['toner_id']);
}
dbUpdate(array('toner_current' => $tonerperc, 'toner_capacity' => $toner['toner_capacity']), 'toner', '`toner_id` = ?', array($toner['toner_id']));
dbUpdate(array('toner_current' => $tonerperc, 'toner_capacity' => $toner['toner_capacity']), 'toner', '`toner_id` = ?', 4, array($toner['toner_id']));
}//end foreach
+3 -3
View File
@@ -118,7 +118,7 @@ foreach ($pkgs_id as $pkg) {
}
echo '+'.$name.'-'.$version.$dbuild.'-'.$arch;
log_event('Package installed: ' . $name . ' (' . $arch . ') version ' . $version . $dbuild, $device, 'package');
log_event('Package installed: ' . $name . ' (' . $arch . ') version ' . $version . $dbuild, $device, 'package', 3);
} elseif (count($pkgs_db[$manager][$name][$arch], 1)) {
$pkg_c = dbFetchRow('SELECT * FROM `packages` WHERE `device_id` = ? AND `manager` = ? AND `name` = ? and `arch` = ? ORDER BY version DESC, build DESC', array($device['device_id'], $manager, $name, $arch));
if ($pkg_c['build'] != '') {
@@ -135,7 +135,7 @@ foreach ($pkgs_id as $pkg) {
'size' => $size,
);
dbUpdate($pkg_update, 'packages', '`pkg_id` = ?', array($pkg_c['pkg_id']));
log_event('Package updated: ' . $name . ' (' . $arch . ') from ' . $pkg_c['version'] . $pkg_c_dbuild . ' to ' . $version . $dbuild, $device, 'package');
log_event('Package updated: ' . $name . ' (' . $arch . ') from ' . $pkg_c['version'] . $pkg_c_dbuild . ' to ' . $version . $dbuild, $device, 'package', 3);
unset($pkgs_db_id[$pkg_c['pkg_id']]);
}//end if
}//end if
@@ -146,7 +146,7 @@ foreach ($pkgs_id as $pkg) {
foreach ($pkgs_db_id as $id => $pkg) {
dbDelete('packages', '`pkg_id` = ?', array($id));
echo '-'.$pkg['text'];
log_event('Package removed: ' . $pkg['name'] . ' ' . $pkg['arch'] . ' ' . $pkg['version'] . ($pkg['build'] != '' ? '-' . $pkg['build'] : ''), $device, 'package');
log_event('Package removed: ' . $pkg['name'] . ' ' . $pkg['arch'] . ' ' . $pkg['version'] . ($pkg['build'] != '' ? '-' . $pkg['build'] : ''), $device, 'package', 3);
}
echo "\n";