Merge pull request #3246 from Rosiak/issue-3245

Deliberant WiFi Discovery
librenms · Mar 16, 2016 · c9fabd4 · c9fabd4
2 parents f90e7ba + d1afac4
commit c9fabd4
Show file tree

Hide file tree

Showing 9 changed files with 3,281 additions and 0 deletions.
diff --git a/html/images/os/deliberant.png b/html/images/os/deliberant.png
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
@@ -1538,6 +1538,14 @@
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+// Deliberant WiFi
+$os = 'deliberant';
+$config['os'][$os]['text']             = 'Deliberant OS';
+$config['os'][$os]['type']             = 'wireless';
+$config['os'][$os]['icon']             = 'deliberant';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+
 // Graph Types
 require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php';
 

diff --git a/includes/discovery/os/deliberant.inc.php b/includes/discovery/os/deliberant.inc.php
@@ -0,0 +1,16 @@
+<?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(!$os) {
+    if (strstr($sysDescr, 'Deliberant')) {
+        $os = 'deliberant';
+    }
+}
diff --git a/includes/polling/os/deliberant.inc.php b/includes/polling/os/deliberant.inc.php
@@ -0,0 +1,12 @@
+<?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.
+ */
+$hardware = snmp_get($device, '.1.3.6.1.4.1.32761.3.1.1.1.3.0', '-Osqv');
diff --git a/mibs/DELIBERANT-MIB b/mibs/DELIBERANT-MIB
@@ -0,0 +1,36 @@
+--
+--  Deliberant 802.11 Central Configuration Module
+--
+
+DELIBERANT-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY, enterprises
+        FROM SNMPv2-SMI;
+
+deliberant MODULE-IDENTITY
+    LAST-UPDATED    "200809050000Z"
+    ORGANIZATION    "Deliberant"
+    CONTACT-INFO    "
+        Deliberant Customer Support
+        E-mail: support@deliberant.com"
+    DESCRIPTION
+        "Deliberant central configuration module."
+    REVISION    "200809050000Z"
+    DESCRIPTION
+        "First revision."
+    ::= { enterprises 32761 }
+
+-- subtree for product specific MIBs
+dlbProducts        OBJECT IDENTIFIER ::= { deliberant 1 }
+
+-- subtree for administrative information about product
+dlbAdmin           OBJECT IDENTIFIER ::= { deliberant 2 }
+
+-- subtree for management objects
+dlbMgmt            OBJECT IDENTIFIER ::= { deliberant 3 }
+
+-- subtree for experiments
+dlbExperimental    OBJECT IDENTIFIER ::= { deliberant 7 }
+END
+