diff --git a/html/includes/graphs/device/cisco-dsp.inc.php b/html/includes/graphs/device/cisco-iosdsp.inc.php
similarity index 98%
rename from html/includes/graphs/device/cisco-dsp.inc.php
rename to html/includes/graphs/device/cisco-iosdsp.inc.php
index bdbc41d64..41f0b0eda 100644
--- a/html/includes/graphs/device/cisco-dsp.inc.php
+++ b/html/includes/graphs/device/cisco-iosdsp.inc.php
@@ -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'";
diff --git a/html/includes/graphs/device/cisco-hwmtp.inc.php b/html/includes/graphs/device/cisco-iosmtp.inc.php
similarity index 98%
rename from html/includes/graphs/device/cisco-hwmtp.inc.php
rename to html/includes/graphs/device/cisco-iosmtp.inc.php
index aaede692b..f86b2a28d 100644
--- a/html/includes/graphs/device/cisco-hwmtp.inc.php
+++ b/html/includes/graphs/device/cisco-iosmtp.inc.php
@@ -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'";
diff --git a/html/includes/graphs/device/cisco-pri.inc.php b/html/includes/graphs/device/cisco-iospri.inc.php
similarity index 98%
rename from html/includes/graphs/device/cisco-pri.inc.php
rename to html/includes/graphs/device/cisco-iospri.inc.php
index fc0c66d91..c2e100084 100644
--- a/html/includes/graphs/device/cisco-pri.inc.php
+++ b/html/includes/graphs/device/cisco-iospri.inc.php
@@ -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'";
diff --git a/html/includes/graphs/device/cisco-xcode.inc.php b/html/includes/graphs/device/cisco-iosxcode.inc.php
similarity index 98%
rename from html/includes/graphs/device/cisco-xcode.inc.php
rename to html/includes/graphs/device/cisco-iosxcode.inc.php
index 6a71a09e3..6ed9b766b 100644
--- a/html/includes/graphs/device/cisco-xcode.inc.php
+++ b/html/includes/graphs/device/cisco-iosxcode.inc.php
@@ -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'";
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 06f662643..6563e76e7 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -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.
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index e03273b6f..ec41eb09b 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -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.';
diff --git a/includes/polling/cisco-voice.inc.php b/includes/polling/cisco-voice.inc.php
new file mode 100644
index 000000000..fc4739746
--- /dev/null
+++ b/includes/polling/cisco-voice.inc.php
@@ -0,0 +1,40 @@
+
+ *
+ * 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";
+
+}
\ No newline at end of file
diff --git a/includes/polling/cisco-dsp.inc.php b/includes/polling/cisco-voice/cisco-iosdsp.inc.php
similarity index 91%
rename from includes/polling/cisco-dsp.inc.php
rename to includes/polling/cisco-voice/cisco-iosdsp.inc.php
index 20b2b9abf..963afd509 100644
--- a/includes/polling/cisco-dsp.inc.php
+++ b/includes/polling/cisco-voice/cisco-iosdsp.inc.php
@@ -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);
}
\ No newline at end of file
diff --git a/includes/polling/cisco-hwmtp.inc.php b/includes/polling/cisco-voice/cisco-iosmtp.inc.php
similarity index 91%
rename from includes/polling/cisco-hwmtp.inc.php
rename to includes/polling/cisco-voice/cisco-iosmtp.inc.php
index 12b48f6b6..01d234016 100644
--- a/includes/polling/cisco-hwmtp.inc.php
+++ b/includes/polling/cisco-voice/cisco-iosmtp.inc.php
@@ -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);
}
\ No newline at end of file
diff --git a/includes/polling/cisco-pri.inc.php b/includes/polling/cisco-voice/cisco-iospri.inc.php
similarity index 92%
rename from includes/polling/cisco-pri.inc.php
rename to includes/polling/cisco-voice/cisco-iospri.inc.php
index a2c2835fd..91c77ca35 100644
--- a/includes/polling/cisco-pri.inc.php
+++ b/includes/polling/cisco-voice/cisco-iospri.inc.php
@@ -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);
}
\ No newline at end of file
diff --git a/includes/polling/cisco-xcode.inc.php b/includes/polling/cisco-voice/cisco-iosxcode.inc.php
similarity index 91%
rename from includes/polling/cisco-xcode.inc.php
rename to includes/polling/cisco-voice/cisco-iosxcode.inc.php
index b4b1f8096..e3b9799cd 100644
--- a/includes/polling/cisco-xcode.inc.php
+++ b/includes/polling/cisco-voice/cisco-iosxcode.inc.php
@@ -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);
}
\ No newline at end of file