Add Meraki support #1402

Merged
merged 10 commits into from Jul 10, 2015

Projects

None yet

5 participants

@willjones
Contributor

Added logo under new commit.

Logo sourced from Meraki Partner Portal from their marketing collateral section and resized to 32x32px.

willjones added some commits Jul 6, 2015
@willjones willjones Create merakimr.inc.php
OS detection module for Meraki MR
1a5f98a
@willjones willjones Create merakims.inc.php
OS Detection module for Meraki MS
f8b6038
@willjones willjones Create merakimx.inc.php
OS Detection module for Meraki MX
be69210
@willjones willjones Adding Meraki devices
Definitions for Meraki MX. MR and MS hardware.
f6f4a40
@willjones willjones Merge pull request #1 from willjones/meraki-discovery
issue-1396
8b93238
@willjones willjones Added Meraki OS discovery and polling 016b759
@willjones willjones Added Meraki OS discovery and polling f1eeb98
@willjones willjones Delete meraki.png
93c0e8a
@willjones willjones Meraki Logo. Source = Meraki Partner Portal
7ab690f
@laf laf added the New-Device label Jul 7, 2015
@willjones willjones Update definitions.inc.php
removed conflict.
76dee75
@laf laf changed the title from Issue 1396 to Add Meraki support Jul 7, 2015
@laf
Member
laf commented Jul 7, 2015

Code looks good.

@paulgear can you confirm if you're happy with this PR. It replaces the one I've done with no code passed across and all done by @willjones

@paulgear paulgear was assigned by laf Jul 7, 2015
@paulgear
Member

Seems straightforward to me - what was the issue with yours, @laf ?

@laf
Member
laf commented Jul 10, 2015

I used the blog post from routed logic @paulgear

@f0o
Member
f0o commented Jul 10, 2015

👍

@paulgear paulgear merged commit ef90494 into librenms:master Jul 10, 2015

2 checks passed

Auto-Deploy Build finished.
Details
Scrutinizer 6 new issues
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment