Issue 1540 - Add support for Cisco Voice Gateways #1565

Merged
merged 6 commits into from Aug 1, 2015

Projects

None yet

5 participants

@adaniels21487
Contributor

Hi Team,
This PR is working fine for me, can someone with a Cisco voice gateway give it a shot and let me know if it needs any more work?

Fixes #1540

adaniels21487 added some commits Jul 27, 2015
@adaniels21487 adaniels21487 Added Poller modules for Cisco Voice Routers
Added the following modules:
- Cisco PRI - graphs the total and inuse Primary Rate ISDN channels.
- Cisco DSP - graphs the total and inuse Digital Signal Processor (DSP) resources.
- Cisco MTP - graphs the total and inuse Media Termination Point (MTP) resources.
- Cisco XCode - graphs the total and inuse Transcoder resources.
b68b619
@adaniels21487 adaniels21487 Merge branch 'master' of https://github.com/adaniels21487/librenms in…
…to issue-1540
f6ee98c
@Rosiak
Contributor
Rosiak commented Jul 30, 2015

Hi Aaron,
Please check the formatiing of the files.
http://docs.librenms.org/Developing/Code-Guidelines/

@laf
Member
laf commented Jul 30, 2015

Hi @adaniels21487

It just needs the formatting updating in line with our standards if you can do that please.

I know you've signed the agreement already but as the formatting of this isn't how ours is at the moment, can you please confirm that you haven't developed this against an Observium installation or using any code from an Observium installation?

adaniels21487 added some commits Jul 30, 2015
@adaniels21487 adaniels21487 Change formatting to properly conform to the Coding guidelines. a327786
@adaniels21487 adaniels21487 Merge branch 'master' of https://github.com/adaniels21487/librenms in…
…to issue-1540
cba431d
@adaniels21487
Contributor

@laf Confirmed. The poller module was based on cisco-vpdn.inc.php and the device graph pages were based off wifi-clients.inc.php

Re: Formatting. Yes, I reverted to some bad habits in the device pages, can you please advise if they are ok now?

@laf
Member
laf commented Jul 30, 2015

All the formatting looks good :)

My last and final question I think - why have them all as separate poller modules. Is it not better to have just one cisco-voice (or something similar) poller module that then calls each of those files from a sub directory?

@adaniels21487
Contributor

We could easily move the poller modules to a cisco-voice directory and have a cisco-voice.inc.php that contains 4 include statements, is this what you are referring to?

But each module still needs to determine if it needs to run on its own as they each perform a separate function and a voice gateway may only implement some of the functions.
For example, I have voice gateways that perform a PSTN role connecting to the telco. These devices respond to cisco-dsp and cisco-pri. Others perform a transcoding role and only respond to cisco-xcode and cisco-dsp, etc.

Happy to take your direction...

@laf
Member
laf commented Jul 31, 2015

Hi @adaniels21487 Yeah that's what I meant.

It's fine each file doing it's own check it should run but it makes sense to bundle them into one poller module.

adaniels21487 added some commits Aug 1, 2015
@adaniels21487 adaniels21487 Merged separate modules into a single 'cisco-voice' module.
Renamed each module to a more appropriate name.
8379c96
@adaniels21487 adaniels21487 Merge branch 'master' of https://github.com/adaniels21487/librenms in…
…to issue-1540
f0347bd
@laf
Member
laf commented Aug 1, 2015

👍 from me.

@paulgear paulgear merged commit 3227156 into librenms:master Aug 1, 2015

2 checks passed

Auto-Deploy Build finished.
Details
Scrutinizer 7 new issues
Details
@adaniels21487 adaniels21487 deleted the adaniels21487:issue-1540 branch Aug 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment