mirror of
				https://github.com/librenms/librenms.git
				synced 2024-10-07 16:52:45 +00:00 
			
		
		
		
	fix: Zywall Fixes #1652
This commit is contained in:
		@@ -13,10 +13,9 @@
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
if ($device['os'] == 'zywall') {
 | 
			
		||||
    echo 'Zywall mempool: ';
 | 
			
		||||
    $oid = '.1.3.6.1.4.1.890.1.6.22.1.2.0';
 | 
			
		||||
    $usage = snmp_get($device, $oid, '-Ovq');
 | 
			
		||||
    d_echo('Zywall');
 | 
			
		||||
    $usage = snmp_get($device, '.1.3.6.1.4.1.890.1.6.22.1.2.0', '-Ovq');
 | 
			
		||||
    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
									
								
							
							
						
						
									
										22
									
								
								includes/polling/mempools/zywall.inc.php
									
									
									
									
									
										Normal 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;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -2,6 +2,17 @@
 | 
			
		||||
 | 
			
		||||
$hardware = $poll_device['sysDescr'];
 | 
			
		||||
 | 
			
		||||
$version = snmp_get($device, '.1.3.6.1.4.1.890.1.15.3.1.6.0', '-Osqv');
 | 
			
		||||
$version = str_replace('"', ' ', $version);
 | 
			
		||||
$serial = snmp_get($device, '1.3.6.1.4.1.890.1.15.3.1.12.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 = $version[0];
 | 
			
		||||
$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;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user