From 5f9c797bcef618efcfd67e05557a17e7f04f96cc Mon Sep 17 00:00:00 2001
From: Adam Winberg <adam.winberg@smhi.se>
Date: Thu, 14 Apr 2016 16:18:53 +0200
Subject: [PATCH 1/3] Added RSSI and MNC graphing to Cisco WWAN routers

---
 .../graphs/device/cisco_wwan_mnc.inc.php      | 20 ++++++++++
 .../graphs/device/cisco_wwan_rssi.inc.php     | 24 +++++++++++
 includes/defaults.inc.php                     |  3 +-
 includes/definitions.inc.php                  |  8 ++++
 includes/polling/cisco-wwan.inc.php           | 21 ++++++++++
 includes/polling/wireless/cisco-wwan.inc.php  | 40 +++++++++++++++++++
 6 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 html/includes/graphs/device/cisco_wwan_mnc.inc.php
 create mode 100644 html/includes/graphs/device/cisco_wwan_rssi.inc.php
 create mode 100644 includes/polling/cisco-wwan.inc.php
 create mode 100644 includes/polling/wireless/cisco-wwan.inc.php

diff --git a/html/includes/graphs/device/cisco_wwan_mnc.inc.php b/html/includes/graphs/device/cisco_wwan_mnc.inc.php
new file mode 100644
index 0000000000..f7478b7bc1
--- /dev/null
+++ b/html/includes/graphs/device/cisco_wwan_mnc.inc.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * 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.
+ */
+
+require 'includes/graphs/common.inc.php';
+$rrdfilename = $config['rrd_dir'].'/'.$device['hostname'].'/cisco-wwan-mnc.rrd';
+if (file_exists($rrdfilename)) {
+    $rrd_options .= ' DEF:mnc='.$rrdfilename.':mnc:LAST ';
+    $rrd_options .= ' -l -r';
+    $rrd_options .= " --vertical-label='MNC'";
+    $rrd_options .= " LINE2:mnc#750F7DFF:'MNC Mobile Netwok Code'";
+    $rrd_options .= ' GPRINT:mnc:LAST:%0.2lf%s\\\l ';
+}
diff --git a/html/includes/graphs/device/cisco_wwan_rssi.inc.php b/html/includes/graphs/device/cisco_wwan_rssi.inc.php
new file mode 100644
index 0000000000..b69740c647
--- /dev/null
+++ b/html/includes/graphs/device/cisco_wwan_rssi.inc.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * 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.
+ */
+
+require 'includes/graphs/common.inc.php';
+$rrdfilename = $config['rrd_dir'].'/'.$device['hostname'].'/cisco-wwan-rssi.rrd';
+if (file_exists($rrdfilename)) {
+    $rrd_options .= " COMMENT:'dBm              Now       Ave      Max     \\n'";
+    $rrd_options .= ' DEF:rssi='.$rrdfilename.':rssi:AVERAGE ';
+    $rrd_options .= ' --alt-autoscale';
+    $rrd_options .= ' --lower-limit=-110 ';
+    $rrd_options .= " --vertical-label='dBm'";
+    $rrd_options .= " LINE2:rssi#FF0000:'RSSI       ' ";
+    $rrd_options .= ' GPRINT:rssi:LAST:%0.2lf%s ';
+    $rrd_options .= ' GPRINT:rssi:MIN:%0.2lf%s ';
+    $rrd_options .= ' GPRINT:rssi:MAX:%0.2lf%s\\\l ';
+}
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 3dac116ada..50d91082ca 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -716,6 +716,7 @@ $config['poller_modules']['cisco-cbqos']                 = 1;
 $config['poller_modules']['stp']                         = 1;
 $config['poller_modules']['cisco-otv']                   = 1;
 $config['poller_modules']['services']                    = 1;
+$config['poller_modules']['cisco-wwan']                  = 1;
 
 // List of discovery modules. Need to be in this array to be
 // considered for execution.
@@ -870,4 +871,4 @@ $config['ignore_unmapable_port'] = False;
 
 // InfluxDB default configuration
 $config['influxdb']['timeout']      = 0;
-$config['influxdb']['verifySSL']    = false;
\ No newline at end of file
+$config['influxdb']['verifySSL']    = false;
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 4b4ee1e569..27bebfa550 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -2038,6 +2038,14 @@ $config['graph_types']['device']['cisco-iosxcode']['descr']    = 'Transcoder Uti
 $config['graph_descr']['device_smokeping_in_all'] = 'This is an aggregate graph of the incoming smokeping tests to this host. The line corresponds to the average RTT. The shaded area around each line denotes the standard deviation.';
 $config['graph_descr']['device_processor']        = 'This is an aggregate graph of all processors in the system.';
 
