newdevice: Added Tomato and AsusWRT-Merlin OS #5254 (#5398)

* newdevice: Added Tomato and AsusWRT-Merlin OS #5254

* that should not be there

includes/definitions/asuswrt-merlin.yaml

@@ -0,0 +1,9 @@
+os: asuswrt-merlin
+text: 'AsusWRT Merlin'
+type: network
+icon: asuswrt-merlin
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+    - { graph: device_processor, text: 'CPU Usage' }
+    - { graph: device_mempool, text: 'Memory Usage' }
+

includes/definitions/tomato.yaml

@@ -0,0 +1,8 @@
+os: tomato
+text: 'Tomato'
+type: network
+icon: tomato
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+    - { graph: device_processor, text: 'CPU Usage' }
+    - { graph: device_mempool, text: 'Memory Usage' }

includes/discovery/os/linux.inc.php

@@ -32,5 +32,12 @@ if (starts_with($sysDescr, 'Linux')) {
         $os = 'pcoweb'; // Carel PCOweb
     } elseif (starts_with($sysDescr, 'Linux mirthtemplate')) {
         $os = 'mirth';
+    } elseif ($wrt = snmp_get($device, '.1.3.6.1.4.1.2021.7890.1.101.1', '-Osqnv')) {
+        $wrt = trim($wrt, '"');
+        if (starts_with($wrt, 'ASUSWRT-Merlin')) {
+            $os = 'asuswrt-merlin';
+        } elseif (starts_with($wrt, 'Tomato ')) {
+            $os = 'tomato';
+        }
     }
 }

includes/polling/os/asuswrt-merlin.inc.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * asuswrt-merlin.inc.php
+ *
+ * LibreNMS os polling module for AsusWRT-Merlin
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Neil Lathwood
+ * @author     Neil Lathwood <neil@lathwood.co.uk>
+ */
+
+list($ignore, $hardware) = explode(' ', trim(snmp_get($device, '.1.3.6.1.4.1.2021.7890.1.101.1', '-Osqnv'), '"'));
+
+unset($ignore);

includes/polling/os/tomato.inc.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * tomato.inc.php
+ *
+ * LibreNMS os polling module for Tomato
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Neil Lathwood
+ * @author     Neil Lathwood <neil@lathwood.co.uk>
+ */
+
+list($ignore, $version) = explode(' ', trim(snmp_get($device, '.1.3.6.1.4.1.2021.7890.1.101.1', '-Osqnv'), '"'));
+
+unset($ignore);

tests/OSDiscoveryTest.php

@@ -177,6 +177,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('asa');
     }
 
+    public function testAsusMerlin()
+    {
+        $this->checkOS('asuswrt-merlin');
+    }
+
     public function testAvayaers()
     {
         $this->checkOS('avaya-ers');
@@ -1383,6 +1388,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('timos', 'timos8');
     }
 
+    public function testTomato()
+    {
+        $this->checkOS('tomato');
+    }
+
     public function testTpconductor()
     {
         $this->checkOS('tpconductor');

tests/snmpsim/asuswrt-merlin.snmprec

@@ -0,0 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|Linux wap-familyroom 2.6.36.4brcmarm #2 SMP PREEMPT Sat Nov 5 14:54:32 EDT 2016 armv7l
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.10
+1.3.6.1.4.1.2021.7890.1.101.1|4|ASUSWRT-Merlin RT-AC68U

tests/snmpsim/tomato.snmprec

@@ -0,0 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|Linux wap-attic 2.6.22.19 #2 Sun Nov 20 16:53:30 CST 2016 mips
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.10
+1.3.6.1.4.1.2021.7890.1.101.1|4|Tomato v1.28.1120