mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged separate modules into a single 'cisco-voice' module.

Browse Source 
Renamed each module to a more appropriate name.
This commit is contained in:
Aaron Daniels
2015-08-01 14:48:54 +10:00
parent cba431df6c
commit 8379c96346
11 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/graphs/device/cisco-dsp.inc.php → html/includes/graphs/device/cisco-iosdsp.inc.php
View File

@@ -13,7 +13,7 @@
include "includes/graphs/common.inc.php";
$rrd_options .= " -l 0 -E ";
$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/cisco-dsp.rrd";
$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/cisco-iosdsp.rrd";
if (file_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max\\n'";

2
html/includes/graphs/device/cisco-hwmtp.inc.php → html/includes/graphs/device/cisco-iosmtp.inc.php
View File

@@ -13,7 +13,7 @@
include "includes/graphs/common.inc.php";
$rrd_options .= " -l 0 -E ";
$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/cisco-hwmtp.rrd";
$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/cisco-iosmtp.rrd";
if (file_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max\\n'";

2
html/includes/graphs/device/cisco-pri.inc.php → html/includes/graphs/device/cisco-iospri.inc.php
View File

@@ -13,7 +13,7 @@
include "includes/graphs/common.inc.php";
$rrd_options .= " -l 0 -E ";
$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/cisco-pri.rrd";
$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/cisco-iospri.rrd";
if (file_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max\\n'";

2
html/includes/graphs/device/cisco-xcode.inc.php → html/includes/graphs/device/cisco-iosxcode.inc.php
View File

@@ -13,7 +13,7 @@
include "includes/graphs/common.inc.php";
$rrd_options .= " -l 0 -E ";
$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/cisco-xcode.rrd";
$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/cisco-iosxcode.rrd";
if (file_exists($rrd_filename)) {
$rrd_options .= " COMMENT:' Cur Min Max\\n'";

5
includes/defaults.inc.php
View File

@@ -660,10 +660,7 @@ $config['poller_modules']['entity-physical'] = 1;
$config['poller_modules']['applications'] = 1;
$config['poller_modules']['cisco-asa-firewall'] = 1;
$config['poller_modules']['mib'] = 0;
$config['poller_modules']['cisco-pri'] = 1;
$config['poller_modules']['cisco-dsp'] = 1;
$config['poller_modules']['cisco-hwmtp'] = 1;
$config['poller_modules']['cisco-xcode'] = 1;
$config['poller_modules']['cisco-voice'] = 1;
// List of discovery modules. Need to be in this array to be
// considered for execution.

24
includes/definitions.inc.php
View File

@@ -1538,21 +1538,21 @@ $config['graph_types']['device']['asa_conns']['section'] = 'firewall';
$config['graph_types']['device']['asa_conns']['order'] = '0';
$config['graph_types']['device']['asa_conns']['descr'] = 'Current connections';
$config['graph_types']['device']['cisco-pri']['section'] = 'voice';
$config['graph_types']['device']['cisco-pri']['order'] = '0';
$config['graph_types']['device']['cisco-pri']['descr'] = 'PRI Utilisation';
$config['graph_types']['device']['cisco-iospri']['section'] = 'voice';
$config['graph_types']['device']['cisco-iospri']['order'] = '0';
$config['graph_types']['device']['cisco-iospri']['descr'] = 'PRI Utilisation';
$config['graph_types']['device']['cisco-dsp']['section'] = 'voice';
$config['graph_types']['device']['cisco-dsp']['order'] = '0';
$config['graph_types']['device']['cisco-dsp']['descr'] = 'DSP Utilisation';
$config['graph_types']['device']['cisco-iosdsp']['section'] = 'voice';
$config['graph_types']['device']['cisco-iosdsp']['order'] = '0';
$config['graph_types']['device']['cisco-iosdsp']['descr'] = 'DSP Utilisation';
$config['graph_types']['device']['cisco-hwmtp']['section'] = 'voice';
$config['graph_types']['device']['cisco-hwmtp']['order'] = '0';
$config['graph_types']['device']['cisco-hwmtp']['descr'] = 'Hardware MTP Utilisation';
$config['graph_types']['device']['cisco-iosmtp']['section'] = 'voice';
$config['graph_types']['device']['cisco-iosmtp']['order'] = '0';
$config['graph_types']['device']['cisco-iosmtp']['descr'] = 'Hardware MTP Utilisation';
$config['graph_types']['device']['cisco-xcode']['section'] = 'voice';
$config['graph_types']['device']['cisco-xcode']['order'] = '0';
$config['graph_types']['device']['cisco-xcode']['descr'] = 'Transcoder Utilisation';
$config['graph_types']['device']['cisco-iosxcode']['section'] = 'voice';
$config['graph_types']['device']['cisco-iosxcode']['order'] = '0';
$config['graph_types']['device']['cisco-iosxcode']['descr'] = 'Transcoder Utilisation';
$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.';

40
includes/polling/cisco-voice.inc.php Normal file
View File

@@ -0,0 +1,40 @@
<?php
/*
* LibreNMS module to Graph Cisco Voice components.
*
* Copyright (c) 2015 Aaron Daniels <aaron@daniels.id.au>
*
* 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 PRI
* This module graphs the used and total DS0 channels on a Cisco Voice Gateway
*/
include "cisco-voice/cisco-iospri.inc.php";
/*
* Cisco DSP
* This module graphs the used and total DSP resources on a Cisco Voice Gateway
*/
include "cisco-voice/cisco-iosdsp.inc.php";
/*
* Cisco MTP
* This module graphs the used and total MTP resources on a Cisco Voice Gateway
*/
include "cisco-voice/cisco-iosmtp.inc.php";
/*
* Cisco XCode
* This module graphs the used and total Transcoder resources on a Cisco Voice Gateway
*/
include "cisco-voice/cisco-xcode.inc.php";
}

6
includes/polling/cisco-dsp.inc.php → includes/polling/cisco-voice/cisco-iosdsp.inc.php
View File

@@ -25,14 +25,14 @@ if ($device['os_group'] == "cisco") {
$active += $value[''];
}
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ("cisco-dsp.rrd");
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ("cisco-iosdsp.rrd");
if (!file_exists ($rrd_filename)) {
rrdtool_create ($rrd_filename, " DS:total:GAUGE:600:0:U DS:active:GAUGE:600:0:U" . $config['rrd_rra']);
}
rrdtool_update ($rrd_filename, "N:" . $total . ":" . $active);
$graphs['cisco-dsp'] = TRUE;
echo (" Cisco DSP ");
$graphs['cisco-iosdsp'] = TRUE;
echo (" Cisco IOS DSP ");
}
unset($rrd_filename, $total, $active);
}

6
includes/polling/cisco-hwmtp.inc.php → includes/polling/cisco-voice/cisco-iosmtp.inc.php
View File

@@ -24,14 +24,14 @@ if ($device['os_group'] == "cisco") {
// Active
$active = $total - $available;
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ("cisco-hwmtp.rrd");
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ("cisco-iosmtp.rrd");
if (!file_exists ($rrd_filename)) {
rrdtool_create ($rrd_filename, " DS:total:GAUGE:600:0:U DS:active:GAUGE:600:0:U" . $config['rrd_rra']);
}
rrdtool_update ($rrd_filename, "N:" . $total . ":" . $active);
$graphs['cisco-hwmtp'] = TRUE;
echo (" Cisco HW MTP ");
$graphs['cisco-iosmtp'] = TRUE;
echo (" Cisco IOS MTP ");
}
unset($rrd_filename, $total, $active, $available);
}

