mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Use Netscaler vserver full names (#7279)

Browse Source 
Netscaler vserver names can be up to 127 chars long.  The current db schema supports that but the actual polling was using vsvrName instead of vsvrFullName, therefore producing some ramdom strings for vserver name longer than 30 chars.
This commit is contained in:
Mathieu Patenaude
2017-09-07 04:29:40 -04:00
committed by Neil Lathwood
parent 66f9411adc
commit fea2f37f20
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
includes/polling/netscaler-vsvr.inc.php
View File

@@ -1,6 +1,6 @@
<?php
// NS-ROOT-MIB::vsvrName."librenms" = STRING: "librenms"
// NS-ROOT-MIB::vsvrFullName."librenms" = STRING: "librenms"
// NS-ROOT-MIB::vsvrIpAddress."librenms" = IpAddress: 195.78.84.141
// NS-ROOT-MIB::vsvrPort."librenms" = INTEGER: 80
// NS-ROOT-MIB::vsvrType."librenms" = INTEGER: http(0)
@@ -76,9 +76,9 @@ if ($device['os'] == 'netscaler') {
d_echo($vsvrs);
foreach ($vsvr_array as $index => $vsvr) {
if (isset($vsvr['vsvrName'])) {
$vsvr_exist[$vsvr['vsvrName']] = 1;
$rrd_name = 'netscaler-vsvr-'.$vsvr['vsvrName'];
if (isset($vsvr['vsvrFullName'])) {
$vsvr_exist[$vsvr['vsvrFullName']] = 1;
$rrd_name = 'netscaler-vsvr-'.$vsvr['vsvrFullName'];
$fields = array();
foreach ($oids as $oid) {
@@ -90,13 +90,13 @@ if ($device['os'] == 'netscaler') {
}
$tags = array(
'vsvrName' => $vsvr['vsvrName'],
'vsvrFullName' => $vsvr['vsvrFullName'],
'rrd_name' => $rrd_name,
'rrd_def' => $rrd_def
);
data_update($device, 'netscaler-vsvr', $tags, $fields);
echo str_pad($vsvr['vsvrName'], 25).' | '.str_pad($vsvr['vsvrType'], 5).' | '.str_pad($vsvr['vsvrState'], 6).' | '.str_pad($vsvr['vsvrIpAddress'], 16).' | '.str_pad($vsvr['vsvrPort'], 5);
echo str_pad($vsvr['vsvrFullName'], 25).' | '.str_pad($vsvr['vsvrType'], 5).' | '.str_pad($vsvr['vsvrState'], 6).' | '.str_pad($vsvr['vsvrIpAddress'], 16).' | '.str_pad($vsvr['vsvrPort'], 5);
echo ' | '.str_pad($vsvr['vsvrRequestRate'], 8).' | '.str_pad($vsvr['vsvrRxBytesRate'].'B/s', 8).' | '.str_pad($vsvr['vsvrTxBytesRate'].'B/s', 8);
$db_update = array(
@@ -109,12 +109,12 @@ if ($device['os'] == 'netscaler') {
'vsvr_bps_out' => $vsvr['vsvrTxBytesRate'],
);
if (!is_array($vsvrs[$vsvr['vsvrName']])) {
$db_insert = array_merge(array('device_id' => $device['device_id'], 'vsvr_name' => $vsvr['vsvrName']), $db_update);
if (!is_array($vsvrs[$vsvr['vsvrFullName']])) {
$db_insert = array_merge(array('device_id' => $device['device_id'], 'vsvr_name' => $vsvr['vsvrFullName']), $db_update);
$vsvr_id = dbInsert($db_insert, 'netscaler_vservers');
echo ' +';
} else {
$updated = dbUpdate($db_update, 'netscaler_vservers', '`vsvr_id` = ?', array($vsvrs[$vsvr['vsvrName']]['vsvr_id']));
$updated = dbUpdate($db_update, 'netscaler_vservers', '`vsvr_id` = ?', array($vsvrs[$vsvr['vsvrFullName']]['vsvr_id']));
echo ' U';
}