From 1a5f98ac149d4d8693f22ba29474988ec543dd1b Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 6 Jul 2015 02:08:19 +0100 Subject: [PATCH 1/8] Create merakimr.inc.php OS detection module for Meraki MR --- includes/discovery/os/merakimr.inc.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 includes/discovery/os/merakimr.inc.php diff --git a/includes/discovery/os/merakimr.inc.php b/includes/discovery/os/merakimr.inc.php new file mode 100644 index 0000000000..a8255a6b35 --- /dev/null +++ b/includes/discovery/os/merakimr.inc.php @@ -0,0 +1,17 @@ + + * 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 (preg_match("/^Meraki MR/", $sysDescr)) { $os = "merakimr"; } +} + +?> From f8b6038c9d0c3d9484f9e582449e7869728a9be5 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 6 Jul 2015 02:09:40 +0100 Subject: [PATCH 2/8] Create merakims.inc.php OS Detection module for Meraki MS --- includes/discovery/os/merakims.inc.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 includes/discovery/os/merakims.inc.php diff --git a/includes/discovery/os/merakims.inc.php b/includes/discovery/os/merakims.inc.php new file mode 100644 index 0000000000..8635c0e95d --- /dev/null +++ b/includes/discovery/os/merakims.inc.php @@ -0,0 +1,17 @@ + + * 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 (preg_match("/^Meraki MS/", $sysDescr)) { $os = "merakims"; } +} + +?> From be69210591509b880fa7424ae7418a8d7af240f9 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 6 Jul 2015 02:10:25 +0100 Subject: [PATCH 3/8] Create merakimx.inc.php OS Detection module for Meraki MX --- includes/discovery/os/merakimx.inc.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 includes/discovery/os/merakimx.inc.php diff --git a/includes/discovery/os/merakimx.inc.php b/includes/discovery/os/merakimx.inc.php new file mode 100644 index 0000000000..aa0f87e913 --- /dev/null +++ b/includes/discovery/os/merakimx.inc.php @@ -0,0 +1,17 @@ + + * 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 (preg_match("/^Meraki MX/", $sysDescr)) { $os = "merakimx"; } +} + +?> From f6f4a40c736a193b9e47d9c42461ac44731f1f9b Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 6 Jul 2015 02:13:50 +0100 Subject: [PATCH 4/8] Adding Meraki devices Definitions for Meraki MX. MR and MS hardware. --- includes/definitions.inc.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 3c551d5712..1140ad6aa3 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -1189,6 +1189,31 @@ foreach ($config['os'] as $this_os => $blah) } } +// Meraki Devices +$os = "merakimx"; +$config['os'][$os]['text'] = "Meraki MX Appliance"; +$config['os'][$os]['type'] = "firewall"; +$config['os'][$os]['icon'] = "meraki"; +$config['os'][$os]['ifname'] = 1; +$config['os'][$os]['over'][0]['graph'] = "device_bits"; +$config['os'][$os]['over'][0]['text'] = "Device Traffic"; + +$os = "merakimr"; +$config['os'][$os]['text'] = "Meraki AP"; +$config['os'][$os]['type'] = "wireless"; +$config['os'][$os]['icon'] = "meraki"; +$config['os'][$os]['ifname'] = 1; +$config['os'][$os]['over'][0]['graph'] = "device_bits"; +$config['os'][$os]['over'][0]['text'] = "Device Traffic"; + +$os = "merakims"; +$config['os'][$os]['text'] = "Meraki Switch"; +$config['os'][$os]['type'] = "network"; +$config['os'][$os]['icon'] = "meraki"; +$config['os'][$os]['ifname'] = 1; +$config['os'][$os]['over'][0]['graph'] = "device_bits"; +$config['os'][$os]['over'][0]['text'] = "Device Traffic"; + // Graph Types include_once($config['install_dir'] . "/includes/load_db_graph_types.inc.php"); From 016b759858d76ca1db3a5a871f09ba73f64a6f07 Mon Sep 17 00:00:00 2001 From: willjones Date: Mon, 6 Jul 2015 21:17:50 +0100 Subject: [PATCH 5/8] Added Meraki OS discovery and polling --- html/images/os/meraki.png | Bin 0 -> 1664 bytes includes/definitions.inc.php | 25 +++++++++++++++++++++++++ includes/discovery/os/merakimr.inc.php | 17 +++++++++++++++++ includes/discovery/os/merakims.inc.php | 17 +++++++++++++++++ includes/discovery/os/merakimx.inc.php | 17 +++++++++++++++++ includes/polling/os/merakimr.inc.php | 18 ++++++++++++++++++ includes/polling/os/merakims.inc.php | 18 ++++++++++++++++++ includes/polling/os/merakimx.inc.php | 18 ++++++++++++++++++ 8 files changed, 130 insertions(+) create mode 100644 html/images/os/meraki.png create mode 100644 includes/discovery/os/merakimr.inc.php create mode 100644 includes/discovery/os/merakims.inc.php create mode 100644 includes/discovery/os/merakimx.inc.php create mode 100644 includes/polling/os/merakimr.inc.php create mode 100644 includes/polling/os/merakims.inc.php create mode 100644 includes/polling/os/merakimx.inc.php diff --git a/html/images/os/meraki.png b/html/images/os/meraki.png new file mode 100644 index 0000000000000000000000000000000000000000..51b3564f6dc9e20b528d3d7933766b418addb6fa GIT binary patch literal 1664 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T}FfdWk9dNvV1jxdlK~3=B3ERzPNMYDuC(MQ%=Bu~mhw5?F;5kPQ;nS5g2gDap1~ zitr6kaLzAERWQ{v(KAr8<5EyiuqjGOvkG!?gK7uzY?U%fN(!v>^~=l4^~#O)@{7{- z4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#sF3Kz@$;{7F0GXSZlwVq6tE2?7 z2o50bEXhnm*pycc^%l^B`XCv7Lp=k1xY$-uu4$%|?`(myi^JB2i8yLB{aA6K{@*9Z*Na6&7HV|3F8S{gV8FUGH^67HS+9ht zeUSN*v)xB*e9AuGy89-%tn7OAyEJp_yS<$%6YMPwir=5H{XQrEoaOzU$}Te!q+Pf6 z?%VlVmf^M>eb=OT< z4mI?tURWcR5b(BDA>*;#lMh17CXJSo6&kNa;?`D6AHA9S@#~S3Z45jT{)}Ir06bo^Lkrh&VNsnch-Hi zGfiJauo-<}t@!f5IAfhnqt4;KcYekt8?QTG)A{b8^p;S?Y_W$sibdq_)bOzhZpg}d z$Zt7SnpNB7;DO#-5iD)beh1_;h%sOOk@|pLuF>+o$a+D|M{Wz{Uda4q<9)i8t89r+ zqss4(7yHu-OFt={@+tK^$H^%=SL20&{2Sj$<|WQM)n&V6Uh1DLi^81*g6lz4O*SHYJ@U`CVLx_8I|&q6@0eCTDC6IrMOD zL+wB7jwCacYg&IC*B^=zYA}3mP&H@zgq0_sU!AwYH{Que-|}P1QSKF*c3phGL${Q~ zxfM^DI;ZZf+=8`lN^N34+qk8@fAnRm_l>g*0;Z;qvi2)Pdor-4zgZ9v$s-mOA3QDM z_0o)qbM)<)C#Qw(*W1C;e2gRO>SsB2{gg%PLJwa`J{f+)hwZ_e#}E5O{TG$#$X?0X z|Le7L&7bGO70dT=KbQM$64-mb^U(S&vI*ykBYjO0u2c*6TBdJMUmUP-HG{+3vO~q~ z?OqF~K02uTzqd}_`}n42cc)3rG1@YGj_XYiJ&ixoQZK_=CF{iT>Du2b|E4D-WOpuF zpji0-?0fk}eVdlpSF0>)Gnidf0$m(=wJb!Xw<={bXe)8)obz#-sPJc#^yW+JZI+7n zZTZ}`b&;67h+xDgy#u0BEuNxhC;R!Nx23Q+ZT{eNTmGn?)GyJ8xI}6DE|G9D8n?>?_R+tpJhGXCzsdJb$rpfl%HD^&oG=^ zvtZiO-G7cKXHEPeFgM`2j*;1dBQf2#n%V<{OH5Y&cQ1E&&&9COX3|I3n}@rXrIibR zy4<}(uvdatKX>W;2@V(f8{RM*HnnJ^U5ifeKJB*7w0~>zwfgIVtPB(Xp6%JR?{db9 z1KI8O-Af-fd%6m5o-RH+rznJBfnMnajR!fG#Wl~r^Zn(uGxi{p)$h_QW44bndlPm}S^luCEN|i^zJ|FRf4EtjelDHltuzl*S9rSmxvX $blah) } } +// Meraki +$os = "merakimx"; +$config['os'][$os]['text'] = "Meraki MX Appliance"; +$config['os'][$os]['type'] = "firewall"; +$config['os'][$os]['icon'] = "meraki"; +$config['os'][$os]['ifname'] = 1; +$config['os'][$os]['over'][0]['graph'] = "device_bits"; +$config['os'][$os]['over'][0]['text'] = "Device Traffic"; + +$os = "merakimr"; +$config['os'][$os]['text'] = "Meraki AP"; +$config['os'][$os]['type'] = "wireless"; +$config['os'][$os]['icon'] = "meraki"; +$config['os'][$os]['ifname'] = 1; +$config['os'][$os]['over'][0]['graph'] = "device_bits"; +$config['os'][$os]['over'][0]['text'] = "Device Traffic"; + +$os = "merakims"; +$config['os'][$os]['text'] = "Meraki Switch"; +$config['os'][$os]['type'] = "network"; +$config['os'][$os]['icon'] = "meraki"; +$config['os'][$os]['ifname'] = 1; +$config['os'][$os]['over'][0]['graph'] = "device_bits"; +$config['os'][$os]['over'][0]['text'] = "Device Traffic"; + // Graph Types include_once($config['install_dir'] . "/includes/load_db_graph_types.inc.php"); diff --git a/includes/discovery/os/merakimr.inc.php b/includes/discovery/os/merakimr.inc.php new file mode 100644 index 0000000000..a8255a6b35 --- /dev/null +++ b/includes/discovery/os/merakimr.inc.php @@ -0,0 +1,17 @@ + + * 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 (preg_match("/^Meraki MR/", $sysDescr)) { $os = "merakimr"; } +} + +?> diff --git a/includes/discovery/os/merakims.inc.php b/includes/discovery/os/merakims.inc.php new file mode 100644 index 0000000000..8635c0e95d --- /dev/null +++ b/includes/discovery/os/merakims.inc.php @@ -0,0 +1,17 @@ + + * 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 (preg_match("/^Meraki MS/", $sysDescr)) { $os = "merakims"; } +} + +?> diff --git a/includes/discovery/os/merakimx.inc.php b/includes/discovery/os/merakimx.inc.php new file mode 100644 index 0000000000..aa0f87e913 --- /dev/null +++ b/includes/discovery/os/merakimx.inc.php @@ -0,0 +1,17 @@ + + * 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 (preg_match("/^Meraki MX/", $sysDescr)) { $os = "merakimx"; } +} + +?> diff --git a/includes/polling/os/merakimr.inc.php b/includes/polling/os/merakimr.inc.php new file mode 100644 index 0000000000..2158f6c259 --- /dev/null +++ b/includes/polling/os/merakimr.inc.php @@ -0,0 +1,18 @@ + + * 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(empty($hardware)) { + $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB"); +} + + +?> diff --git a/includes/polling/os/merakims.inc.php b/includes/polling/os/merakims.inc.php new file mode 100644 index 0000000000..1bfdaedc38 --- /dev/null +++ b/includes/polling/os/merakims.inc.php @@ -0,0 +1,18 @@ + + * 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(empty($hardware)) { + $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB"); +} + + +?> diff --git a/includes/polling/os/merakimx.inc.php b/includes/polling/os/merakimx.inc.php new file mode 100644 index 0000000000..217ca3afc9 --- /dev/null +++ b/includes/polling/os/merakimx.inc.php @@ -0,0 +1,18 @@ + + * 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(empty($hardware)) { + $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB"); +} + + +?> From 93c0e8ae9c14ab7ecf2f446aa86b65a40af36aef Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 6 Jul 2015 21:37:18 +0100 Subject: [PATCH 6/8] Delete meraki.png --- html/images/os/meraki.png | Bin 1664 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 html/images/os/meraki.png diff --git a/html/images/os/meraki.png b/html/images/os/meraki.png deleted file mode 100644 index 51b3564f6dc9e20b528d3d7933766b418addb6fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1664 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T}FfdWk9dNvV1jxdlK~3=B3ERzPNMYDuC(MQ%=Bu~mhw5?F;5kPQ;nS5g2gDap1~ zitr6kaLzAERWQ{v(KAr8<5EyiuqjGOvkG!?gK7uzY?U%fN(!v>^~=l4^~#O)@{7{- z4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#sF3Kz@$;{7F0GXSZlwVq6tE2?7 z2o50bEXhnm*pycc^%l^B`XCv7Lp=k1xY$-uu4$%|?`(myi^JB2i8yLB{aA6K{@*9Z*Na6&7HV|3F8S{gV8FUGH^67HS+9ht zeUSN*v)xB*e9AuGy89-%tn7OAyEJp_yS<$%6YMPwir=5H{XQrEoaOzU$}Te!q+Pf6 z?%VlVmf^M>eb=OT< z4mI?tURWcR5b(BDA>*;#lMh17CXJSo6&kNa;?`D6AHA9S@#~S3Z45jT{)}Ir06bo^Lkrh&VNsnch-Hi zGfiJauo-<}t@!f5IAfhnqt4;KcYekt8?QTG)A{b8^p;S?Y_W$sibdq_)bOzhZpg}d z$Zt7SnpNB7;DO#-5iD)beh1_;h%sOOk@|pLuF>+o$a+D|M{Wz{Uda4q<9)i8t89r+ zqss4(7yHu-OFt={@+tK^$H^%=SL20&{2Sj$<|WQM)n&V6Uh1DLi^81*g6lz4O*SHYJ@U`CVLx_8I|&q6@0eCTDC6IrMOD zL+wB7jwCacYg&IC*B^=zYA}3mP&H@zgq0_sU!AwYH{Que-|}P1QSKF*c3phGL${Q~ zxfM^DI;ZZf+=8`lN^N34+qk8@fAnRm_l>g*0;Z;qvi2)Pdor-4zgZ9v$s-mOA3QDM z_0o)qbM)<)C#Qw(*W1C;e2gRO>SsB2{gg%PLJwa`J{f+)hwZ_e#}E5O{TG$#$X?0X z|Le7L&7bGO70dT=KbQM$64-mb^U(S&vI*ykBYjO0u2c*6TBdJMUmUP-HG{+3vO~q~ z?OqF~K02uTzqd}_`}n42cc)3rG1@YGj_XYiJ&ixoQZK_=CF{iT>Du2b|E4D-WOpuF zpji0-?0fk}eVdlpSF0>)Gnidf0$m(=wJb!Xw<={bXe)8)obz#-sPJc#^yW+JZI+7n zZTZ}`b&;67h+xDgy#u0BEuNxhC;R!Nx23Q+ZT{eNTmGn?)GyJ8xI}6DE|G9D8n?>?_R+tpJhGXCzsdJb$rpfl%HD^&oG=^ zvtZiO-G7cKXHEPeFgM`2j*;1dBQf2#n%V<{OH5Y&cQ1E&&&9COX3|I3n}@rXrIibR zy4<}(uvdatKX>W;2@V(f8{RM*HnnJ^U5ifeKJB*7w0~>zwfgIVtPB(Xp6%JR?{db9 z1KI8O-Af-fd%6m5o-RH+rznJBfnMnajR!fG#Wl~r^Zn(uGxi{p)$h_QW44bndlPm}S^luCEN|i^zJ|FRf4EtjelDHltuzl*S9rSmxvX Date: Mon, 6 Jul 2015 21:49:13 +0100 Subject: [PATCH 7/8] Meraki Logo. Source = Meraki Partner Portal --- html/images/os/meraki.png | Bin 0 -> 1664 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 html/images/os/meraki.png diff --git a/html/images/os/meraki.png b/html/images/os/meraki.png new file mode 100644 index 0000000000000000000000000000000000000000..51b3564f6dc9e20b528d3d7933766b418addb6fa GIT binary patch literal 1664 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T}FfdWk9dNvV1jxdlK~3=B3ERzPNMYDuC(MQ%=Bu~mhw5?F;5kPQ;nS5g2gDap1~ zitr6kaLzAERWQ{v(KAr8<5EyiuqjGOvkG!?gK7uzY?U%fN(!v>^~=l4^~#O)@{7{- z4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#sF3Kz@$;{7F0GXSZlwVq6tE2?7 z2o50bEXhnm*pycc^%l^B`XCv7Lp=k1xY$-uu4$%|?`(myi^JB2i8yLB{aA6K{@*9Z*Na6&7HV|3F8S{gV8FUGH^67HS+9ht zeUSN*v)xB*e9AuGy89-%tn7OAyEJp_yS<$%6YMPwir=5H{XQrEoaOzU$}Te!q+Pf6 z?%VlVmf^M>eb=OT< z4mI?tURWcR5b(BDA>*;#lMh17CXJSo6&kNa;?`D6AHA9S@#~S3Z45jT{)}Ir06bo^Lkrh&VNsnch-Hi zGfiJauo-<}t@!f5IAfhnqt4;KcYekt8?QTG)A{b8^p;S?Y_W$sibdq_)bOzhZpg}d z$Zt7SnpNB7;DO#-5iD)beh1_;h%sOOk@|pLuF>+o$a+D|M{Wz{Uda4q<9)i8t89r+ zqss4(7yHu-OFt={@+tK^$H^%=SL20&{2Sj$<|WQM)n&V6Uh1DLi^81*g6lz4O*SHYJ@U`CVLx_8I|&q6@0eCTDC6IrMOD zL+wB7jwCacYg&IC*B^=zYA}3mP&H@zgq0_sU!AwYH{Que-|}P1QSKF*c3phGL${Q~ zxfM^DI;ZZf+=8`lN^N34+qk8@fAnRm_l>g*0;Z;qvi2)Pdor-4zgZ9v$s-mOA3QDM z_0o)qbM)<)C#Qw(*W1C;e2gRO>SsB2{gg%PLJwa`J{f+)hwZ_e#}E5O{TG$#$X?0X z|Le7L&7bGO70dT=KbQM$64-mb^U(S&vI*ykBYjO0u2c*6TBdJMUmUP-HG{+3vO~q~ z?OqF~K02uTzqd}_`}n42cc)3rG1@YGj_XYiJ&ixoQZK_=CF{iT>Du2b|E4D-WOpuF zpji0-?0fk}eVdlpSF0>)Gnidf0$m(=wJb!Xw<={bXe)8)obz#-sPJc#^yW+JZI+7n zZTZ}`b&;67h+xDgy#u0BEuNxhC;R!Nx23Q+ZT{eNTmGn?)GyJ8xI}6DE|G9D8n?>?_R+tpJhGXCzsdJb$rpfl%HD^&oG=^ zvtZiO-G7cKXHEPeFgM`2j*;1dBQf2#n%V<{OH5Y&cQ1E&&&9COX3|I3n}@rXrIibR zy4<}(uvdatKX>W;2@V(f8{RM*HnnJ^U5ifeKJB*7w0~>zwfgIVtPB(Xp6%JR?{db9 z1KI8O-Af-fd%6m5o-RH+rznJBfnMnajR!fG#Wl~r^Zn(uGxi{p)$h_QW44bndlPm}S^luCEN|i^zJ|FRf4EtjelDHltuzl*S9rSmxvX Date: Tue, 7 Jul 2015 10:04:10 +0100 Subject: [PATCH 8/8] Update definitions.inc.php removed conflict. --- includes/definitions.inc.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 16b4dcde02..1140ad6aa3 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -1189,11 +1189,7 @@ foreach ($config['os'] as $this_os => $blah) } } -<<<<<<< HEAD -// Meraki -======= // Meraki Devices ->>>>>>> 8b9323852cb4acdbedecca17c7a1a2fc8a53155f $os = "merakimx"; $config['os'][$os]['text'] = "Meraki MX Appliance"; $config['os'][$os]['type'] = "firewall";