From a114d98cdda65c1125d737374823e7f309eaefd8 Mon Sep 17 00:00:00 2001
From: GitStoph <cjmeisch7309@gmail.com>
Date: Tue, 5 Mar 2019 22:19:54 -0600
Subject: [PATCH] Meraki MS: add serial number (#9768)

* added line to merakims.inc.php to properly code serial # in devices table

* Update merakims.inc.php

* Update merakims.snmprec

* Create merakims.json

* Update merakims.inc.php

* Update merakims.inc.php
---
 includes/polling/os/merakims.inc.php |  2 ++
 tests/data/merakims.json             | 40 ++++++++++++++++++++++++++++
 tests/snmpsim/merakims.snmprec       |  1 +
 3 files changed, 43 insertions(+)
 create mode 100644 tests/data/merakims.json

diff --git a/includes/polling/os/merakims.inc.php b/includes/polling/os/merakims.inc.php
index b65a163c21..dc03ec2247 100644
--- a/includes/polling/os/merakims.inc.php
+++ b/includes/polling/os/merakims.inc.php
@@ -13,3 +13,5 @@
 if (empty($hardware)) {
     $hardware = $device['sysDescr'];
 }
+// ENTITY-MIB::entPhysicalSerialNum
+$serial = snmp_getnext($device, '.1.3.6.1.2.1.47.1.1.1.1.11', '-Oqv', 'ENTITY-MIB');
diff --git a/tests/data/merakims.json b/tests/data/merakims.json
new file mode 100644
index 0000000000..5a3f040fef
--- /dev/null
+++ b/tests/data/merakims.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": null,
+                    "sysDescr": "Meraki MS",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": null,
+                    "features": null,
+                    "os": "merakims",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "meraki.png",
+                    "location": null
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": null,
+                    "sysDescr": "Meraki MS",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "Meraki MS",
+                    "features": null,
+                    "os": "merakims",
+                    "type": "network",
+                    "serial": "9999999999",
+                    "icon": "meraki.png",
+                    "location": null
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/snmpsim/merakims.snmprec b/tests/snmpsim/merakims.snmprec
index 1087d98e2d..a3c8a1aff0 100644
--- a/tests/snmpsim/merakims.snmprec
+++ b/tests/snmpsim/merakims.snmprec
@@ -1 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|Meraki MS
+1.3.6.1.2.1.47.1.1.1.1.11.1|4|9999999999