+$config['graph_types']['device']['cisco_wwan_rssi']['section'] = 'wireless';
+$config['graph_types']['device']['cisco_wwan_rssi']['order']   = '0';
+$config['graph_types']['device']['cisco_wwan_rssi']['descr']   = 'Signal Rssi';
+$config['graph_types']['device']['cisco_wwan_mnc']['section']  = 'wireless';
+$config['graph_types']['device']['cisco_wwan_mnc']['order']    = '1';
+$config['graph_types']['device']['cisco_wwan_mnc']['descr']    = 'MNC';
+
+
 // Device Types
 $i = 0;
 $config['device_types'][$i]['text'] = 'Servers';
diff --git a/includes/polling/cisco-wwan.inc.php b/includes/polling/cisco-wwan.inc.php
new file mode 100644
index 0000000000..4a6dda15fc
--- /dev/null
+++ b/includes/polling/cisco-wwan.inc.php
@@ -0,0 +1,21 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * 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_group'] == "cisco") {
+
+    /*
+     * Cisco WWAN
+     * This module graphs the MNC and RSSI values for a Cisco Wireless
+     * WAN router
+     */
+     include 'wireless/cisco-wwan.inc.php';
+
+}
diff --git a/includes/polling/wireless/cisco-wwan.inc.php b/includes/polling/wireless/cisco-wwan.inc.php
new file mode 100644
index 0000000000..b1eb30d150
--- /dev/null
+++ b/includes/polling/wireless/cisco-wwan.inc.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * 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.
+ */
+
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cisco-wwan-rssi.rrd";
+$rssi = snmp_get($device, "1.3.6.1.4.1.9.9.661.1.3.4.1.1.1.13", "-Ovqn", "");
+
+if (is_numeric($rssi)) {
+    if (!is_file($rrd_filename)) {
+        rrdtool_create($rrd_filename, " --step 300 DS:rssi:GAUGE:600:-150:5000".$config['rrd_rra']);
+    }
+    $fields = array(
+        'rssi' => $rssi,
+    );
+    rrdtool_update($rrd_filename, $fields);
+    $graphs['cisco_wwan_rssi'] = TRUE;
+    unset($rrd_filename,$rssi);
+}
+
+
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cisco-wwan-mnc.rrd";
+$mnc = snmp_get($device, "1.3.6.1.4.1.9.9.661.1.3.2.1.11.13", "-Ovqn", "");
+if (is_numeric($mnc)) {
+    if (!is_file($rrd_filename)) {
+        rrdtool_create($rrd_filename, " --step 300 DS:mnc:GAUGE:600:0:U".$config['rrd_rra']);
+    }
+    $fields = array(
+        'mnc' => $mnc,
+    );
+    rrdtool_update($rrd_filename, $fields);
+    $graphs['cisco_wwan_mnc'] = TRUE;
+    unset($rrd_filename,$mnc);
+}

From 5871681015b6c998890e5796de9066d20040bbd5 Mon Sep 17 00:00:00 2001
From: Adam Winberg <adam.winberg@smhi.se>
Date: Tue, 19 Apr 2016 13:58:38 +0200
Subject: [PATCH 2/3] change from poller_module to include from os polling

---
 .../graphs/device/cisco_wwan_mnc.inc.php      |  2 +-
 includes/defaults.inc.php                     |  1 -
 includes/polling/cisco-wwan.inc.php           | 21 -------------------
 includes/polling/os/ios.inc.php               |  6 ++++++
 includes/polling/wireless/cisco-wwan.inc.php  |  5 +++--
 5 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 includes/polling/cisco-wwan.inc.php

