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: ZyWALL Fixes for OS and mem polling #1652

Browse Source
This commit is contained in:
Neil Lathwood
2016-10-20 20:54:01 +01:00
committed by GitHub
parent 3b350a43ad 65ae4d1396
commit 46616c1392
5 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
html/includes/graphs/device/zywall_sessions.inc.php Normal file
View File

@@ -0,0 +1,16 @@
<?php
$rrd_filename = rrd_name($device['hostname'], 'zywall-sessions');
$ds = 'sessions';
$colour_area = '9999cc';
$colour_line = '0000cc';
$colour_area_max = '9999cc';
$graph_max = 1;
$unit_text = 'Sessions';
require 'includes/graphs/generic_simplex.inc.php';

7
includes/discovery/mempools/zywall.inc.php
View File

@@ -13,10 +13,9 @@
*/ */
if ($device['os'] == 'zywall') { if ($device['os'] == 'zywall') {
echo 'Zywall mempool: '; d_echo('Zywall');
$oid = '.1.3.6.1.4.1.890.1.6.22.1.2.0'; $usage = snmp_get($device, '.1.3.6.1.4.1.890.1.6.22.1.2.0', '-Ovq');
$usage = snmp_get($device, $oid, '-Ovq');
if (is_numeric($usage)) { if (is_numeric($usage)) {
discover_mempool($valid_mempool, $device, $oid, 'zywall', 'Memory', '1', null, null); discover_mempool($valid_mempool, $device, '0', 'zywall', 'Memory', '1', null, null);
} }
} }

22
includes/polling/mempools/zywall.inc.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
/*
* LibreNMS
*
* Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com>
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*/
if ($device['os'] == 'zywall') {
d_echo('Zywall');
$perc = snmp_get($device, ".1.3.6.1.4.1.890.1.6.22.1.2.0", '-OvQ');
if (is_numeric($perc)) {
$mempool['perc'] = $perc;
$mempool['used'] = $perc;
$mempool['total'] = 100;
$mempool['free'] = 100 - $perc;
}
}

17
includes/polling/os/zywall.inc.php
View File

@@ -2,6 +2,17 @@
$hardware = $poll_device['sysDescr']; $hardware = $poll_device['sysDescr'];
$version = snmp_get($device, '.1.3.6.1.4.1.890.1.15.3.1.6.0', '-Osqv'); $version = explode("ITS", trim(snmp_get($device, '.1.3.6.1.4.1.890.1.15.3.1.6.0', '-Osqv'), '"'), 2);
$version = str_replace('"', ' ', $version); $version = $version[0];
$serial = snmp_get($device, '1.3.6.1.4.1.890.1.15.3.1.12.0', '-Osqv'); $serial = trim(snmp_get($device, '.1.3.6.1.4.1.890.1.15.3.1.12.0', '-Oqv'), '"');
$sessions = snmp_get($device, '.1.3.6.1.4.1.890.1.6.22.1.6.0', '-Ovq');
if (is_numeric($sessions)) {
$rrd_def = 'DS:sessions:GAUGE:600:0:3000000';
$fields = array(
'sessions' => $sessions,
);
$tags = compact('rrd_def');
data_update($device, 'zywall-sessions', $tags, $fields);
$graphs['zywall_sessions'] = true;
}

1
sql-schema/148.sql Normal file
View File

@@ -0,0 +1 @@
INSERT INTO `graph_types`(`graph_type`, `graph_subtype`, `graph_section`, `graph_descr`, `graph_order`) VALUES ('device', 'zywall_sessions', 'firewall', 'Sessions', '');