From 52ad0b24abdc804f12aafcec3fc57985679df7de Mon Sep 17 00:00:00 2001
From: Rainer Schueler <librenms@layer3.de>
Date: Wed, 13 Apr 2016 13:41:42 +0200
Subject: [PATCH 1/7] Added rudimentary support for Viprinet VPN routers.
 https://www.viprinet.com/de/support/downloads

---
 html/images/os/viprinet.png                   | Bin 0 -> 1180 bytes
 includes/definitions.inc.php                  |  11 +
 includes/discovery/os/viprinet.inc.php        |   7 +
 .../discovery/processors/viprinet.inc.php     |  14 +
 includes/polling/os/viprinet.inc.php          |   6 +
 includes/polling/processors/viprinet.inc.php  |  10 +
 mibs/VIPRINET-MIB                             | 831 ++++++++++++++++++
 7 files changed, 879 insertions(+)
 create mode 100644 html/images/os/viprinet.png
 create mode 100644 includes/discovery/os/viprinet.inc.php
 create mode 100644 includes/discovery/processors/viprinet.inc.php
 create mode 100644 includes/polling/os/viprinet.inc.php
 create mode 100644 includes/polling/processors/viprinet.inc.php
 create mode 100644 mibs/VIPRINET-MIB

diff --git a/html/images/os/viprinet.png b/html/images/os/viprinet.png
new file mode 100644
index 0000000000000000000000000000000000000000..363aacf7cbfe2ea56a15277b5ae67498d75e241b
GIT binary patch
literal 1180
zcmV;N1Y`S&P)<h;3K|Lk000e1NJLTq002n<000>X0ssI2@}HD^00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-#n4G1m+L1)Gh000C#Nkl<ZSi|jDPfXiZ82>0xG&0Pp
zHkAs`DiYPI+S;a7REsA~^f2PAJ7P!cX=>qK8mZ@kdfQY3(qNjDfO<l*>7hZDNZ28{
z#Ae}AY4%ig+Kl{WsR~HJS*S9^vcnt3O$ZAaDx%^$+3!8S_rCZ0^Vx1Hm&@>$#wmDv
zqpsXkRg<I%3**MtkfaG&nLmQ$%5}uUhvVI-CzDaj4MjKV5yY>`Z#<gn(VK-awlK>w
z6h$>~e5$HZ6veX4p@5Mq=>872o{>$*%S%?wX>%<l^vT{vT{l!!a~y}FC`6+WA3T;`
zQY_^vS{%noB$8Ao1ptUfj^pUMLAshpM@IobR_1lXsGv<WI#Vi@Xc}1<$D%VF7a#;v
zHI1gx)YSLV_@rU{(tD}5bBC*L@00jKEH=yYK{C1HI5dp_z+6k&`K-T#eev??&wtFV
zuBW%Qi)Y_`-@C54mNIPRx7?3*KD+(*)_d(ego>-{>9s%gt?f+!$Q29#@U@+P5?=_1
zg;XjXiHyYK3&X>=<MD;7S3lmx&Dn4wk$V*y8y$N<1cogvjZeC}AD1S1{!0Le+`WS>
z%yFNos^<2_VzXlSrlLGXsGBq@%42uH>U!F+mCUc-uCAv6AirrovmQOO9(h@}Voq=V
zl>>l{SLTX2O?q<$!>|>Cn_(-4t&sGvg~=u*X~ISFHBR!OAOI{Tl3oL#5!%xLER63)
z?nELZ92ba2f8e-4EH>+9zbFhU@?0b`Qj1!rTYR50-}GO;f8)dN0Km@w<oblUmg+fo
zo%DY3!4yHbSjsV7qR=N37ZLhop-*PIL;w)O0@*fM&cc}4+4H}-(FoB9Y1*>8d@`{_
zNLU>dMTJGdz2$=gnH^ZjRKvr!_m|C;3nIB_ZT9&)SXV^^ic9BjxFau~?I!@%nu<n<
zC{0y0hGi0q$vwP;4+Rs8ySQakEyxe-Ib8*qEX%kwAj|xxCHUI>HT>NG03tB&$o!_c
z&uk$+Nb+G>#(S(S-s6u(XDp0qgovfO2k?d?{d~;5-r6qK^9V&z)hye^jpG6oMG?^_
zl1oRGSVa)hwx9Ml@N7#3xXHv)SQJ!M8ydQGRQdE@zJK`d$^q_^jH+1}>$*|PNQmuL
z*k)tzV%0&E<}J{<f^OJKuAu+l+(LZNah!2!l4Tj<Keb*jRgW=h>hh<x58^=4`OZae
zNg(CUEo%oA;i+mx%E~++9N1sDqhk-qCr>mwBP;WQICv<zb)UKBYx9$8ZrDot`B<@(
z^R@ZA&s^J)UpoL~f1j=g%$ACKQ5*yS{&gd%a3PjuhK6p1#hVt!q<p)^gJ{GS3e`2k
zEeu|NuWo5=_Hn)U3|o2e@+rCPId}ca1+lf+M+Pum;>Ih}&S&j>_9Oc1{XYl}{2d@k
u6RNhX$a5$E6i#wG$?c%gbn*}HSjIm)Th)TK{j)s)0000<MNUMnLSTZT={&3e

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 4b4ee1e56..e9c427a5c 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -95,6 +95,17 @@ $config['os'][$os]['over'][1]['text']  = 'Processor Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_ucd_memory';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+$os = 'viprinet';
+$config['os'][$os]['text']             = 'viprinet';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'viprinet';
+$config['os'][$os]['ifname']           = 1;
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'Processor Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_ucd_memory';
+
 $os = 'edgeos';
 $config['os'][$os]['text']             = 'EdgeOS';
 $config['os'][$os]['type']             = 'network';
diff --git a/includes/discovery/os/viprinet.inc.php b/includes/discovery/os/viprinet.inc.php
new file mode 100644
index 000000000..eee216fdb
--- /dev/null
+++ b/includes/discovery/os/viprinet.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysDescr, 'Viprinet VPN Router')) {
+        $os = 'viprinet';
+    }
+}
diff --git a/includes/discovery/processors/viprinet.inc.php b/includes/discovery/processors/viprinet.inc.php
new file mode 100644
index 000000000..669bc01a6
--- /dev/null
+++ b/includes/discovery/processors/viprinet.inc.php
@@ -0,0 +1,14 @@
+<?php
+
+if ($device['os'] == 'viprinet') {
+
+    $usage = str_replace('"',"", snmp_get($device, 'VIPRINET-MIB::vpnRouterCPULoad.0', '-OvQ'));
+    $descr = 'Processor';
+
+    echo 'Viprinet :';
+
+    if (is_numeric($usage)) {
+        discover_processor($valid['processor'], $device, 'VIPRINET-MIB::vpnRouterCPULoad.0', '0', 'viprinet-cpu', $descr,
+ '1', $usage, null, null);
+    }
+}
diff --git a/includes/polling/os/viprinet.inc.php b/includes/polling/os/viprinet.inc.php
new file mode 100644
index 000000000..28d068a3b
--- /dev/null
+++ b/includes/polling/os/viprinet.inc.php
@@ -0,0 +1,6 @@
+<?php
+
+$version = trim(snmp_get($device, "vpnRouterFirmware.0", "-OQv", "VIPRINET-MIB"),'"');
+$hardware = "VPN Router " . trim(snmp_get($device, "vpnRouterModel.0", "-OQv", "VIPRINET-MIB"),'"');
+$hostname = trim(snmp_get($device, "vpnRouterName.0", "-OQv", "VIPRINET-MIB"),'"');
+$serial = trim(snmp_get($device, "vpnRouterSerial.0", "-OQv", "VIPRINET-MIB"),'"');
diff --git a/includes/polling/processors/viprinet.inc.php b/includes/polling/processors/viprinet.inc.php
new file mode 100644
index 000000000..e03d81a54
--- /dev/null
+++ b/includes/polling/processors/viprinet.inc.php
@@ -0,0 +1,10 @@
+<?php
+// Simple hard-coded poller for Pulse Secure
+echo 'Viprinet Secure CPU Usage';
+
+if ($device['os'] == 'viprinet') {
+    $usage = str_replace('"',"", snmp_get($device, 'VIPRINET-MIB::vpnRouterCPULoad.0', '-OvQ'));
+    if (is_numeric($usage)) {
+        $proc = ($usage * 100);
+    }
+}
diff --git a/mibs/VIPRINET-MIB b/mibs/VIPRINET-MIB
new file mode 100644
index 000000000..3e2e7102f
--- /dev/null
+++ b/mibs/VIPRINET-MIB
@@ -0,0 +1,831 @@
+VIPRINET-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY, OBJECT-TYPE, Integer32, Counter32, enterprises, TimeTicks
+        FROM SNMPv2-SMI
+    DisplayString
+        FROM SNMPv2-TC
+    OBJECT-GROUP, MODULE-COMPLIANCE
+        FROM SNMPv2-CONF
+;
+
+viprinet MODULE-IDENTITY 
+    LAST-UPDATED "201509281620Z" -- 28 September 2015
+    ORGANIZATION "Viprinet" 
+    CONTACT-INFO "Viprinet" 
+    DESCRIPTION "This MIB complements the ViprinetMIB." 
+    REVISION     "201509281620Z" -- 28 September 2015
+    DESCRIPTION  "Seventh revision."
+    ::= { enterprises 35424 }
+
+vpnRouter                    OBJECT IDENTIFIER ::= { viprinet 1 }
+
+vpnRouterInfo                OBJECT IDENTIFIER ::= { vpnRouter 1 }
+vpnRouterHealth              OBJECT IDENTIFIER ::= { vpnRouter 2 }
+vpnRouterFans                OBJECT IDENTIFIER ::= { vpnRouter 3 }
+vpnRouterInterfaces          OBJECT IDENTIFIER ::= { vpnRouter 4 }
+vpnRouterTunnels             OBJECT IDENTIFIER ::= { vpnRouter 5 }
+vpnRouterTunnelChannels      OBJECT IDENTIFIER ::= { vpnRouter 6 }
+
+
+vpnRouterName OBJECT-TYPE
+    SYNTAX OCTET STRING (SIZE (64))
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "A short descriptive name of the router."
+    ::= { vpnRouterInfo 1 }
+
+vpnRouterSerial OBJECT-TYPE
+    SYNTAX OCTET STRING  (SIZE (19))
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Serial number of this router."
+    ::= { vpnRouterInfo 2 }
+
+vpnRouterModel OBJECT-TYPE
+    SYNTAX OCTET STRING (SIZE (6))
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Router Model"
+    ::= { vpnRouterInfo 3 }
+
+vpnRouterFirmware OBJECT-TYPE
+    SYNTAX OCTET STRING (SIZE (22))
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Firmware Version currently running on this router."
+    ::= { vpnRouterInfo 4 }
+
+vpnRouterMode OBJECT-TYPE
+    SYNTAX Integer32 (0..3)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current mode that the router is running in. Possible values are:
+        0 - Node
+        1 - Hub
+        2 - Hub running as HotSpare
+        3 - Hotspare-Hub replacing another router"
+    ::= { vpnRouterInfo 5 }
+
+vpnRouteruptime OBJECT-TYPE
+    SYNTAX TimeTicks
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Elapsed time since the router has booted."
+    ::= { vpnRouterInfo 6 }
+
+vpnRouterFirmwareStatus OBJECT-TYPE
+    SYNTAX Integer32 (0..4)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current Status of the Update System. Possible values are:
+        0 - Idle / No new firmware available
+        1 - Updates Available
+        2 - Checking for Updates
+        3 - Downloading Update
+        4 - Installing Update"
+    ::= { vpnRouterInfo 7 }
+
+
+vpnRouterCPULoad OBJECT-TYPE
+    SYNTAX OCTET STRING (SIZE (3))
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Load average on this router"
+    ::= { vpnRouterHealth 1 }
+
+vpnRouterMemoryUsage OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current total memory usage (in KByte)."
+    ::= { vpnRouterHealth 2 }
+
+vpnRouterSystemTemperature OBJECT-TYPE
+    SYNTAX Integer32(0..65535)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current system temperature (in degree Celsius)."
+    ::= { vpnRouterHealth 3 }
+
+vpnRouterCPUTemperature OBJECT-TYPE
+    SYNTAX Integer32(0..65535)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current CPU temperature (in degree Celsius)"
+    ::= { vpnRouterHealth 4 }
+
+vpnRouterPowerSupplyFailure OBJECT-TYPE
+    SYNTAX Integer32(0..1)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Information about the PSU
+        Possible Values are:
+        0 = no failure
+        1 = a single PSU is out of order"
+    ::= { vpnRouterHealth 5 }
+
+vpnRouterFanCount OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of Fans."
+    ::= { vpnRouterFans 1 }
+
+vpnRouterFanTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF VpnRouterFanEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The table holding information to each fan."
+    ::= { vpnRouterFans 2 }
+
+vpnRouterFanEntry OBJECT-TYPE
+    SYNTAX VpnRouterFanEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The entry associated with each fan."
+    INDEX {vpnRouterFanIndex}
+    ::= { vpnRouterFanTable 1 }
+
+VpnRouterFanEntry ::= SEQUENCE {
+    vpnRouterFanIndex           Integer32,
+    vpnRouterFanAdminStatus     Integer32,
+    vpnRouterFanOperativeStatus Integer32,
+    vpnRouterFanRPM             Integer32
+}
+
+vpnRouterFanIndex OBJECT-TYPE
+    SYNTAX Integer32(0..65535)
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "ID-Number of the fan"
+    ::= { vpnRouterFanEntry 1 }
+
+vpnRouterFanAdminStatus OBJECT-TYPE
+    SYNTAX Integer32(0..1)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Desired state of this Fan
+         Possible Values:
+         0 = off
+         1 = on"
+    ::= { vpnRouterFanEntry 2 }
+
+vpnRouterFanOperativeStatus OBJECT-TYPE
+    SYNTAX Integer32(0..2)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Operative status of this fan
+          0 = Disabled
+          1 = OK
+          2 = Faulty"
+    ::= { vpnRouterFanEntry 3 }
+
+vpnRouterFanRPM OBJECT-TYPE
+    SYNTAX Integer32(0..65535)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current RPM of this fan.  Note that not all models supply this info."
+    ::= { vpnRouterFanEntry 4 }
+
+vpnRouterInterfaceCount OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of Interfaces."
+    ::= { vpnRouterInterfaces 1 }
+
+vpnRouterInterfaceTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF VpnRouterInterfaceEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The table holding information to each interface."
+    ::= { vpnRouterInterfaces 2 }
+
+vpnRouterInterfaceEntry OBJECT-TYPE
+    SYNTAX VpnRouterInterfaceEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The entry associated with each interface."
+    INDEX {vpnRouterInterfaceIndex}
+    ::= { vpnRouterInterfaceTable 1 }
+
+VpnRouterInterfaceEntry ::= SEQUENCE {
+    vpnRouterInterfaceIndex           Integer32,
+    vpnRouterInterfaceName            DisplayString,
+    vpnRouterInterfaceAdminStatus     Integer32,
+    vpnRouterInterfaceOperativeStatus Integer32,
+    vpnRouterInterfaceBandwidthToWan   Integer32,
+    vpnRouterInterfaceBandwidthFromWan Integer32,
+    vpnRouterInterfaceTrafficUp       Counter32,
+    vpnRouterInterfaceTrafficDown     Counter32,
+    vpnRouterInterfaceSignalStrength  Integer32,
+    vpnRouterInterfaceServiceType     DisplayString,
+    vpnRouterInterfaceServiceStatus   DisplayString,
+    vpnRouterInterfaceRoaming         Integer32,
+    vpnRouterInterfaceServiceStatus   DisplayString,
+    vpnRouterInterfaceNetworkName     DisplayString,
+    vpnRouterInterfaceBandInfo        DisplayString,
+    vpnRouterInterfaceIMSI            DisplayString,
+    vpnRouterInterfaceIMEI            DisplayString,
+    vpnRouterInterfacePINStatus       DisplayString,
+    vpnRouterInterfaceRFBand          Integer32,
+    vpnRouterInterfaceRFChannel       Integer32,
+    vpnRouterInterfaceSyncrateUpstream Counter32,
+    vpnRouterInterfaceSyncrateDownstream Counter32
+}
+
+vpnRouterInterfaceIndex OBJECT-TYPE
+    SYNTAX Integer32(0..65535)
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "ID-Number of the interface."
+    ::= { vpnRouterInterfaceEntry 1 }
+    
+vpnRouterInterfaceName OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "A short descriptive name of  the interface"
+    ::= { vpnRouterInterfaceEntry 2 }
+    
+vpnRouterInterfaceAdminStatus OBJECT-TYPE
+    SYNTAX Integer32(0..1)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Desired state of the interface.
+        possible values: 0 = disconnected, 1 = connected"
+    ::= { vpnRouterInterfaceEntry 3 }
+    
+vpnRouterInterfaceOperativeStatus OBJECT-TYPE
+    SYNTAX Integer32(0..3)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current state of the interface.
+         possible values: 
+         0 = disconnected,
+         1 = connected,
+         2 = connecting,
+         3 = disconnecting"
+    ::= { vpnRouterInterfaceEntry 4 }
+
+vpnRouterInterfaceBandwidthToWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Theoretical maximum upstream (in KBit). Might be illusional."
+    ::= { vpnRouterInterfaceEntry 5 }
+
+vpnRouterInterfaceBandwidthFromWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Theoretical maximum downstream (in KBit)."
+    ::= { vpnRouterInterfaceEntry 6 }
+
+vpnRouterInterfaceTrafficUp OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Total upstream traffic made (in Byte) since router boot."
+    ::= { vpnRouterInterfaceEntry 7 }
+
+vpnRouterInterfaceTrafficDown OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Total downstream traffic made (in Byte) since router boot."
+    ::= { vpnRouterInterfaceEntry 8 }
+
+vpnRouterInterfaceSignalStrength OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Signal Strength (in percent)."
+    ::= { vpnRouterInterfaceEntry 9 }
+
+vpnRouterInterfaceServiceType OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface Service Type."
+    ::= { vpnRouterInterfaceEntry 10 }
+
+vpnRouterInterfaceServiceStatus OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Service Status."
+    ::= { vpnRouterInterfaceEntry 11 }
+
+vpnRouterInterfaceRoaming OBJECT-TYPE
+    SYNTAX Integer32(0..1)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface Roaming.
+         possible values: 
+         0 = off,
+         1 = on"
+    ::= { vpnRouterInterfaceEntry 12 }
+
+vpnRouterInterfaceNetworkName OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface Network Name."
+    ::= { vpnRouterInterfaceEntry 13 }
+
+vpnRouterInterfaceBandInfo OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface Band Info."
+    ::= { vpnRouterInterfaceEntry 14 }
+
+vpnRouterInterfaceIMSI OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface IMSI."
+    ::= { vpnRouterInterfaceEntry 15 }
+
+vpnRouterInterfaceIMEI OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface IMEI."
+    ::= { vpnRouterInterfaceEntry 16 }
+
+vpnRouterInterfacePINStatus OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface PIN Status."
+    ::= { vpnRouterInterfaceEntry 17 }
+
+vpnRouterInterfaceRFBand OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface RF Band."
+    ::= { vpnRouterInterfaceEntry 18 }
+
+vpnRouterInterfaceRFChannel OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface RF Channel."
+    ::= { vpnRouterInterfaceEntry 19 }
+
+vpnRouterInterfaceSyncrateUpstream OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface Syncrate Upstream."
+    ::= { vpnRouterInterfaceEntry 20 }
+
+vpnRouterInterfaceSyncrateDownstream OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Interface Syncrate Downstream."
+    ::= { vpnRouterInterfaceEntry 21 }
+
+vpnRouterTunnelCount OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of Tunnels."
+    ::= { vpnRouterTunnels 1 }
+
+vpnRouterTunnelTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF VpnRouterTunnelEntry
+    MAX-ACCESS not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The table holding information to each tunnel."
+    ::=  { vpnRouterTunnels 2 }
+
+vpnRouterTunnelEntry OBJECT-TYPE
+    SYNTAX VpnRouterTunnelEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The entry associated with each tunnel."
+    INDEX  {vpnRouterTunnelIndex}
+    ::= { vpnRouterTunnelTable 1 }
+
+VpnRouterTunnelEntry ::= SEQUENCE {
+     vpnRouterTunnelIndex                           Integer32,
+     vpnRouterTunnelName                            DisplayString,
+     vpnRouterTunnelAdminStatus                     Integer32,
+     vpnRouterTunnelOperativeStatus                 Integer32,
+     vpnRouterTunnelCumulatedBandwidthToWan          Integer32,
+     vpnRouterTunnelCumulatedBandwidthFromWan        Integer32,
+     vpnRouterTunnelCurrentCumulatedBandwidthToWan   Integer32,
+     vpnRouterTunnelCurrentCumulatedBandwidthFromWan Integer32,
+     vpnRouterTunnelTrafficUp                       Counter32,
+     vpnRouterTunnelTrafficDown                     Counter32,
+     vpnRouterTunnelRemoteRouterSerial              DisplayString
+}
+
+vpnRouterTunnelIndex OBJECT-TYPE
+    SYNTAX Integer32(0..65535)
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "ID-Number of the tunnel."
+    ::= { vpnRouterTunnelEntry 1 }
+    
+vpnRouterTunnelName OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Name of VPN tunnel"
+    ::= { vpnRouterTunnelEntry 2 }
+    
+vpnRouterTunnelAdminStatus OBJECT-TYPE
+    SYNTAX Integer32(0..1)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Desired state of the tunnel.
+        possible values: 0 = disconnected,  1 = connected"
+    ::= { vpnRouterTunnelEntry 3 }
+    
+vpnRouterTunnelOperativeStatus OBJECT-TYPE
+    SYNTAX Integer32(0..1)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current state of the tunnel.
+         possible values: 
+         0 = disconnected,
+         1 = connected"
+    ::= { vpnRouterTunnelEntry 4 }
+
+vpnRouterTunnelCumulatedBandwidthToWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Theoretical maximum cumulated downstream (in KBit), considering all active channels."
+    ::= { vpnRouterTunnelEntry 5 }
+
+vpnRouterTunnelCumulatedBandwidthFromWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Theoretical maximum cumulated upstream (in KBit), considering all active channels."
+    ::= { vpnRouterTunnelEntry 6 }
+
+vpnRouterTunnelCurrentCumulatedBandwidthToWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current cumulated upstream (in KBit)."
+    ::= { vpnRouterTunnelEntry 7 }
+
+vpnRouterTunnelCurrentCumulatedBandwidthFromWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current cumulated downstream (in KBit)."
+    ::= { vpnRouterTunnelEntry 8 }
+
+vpnRouterTunnelTrafficUp OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Total upstream traffic made (in Byte) since router boot."
+    ::= { vpnRouterTunnelEntry 9 }
+
+vpnRouterTunnelTrafficDown OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Total downstream traffic made (in Byte) since router boot."
+    ::= { vpnRouterTunnelEntry 10 }
+
+vpnRouterTunnelRemoteRouterSerial OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Serial of the remote router."
+    ::= { vpnRouterTunnelEntry 11 }
+
+vpnRouterTunnelChannelCount OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Number of TunnelChannel."
+    ::= { vpnRouterTunnelChannels 1 }
+
+vpnRouterTunnelChannelTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF VpnRouterTunnelChannelEntry
+    MAX-ACCESS not-accessible
+    STATUS  current
+    DESCRIPTION
+        "The table holding information to each tunnelchannel."
+    ::= { vpnRouterTunnelChannels 2 }
+
+vpnRouterTunnelChannelEntry OBJECT-TYPE
+    SYNTAX VpnRouterTunnelChannelEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "The entry associated with each tunnelchannel."
+    INDEX  {vpnRouterTunnelChannelIndex}
+    ::= { vpnRouterTunnelChannelTable 1 }
+
+VpnRouterTunnelChannelEntry ::= SEQUENCE {
+    vpnRouterTunnelChannelIndex                  Integer32,
+    vpnRouterTunnelChannelName                   DisplayString,
+    vpnRouterTunnelChannelAdminStatus            Integer32,
+    vpnRouterTunnelChannelOperativeStatus        Integer32,
+    vpnRouterTunnelChannelMaxBandwidthToWan       Integer32,
+    vpnRouterTunnelChannelMaxBandwidthFromWan     Integer32,
+    vpnRouterTunnelChannelCurrentBandwidthToWan   Integer32,
+    vpnRouterTunnelChannelCurrentBandwidthFromWan Integer32,
+    vpnRouterTunnelChannelTrafficUp              Counter32,
+    vpnRouterTunnelChannelTrafficDown            Counter32,
+    vpnRouterTunnelChannelReferencedTunnel       Integer32,
+    vpnRouterTunnelChannelIsBackup               Integer32,
+    vpnRouterTunnelChannelModuleSlot             Integer32,
+    vpnRouterTunnelChannelPacketLoss             Integer32,
+    vpnRouterTunnelChannelLinkStability          Integer32
+}
+
+vpnRouterTunnelChannelIndex OBJECT-TYPE
+    SYNTAX Integer32(0..65535)
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION
+        "ID-Number of the tunnelchannel."
+    ::= { vpnRouterTunnelChannelEntry 1 }
+    
+vpnRouterTunnelChannelName OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Name of tunnelchannel. It will be in the form tunnel.tunnelname"
+    ::= { vpnRouterTunnelChannelEntry 2 }
+    
+vpnRouterTunnelChannelAdminStatus OBJECT-TYPE
+    SYNTAX Integer32(0..1)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Desired state of the tunnelchannel.
+        possible values: 0 = disconnected,  1 = connected"
+    ::= { vpnRouterTunnelChannelEntry 3 }
+    
+vpnRouterTunnelChannelOperativeStatus OBJECT-TYPE
+    SYNTAX Integer32(0..8)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current state of the tunnelchannel.
+         possible values: 
+         0 = disconnected,
+         1 = connected,
+         2 = connecting,
+         3 = disconnecting,
+         4 = connectedpingtest,
+         5 = connectedpingtestwait,
+         6 = connectedtooslow,
+         7 = connectedstalled,
+         8 = error"
+    ::= { vpnRouterTunnelChannelEntry 4 }
+
+vpnRouterTunnelChannelMaxBandwidthToWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Maximum possible bandwidth to WAN (in KBit/sec)."
+    ::= { vpnRouterTunnelChannelEntry 5 }
+
+vpnRouterTunnelChannelMaxBandwidthFromWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Maximum possible bandwidth from WAN (in KBit/sec)."
+    ::= { vpnRouterTunnelChannelEntry 6 }
+
+vpnRouterTunnelChannelCurrentBandwidthToWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current bandwidth to WAN (in KBit/sec)."
+    ::= { vpnRouterTunnelChannelEntry 7 }
+
+vpnRouterTunnelChannelCurrentBandwidthFromWan OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Current bandwidth from WAN (in KBit/sec)."
+    ::= { vpnRouterTunnelChannelEntry 8 }
+
+vpnRouterTunnelChannelTrafficUp OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Total upstream traffic made (in Byte) since router boot."
+    ::= { vpnRouterTunnelChannelEntry 9 }
+
+vpnRouterTunnelChannelTrafficDown OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Total downstream traffic made (in Byte) since router boot."
+    ::= { vpnRouterTunnelChannelEntry 10 }
+
+vpnRouterTunnelChannelReferencedTunnel OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "The OID of the tunnel that this channel is referencing to."
+    ::= { vpnRouterTunnelChannelEntry 11 }
+
+vpnRouterTunnelChannelIsBackup OBJECT-TYPE
+    SYNTAX Integer32(0..1)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Is this channel configured as fallback? Possible Values:
+         0 = no,
+         1 = yes"
+    ::= { vpnRouterTunnelChannelEntry 12 }
+
+vpnRouterTunnelChannelModuleSlot OBJECT-TYPE
+    SYNTAX Integer32(0..6)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Module that the channel is using.
+         Possible Values:
+         0 = Hub WAN-Interface,
+         1 = Module in Slot 1,
+         2 = Module in Slot 2,
+         3 = Module in Slot 3,
+         4 = Module in Slot 4,
+         5 = Module in Slot 5,
+         6 = Module in Slot 6"
+    ::= { vpnRouterTunnelChannelEntry 13 }
+
+vpnRouterTunnelChannelPacketLoss OBJECT-TYPE
+    SYNTAX Integer32(0..100)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Overall packetloss experienced (in %) on the channel-connection."
+    ::= { vpnRouterTunnelChannelEntry 14 }
+
+vpnRouterTunnelChannelLinkStability OBJECT-TYPE
+    SYNTAX Integer32(0..100)
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Estimated Link Stability (in %) of  the channel-connection."
+    ::= { vpnRouterTunnelChannelEntry 15 }
+
+
+--  Conformance information
+
+vpnRouterConformance OBJECT IDENTIFIER ::= { vpnRouter 7 }
+vpnRouterGroups      OBJECT IDENTIFIER ::= { vpnRouterConformance 1 }
+vpnRouterCompliances OBJECT IDENTIFIER ::= { vpnRouterConformance 2 }
+
+--  Compliance statements
+
+vpnRouterReadOnlyCompliance MODULE-COMPLIANCE
+    STATUS current
+    DESCRIPTION
+        "When this MIB is implemented without support for read-
+         create (i.e., in read-only mode), the implementation can
+         claim read-only compliance."
+    MODULE -- this module
+    MANDATORY-GROUPS { vpnRouterObjects }
+    ::= { vpnRouterCompliances 1 }
+
+
+ -- units of conformance
+   
+vpnRouterObjects OBJECT-GROUP
+    OBJECTS { vpnRouterTunnelChannelName,
+              vpnRouterTunnelChannelAdminStatus,
+              vpnRouterTunnelChannelOperativeStatus,
+              vpnRouterTunnelChannelMaxBandwidthToWan,
+              vpnRouterTunnelChannelMaxBandwidthFromWan,
+              vpnRouterTunnelChannelCurrentBandwidthToWan,
+              vpnRouterTunnelChannelCurrentBandwidthFromWan,
+              vpnRouterTunnelChannelTrafficUp,
+              vpnRouterTunnelChannelTrafficDown,
+              vpnRouterTunnelChannelReferencedTunnel,
+              vpnRouterTunnelChannelIsBackup,
+              vpnRouterTunnelChannelModuleSlot,
+              vpnRouterTunnelChannelPacketLoss,
+              vpnRouterTunnelChannelLinkStability,
+              vpnRouterTunnelName,
+              vpnRouterTunnelAdminStatus,
+              vpnRouterTunnelOperativeStatus,
+              vpnRouterTunnelCumulatedBandwidthToWan,
+              vpnRouterTunnelCumulatedBandwidthFromWan,
+              vpnRouterTunnelCurrentCumulatedBandwidthToWan,
+              vpnRouterTunnelCurrentCumulatedBandwidthFromWan,
+              vpnRouterTunnelTrafficUp,
+              vpnRouterTunnelTrafficDown,
+              vpnRouterTunnelRemoteRouterSerial,
+              vpnRouterInterfaceName,
+              vpnRouterInterfaceAdminStatus,
+              vpnRouterInterfaceOperativeStatus,
+              vpnRouterInterfaceBandwidthToWan,
+              vpnRouterInterfaceBandwidthFromWan,
+              vpnRouterInterfaceTrafficUp,
+              vpnRouterInterfaceTrafficDown,
+              vpnRouterFanAdminStatus,
+              vpnRouterFanOperativeStatus,
+              vpnRouterFanRPM,
+              vpnRouterName,
+              vpnRouterSerial,
+              vpnRouterModel,
+              vpnRouterFirmware,
+              vpnRouterMode,
+              vpnRouteruptime,
+              vpnRouterFirmwareStatus,
+              vpnRouterCPULoad,
+              vpnRouterMemoryUsage,
+              vpnRouterSystemTemperature,
+              vpnRouterCPUTemperature,
+              vpnRouterPowerSupplyFailure,
+              vpnRouterFanCount,
+              vpnRouterInterfaceCount,
+              vpnRouterTunnelCount,
+              vpnRouterTunnelChannelCount
+           }
+    STATUS current
+    DESCRIPTION
+        "The Objects of the vpnRouter."
+    ::= { vpnRouterGroups 1 }
+
+END