diff --git a/html/includes/graphs/device/cisco_wwan_mnc.inc.php b/html/includes/graphs/device/cisco_wwan_mnc.inc.php
index f7478b7bc1..daf62d6a81 100644
--- a/html/includes/graphs/device/cisco_wwan_mnc.inc.php
+++ b/html/includes/graphs/device/cisco_wwan_mnc.inc.php
@@ -13,7 +13,7 @@ require 'includes/graphs/common.inc.php';
 $rrdfilename = $config['rrd_dir'].'/'.$device['hostname'].'/cisco-wwan-mnc.rrd';
 if (file_exists($rrdfilename)) {
     $rrd_options .= ' DEF:mnc='.$rrdfilename.':mnc:LAST ';
-    $rrd_options .= ' -l -r';
+    $rrd_options .= ' --lower-limit 0 '
     $rrd_options .= " --vertical-label='MNC'";
     $rrd_options .= " LINE2:mnc#750F7DFF:'MNC Mobile Netwok Code'";
     $rrd_options .= ' GPRINT:mnc:LAST:%0.2lf%s\\\l ';
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 50d91082ca..c99bfd6f63 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -716,7 +716,6 @@ $config['poller_modules']['cisco-cbqos']                 = 1;
 $config['poller_modules']['stp']                         = 1;
 $config['poller_modules']['cisco-otv']                   = 1;
 $config['poller_modules']['services']                    = 1;
-$config['poller_modules']['cisco-wwan']                  = 1;
 
 // List of discovery modules. Need to be in this array to be
 // considered for execution.
diff --git a/includes/polling/cisco-wwan.inc.php b/includes/polling/cisco-wwan.inc.php
deleted file mode 100644
index 4a6dda15fc..0000000000
--- a/includes/polling/cisco-wwan.inc.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * 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_group'] == "cisco") {
-
-    /*
-     * Cisco WWAN
-     * This module graphs the MNC and RSSI values for a Cisco Wireless
-     * WAN router
-     */
-     include 'wireless/cisco-wwan.inc.php';
-
-}
diff --git a/includes/polling/os/ios.inc.php b/includes/polling/os/ios.inc.php
index b04f8561dc..53b6b8ec2b 100644
--- a/includes/polling/os/ios.inc.php
+++ b/includes/polling/os/ios.inc.php
@@ -41,3 +41,9 @@ if (empty($hardware)) {
 
 // if(isset($cisco_hardware_oids[$poll_device['sysObjectID']])) { $hardware = $cisco_hardware_oids[$poll_device['sysObjectID']]; }
 $serial = get_main_serial($device);
+
+
+if (strstr($hardware, 'cisco819')) {
+      include 'includes/polling/wireless/cisco-wwan.inc.php';
+}
+
diff --git a/includes/polling/wireless/cisco-wwan.inc.php b/includes/polling/wireless/cisco-wwan.inc.php
index b1eb30d150..3bfb57b4ef 100644
--- a/includes/polling/wireless/cisco-wwan.inc.php
+++ b/includes/polling/wireless/cisco-wwan.inc.php
@@ -10,7 +10,7 @@
  */
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cisco-wwan-rssi.rrd";
-$rssi = snmp_get($device, "1.3.6.1.4.1.9.9.661.1.3.4.1.1.1.13", "-Ovqn", "");
+$rssi = snmp_get($device, "CISCO-WAN-3G-MIB::c3gCurrentGsmRssi.13", "-Ovqn", "CISCO-WAN-3G-MIB");
 
 if (is_numeric($rssi)) {
     if (!is_file($rrd_filename)) {
@@ -26,7 +26,7 @@ if (is_numeric($rssi)) {
 
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cisco-wwan-mnc.rrd";
-$mnc = snmp_get($device, "1.3.6.1.4.1.9.9.661.1.3.2.1.11.13", "-Ovqn", "");
+$mnc = snmp_get($device, "CISCO-WAN-3G-MIB::c3gGsmMnc.13", "-Ovqn", "CISCO-WAN-3G-MIB");
 if (is_numeric($mnc)) {
     if (!is_file($rrd_filename)) {
         rrdtool_create($rrd_filename, " --step 300 DS:mnc:GAUGE:600:0:U".$config['rrd_rra']);
@@ -38,3 +38,4 @@ if (is_numeric($mnc)) {
     $graphs['cisco_wwan_mnc'] = TRUE;
     unset($rrd_filename,$mnc);
 }
+

From a0447dd88d6869525d6aa81b911d419ab625f123 Mon Sep 17 00:00:00 2001
From: Adam Winberg <adam.winberg@smhi.se>
Date: Tue, 19 Apr 2016 15:19:24 +0200
Subject: [PATCH 3/3] fix missing semicolon

---
 html/includes/graphs/device/cisco_wwan_mnc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/includes/graphs/device/cisco_wwan_mnc.inc.php b/html/includes/graphs/device/cisco_wwan_mnc.inc.php
index daf62d6a81..c522403a31 100644
--- a/html/includes/graphs/device/cisco_wwan_mnc.inc.php
+++ b/html/includes/graphs/device/cisco_wwan_mnc.inc.php
@@ -13,7 +13,7 @@ require 'includes/graphs/common.inc.php';
 $rrdfilename = $config['rrd_dir'].'/'.$device['hostname'].'/cisco-wwan-mnc.rrd';
 if (file_exists($rrdfilename)) {
     $rrd_options .= ' DEF:mnc='.$rrdfilename.':mnc:LAST ';
-    $rrd_options .= ' --lower-limit 0 '
+    $rrd_options .= ' --lower-limit 0 ';
     $rrd_options .= " --vertical-label='MNC'";
     $rrd_options .= " LINE2:mnc#750F7DFF:'MNC Mobile Netwok Code'";
     $rrd_options .= ' GPRINT:mnc:LAST:%0.2lf%s\\\l ';