6
includes/polling/cisco-pri.inc.php → includes/polling/cisco-voice/cisco-iospri.inc.php
View File

@@ -28,15 +28,15 @@ if ($device['os_group'] == "cisco") {
$active = $active['1.3.6.1.4.1.9.10.19.1.1.4.0'][''];
if (isset($active) && ($active != "") && ($total != 0)) {
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ("cisco-pri.rrd");
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ("cisco-iospri.rrd");
if (!file_exists ($rrd_filename)) {
rrdtool_create ($rrd_filename, " DS:total:GAUGE:600:0:U DS:active:GAUGE:600:0:U" . $config['rrd_rra']);
}
rrdtool_update ($rrd_filename, "N:" . $total . ":" . $active);
$graphs['cisco-pri'] = TRUE;
echo (" Cisco PRI ");
$graphs['cisco-iospri'] = TRUE;
echo (" Cisco IOS PRI ");
}
unset($rrd_filename, $total, $active);
}

6
includes/polling/cisco-xcode.inc.php → includes/polling/cisco-voice/cisco-iosxcode.inc.php
View File

@@ -24,14 +24,14 @@ if ($device['os_group'] == "cisco") {
// Active
$active = $total - $available;
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ("cisco-xcode.rrd");
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ("cisco-iosxcode.rrd");
if (!file_exists ($rrd_filename)) {
rrdtool_create ($rrd_filename, " DS:total:GAUGE:600:0:U DS:active:GAUGE:600:0:U" . $config['rrd_rra']);
}
rrdtool_update ($rrd_filename, "N:" . $total . ":" . $active);
$graphs['cisco-xcode'] = TRUE;
echo (" Cisco Transcoder ");
$graphs['cisco-iosxcode'] = TRUE;
echo (" Cisco IOS Transcoder ");
}
unset($rrd_filename, $total, $active, $available);
}