From 69a93167543068fced7cbe35aaf377f306da435e Mon Sep 17 00:00:00 2001
From: Rainer Schueler <librenms@layer3.de>
Date: Wed, 13 Apr 2016 14:01:38 +0200
Subject: [PATCH 2/7] Removed copy pasted text

---
 includes/polling/processors/viprinet.inc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/polling/processors/viprinet.inc.php b/includes/polling/processors/viprinet.inc.php
index e03d81a54..09b1e92b1 100644
--- a/includes/polling/processors/viprinet.inc.php
+++ b/includes/polling/processors/viprinet.inc.php
@@ -1,6 +1,5 @@
 <?php
-// Simple hard-coded poller for Pulse Secure
-echo 'Viprinet Secure CPU Usage';
+echo 'Viprinet CPU Usage';
 
 if ($device['os'] == 'viprinet') {
     $usage = str_replace('"',"", snmp_get($device, 'VIPRINET-MIB::vpnRouterCPULoad.0', '-OvQ'));

From f7aa825d44d277c97a61fd2394659196af1138ac Mon Sep 17 00:00:00 2001
From: Rainer Schueler <librenms@layer3.de>
Date: Wed, 13 Apr 2016 14:04:14 +0200
Subject: [PATCH 3/7] Removed memory graph, because device does not provide
 information about total memory

---
 includes/definitions.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index e9c427a5c..1b90c8e65 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -104,7 +104,6 @@ $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 $config['os'][$os]['over'][1]['graph'] = 'device_processor';
 $config['os'][$os]['over'][1]['text']  = 'Processor Usage';
-$config['os'][$os]['over'][2]['graph'] = 'device_ucd_memory';
 
 $os = 'edgeos';
 $config['os'][$os]['text']             = 'EdgeOS';

From fb350e6d73c5b04798fb846e05e9d3da7f13070b Mon Sep 17 00:00:00 2001
From: Rainer Schueler <librenms@layer3.de>
Date: Wed, 13 Apr 2016 16:00:22 +0200
Subject: [PATCH 4/7] fixed nagios dhcp check (-H changed to -s)

---
 includes/services/check_dhcp.inc.php | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 includes/services/check_dhcp.inc.php

diff --git a/includes/services/check_dhcp.inc.php b/includes/services/check_dhcp.inc.php
new file mode 100644
index 000000000..1b865c8a4
--- /dev/null
+++ b/includes/services/check_dhcp.inc.php
@@ -0,0 +1,6 @@
+<?php
+
+// provide some sane default
+if ($service['service_ip'])    { $dhcp = $service['service_ip'];    } else { $dhcp = $service['hostname']; }
+
+$check_cmd = $config['nagios_plugins'] . "/check_dhcp -s ".$dhcp;

From 1c4cf026d4943e3540f94283ad4452a642c0788c Mon Sep 17 00:00:00 2001
From: Rainer Schueler <librenms@layer3.de>
Date: Mon, 25 Apr 2016 08:26:46 +0200
Subject: [PATCH 5/7] Renamed Viprinet to Viprinux. Icon size now 32x32

---
 html/images/os/viprinet.png                      | Bin 1180 -> 0 bytes
 html/images/os/viprinux.png                      | Bin 0 -> 1674 bytes
 includes/definitions.inc.php                     |   6 +++---
 .../os/{viprinet.inc.php => viprinux.inc.php}    |   2 +-
 includes/discovery/processors/viprinet.inc.php   |   2 +-
 .../os/{viprinet.inc.php => viprinux.inc.php}    |   0
 includes/polling/processors/viprinet.inc.php     |   2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 html/images/os/viprinet.png
 create mode 100644 html/images/os/viprinux.png
 rename includes/discovery/os/{viprinet.inc.php => viprinux.inc.php} (75%)
 rename includes/polling/os/{viprinet.inc.php => viprinux.inc.php} (100%)

diff --git a/html/images/os/viprinet.png b/html/images/os/viprinet.png
deleted file mode 100644
index 363aacf7cbfe2ea56a15277b5ae67498d75e241b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1180
zcmV;N1Y`S&P)<h;3K|Lk000e1NJLTq002n<000>X0ssI2@}HD^00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-#n4G1m+L1)Gh000C#Nkl<ZSi|jDPfXiZ82>0xG&0Pp
zHkAs`DiYPI+S;a7REsA~^f2PAJ7P!cX=>qK8mZ@kdfQY3(qNjDfO<l*>7hZDNZ28{
z#Ae}AY4%ig+Kl{WsR~HJS*S9^vcnt3O$ZAaDx%^$+3!8S_rCZ0^Vx1Hm&@>$#wmDv
zqpsXkRg<I%3**MtkfaG&nLmQ$%5}uUhvVI-CzDaj4MjKV5yY>`Z#<gn(VK-awlK>w
z6h$>~e5$HZ6veX4p@5Mq=>872o{>$*%S%?wX>%<l^vT{vT{l!!a~y}FC`6+WA3T;`
zQY_^vS{%noB$8Ao1ptUfj^pUMLAshpM@IobR_1lXsGv<WI#Vi@Xc}1<$D%VF7a#;v
zHI1gx)YSLV_@rU{(tD}5bBC*L@00jKEH=yYK{C1HI5dp_z+6k&`K-T#eev??&wtFV
zuBW%Qi)Y_`-@C54mNIPRx7?3*KD+(*)_d(ego>-{>9s%gt?f+!$Q29#@U@+P5?=_1
zg;XjXiHyYK3&X>=<MD;7S3lmx&Dn4wk$V*y8y$N<1cogvjZeC}AD1S1{!0Le+`WS>
z%yFNos^<2_VzXlSrlLGXsGBq@%42uH>U!F+mCUc-uCAv6AirrovmQOO9(h@}Voq=V
zl>>l{SLTX2O?q<$!>|>Cn_(-4t&sGvg~=u*X~ISFHBR!OAOI{Tl3oL#5!%xLER63)
z?nELZ92ba2f8e-4EH>+9zbFhU@?0b`Qj1!rTYR50-}GO;f8)dN0Km@w<oblUmg+fo
zo%DY3!4yHbSjsV7qR=N37ZLhop-*PIL;w)O0@*fM&cc}4+4H}-(FoB9Y1*>8d@`{_
zNLU>dMTJGdz2$=gnH^ZjRKvr!_m|C;3nIB_ZT9&)SXV^^ic9BjxFau~?I!@%nu<n<
zC{0y0hGi0q$vwP;4+Rs8ySQakEyxe-Ib8*qEX%kwAj|xxCHUI>HT>NG03tB&$o!_c
z&uk$+Nb+G>#(S(S-s6u(XDp0qgovfO2k?d?{d~;5-r6qK^9V&z)hye^jpG6oMG?^_
zl1oRGSVa)hwx9Ml@N7#3xXHv)SQJ!M8ydQGRQdE@zJK`d$^q_^jH+1}>$*|PNQmuL
z*k)tzV%0&E<}J{<f^OJKuAu+l+(LZNah!2!l4Tj<Keb*jRgW=h>hh<x58^=4`OZae
zNg(CUEo%oA;i+mx%E~++9N1sDqhk-qCr>mwBP;WQICv<zb)UKBYx9$8ZrDot`B<@(
z^R@ZA&s^J)UpoL~f1j=g%$ACKQ5*yS{&gd%a3PjuhK6p1#hVt!q<p)^gJ{GS3e`2k
zEeu|NuWo5=_Hn)U3|o2e@+rCPId}ca1+lf+M+Pum;>Ih}&S&j>_9Oc1{XYl}{2d@k
u6RNhX$a5$E6i#wG$?c%gbn*}HSjIm)Th)TK{j)s)0000<MNUMnLSTZT={&3e

diff --git a/html/images/os/viprinux.png b/html/images/os/viprinux.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ea9ba6ffd9976f971ab26347131ad53b904fb4a
GIT binary patch
literal 1674
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
U=Z;p2&Hw-a07*qoM6N<$f~dVgI{*Lx

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 1b90c8e65..aa485cbe4 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -95,10 +95,10 @@ $config['os'][$os]['over'][1]['text']  = 'Processor Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_ucd_memory';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
-$os = 'viprinet';
-$config['os'][$os]['text']             = 'viprinet';
+$os = 'viprinux';
+$config['os'][$os]['text']             = 'Viprinux';
 $config['os'][$os]['type']             = 'network';
-$config['os'][$os]['icon']             = 'viprinet';
+$config['os'][$os]['icon']             = 'viprinux';
 $config['os'][$os]['ifname']           = 1;
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
diff --git a/includes/discovery/os/viprinet.inc.php b/includes/discovery/os/viprinux.inc.php
similarity index 75%
rename from includes/discovery/os/viprinet.inc.php
rename to includes/discovery/os/viprinux.inc.php
index eee216fdb..a14d21c73 100644
--- a/includes/discovery/os/viprinet.inc.php
+++ b/includes/discovery/os/viprinux.inc.php
@@ -2,6 +2,6 @@
 
 if (!$os) {
     if (strstr($sysDescr, 'Viprinet VPN Router')) {
-        $os = 'viprinet';
+        $os = 'viprinux';
     }
 }
diff --git a/includes/discovery/processors/viprinet.inc.php b/includes/discovery/processors/viprinet.inc.php
index 669bc01a6..df3aca087 100644
--- a/includes/discovery/processors/viprinet.inc.php
+++ b/includes/discovery/processors/viprinet.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == 'viprinet') {
+if ($device['os'] == 'viprinux') {
 
     $usage = str_replace('"',"", snmp_get($device, 'VIPRINET-MIB::vpnRouterCPULoad.0', '-OvQ'));
     $descr = 'Processor';
diff --git a/includes/polling/os/viprinet.inc.php b/includes/polling/os/viprinux.inc.php
similarity index 100%
rename from includes/polling/os/viprinet.inc.php
rename to includes/polling/os/viprinux.inc.php
diff --git a/includes/polling/processors/viprinet.inc.php b/includes/polling/processors/viprinet.inc.php
index 09b1e92b1..884ead0a3 100644
--- a/includes/polling/processors/viprinet.inc.php
+++ b/includes/polling/processors/viprinet.inc.php
@@ -1,7 +1,7 @@
 <?php
 echo 'Viprinet CPU Usage';
 
-if ($device['os'] == 'viprinet') {
+if ($device['os'] == 'viprinux') {
     $usage = str_replace('"',"", snmp_get($device, 'VIPRINET-MIB::vpnRouterCPULoad.0', '-OvQ'));
     if (is_numeric($usage)) {
         $proc = ($usage * 100);

From 144acdfc49fe2a783f215c1a853d2fb03909ee9e Mon Sep 17 00:00:00 2001
From: Rainer Schueler <librenms@layer3.de>
Date: Mon, 25 Apr 2016 10:10:25 +0200
Subject: [PATCH 6/7] renamed remaining viprinet.inc.php to viprinux.inc.php

---
 .../discovery/processors/{viprinet.inc.php => viprinux.inc.php}   | 0
 .../polling/processors/{viprinet.inc.php => viprinux.inc.php}     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename includes/discovery/processors/{viprinet.inc.php => viprinux.inc.php} (100%)
 rename includes/polling/processors/{viprinet.inc.php => viprinux.inc.php} (100%)

diff --git a/includes/discovery/processors/viprinet.inc.php b/includes/discovery/processors/viprinux.inc.php
similarity index 100%
rename from includes/discovery/processors/viprinet.inc.php
rename to includes/discovery/processors/viprinux.inc.php
diff --git a/includes/polling/processors/viprinet.inc.php b/includes/polling/processors/viprinux.inc.php
similarity index 100%
rename from includes/polling/processors/viprinet.inc.php
rename to includes/polling/processors/viprinux.inc.php

From 2afb0fed9e148f060f0be7f1c7fe230952485a68 Mon Sep 17 00:00:00 2001
From: rschueler <github@layer3.de>
Date: Mon, 25 Apr 2016 11:51:20 +0200
Subject: [PATCH 7/7]  I agree to the conditions of the Contributor Agreement
 contained in doc/General/Contributing.md.

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index fec1d6154..9c8a16582 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -98,6 +98,7 @@ LibreNMS contributors:
 - Michael Nguyen <mnguyen1289@gmail.com> (mnguyen1289)
 - Casey Schoonover <casey.schoonover@llcc.edu> (cschoonover91)
 - Chris A. Evans <thecityofguanyu@outlook.com> (thecityofguanyu)
+- Rainer Schüler <github@layer3.de> (rschueler)
 
 [1]: http://observium.org/ "Observium web site"
 Observium was written by: