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

fix: support hosts added by ipv6 without DNS #5567

Browse Source
This commit is contained in:
Tony Murray
2017-01-24 15:48:03 -06:00
committed by Neil Lathwood
parent 839dd31093
commit 56bb0d2b97
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/polling/functions.inc.php
View File

@@ -201,7 +201,7 @@ function poll_device($device, $options)
$poll_update_array = array(); $poll_update_array = array();
$update_array = array(); $update_array = array();
$host_rrd = $config['rrd_dir'].'/'.$device['hostname']; $host_rrd = rrd_name($device['hostname'], '', '');
if ($config['norrd'] !== true && !is_dir($host_rrd)) { if ($config['norrd'] !== true && !is_dir($host_rrd)) {
mkdir($host_rrd); mkdir($host_rrd);
echo "Created directory : $host_rrd\n"; echo "Created directory : $host_rrd\n";

6
includes/polling/unix-agent/munin-plugins.inc.php
View File

@@ -11,10 +11,10 @@ if (!empty($agent_data['munin'])) {
$plugins_db[$plugin_db['mplug_type']]['id'] = $plugin_db['mplug_id']; $plugins_db[$plugin_db['mplug_type']]['id'] = $plugin_db['mplug_id'];
} }
$old_plugins_rrd_dir = $host_rrd.'/plugins'; $old_plugins_rrd_dir = $host_rrd.'plugins';
$plugins_rrd_dir = $host_rrd.'/munin'; $plugins_rrd_dir = $host_rrd.'munin';
if (is_dir($old_plugins_rrd_dir) && !is_dir($plugins_rrd_dir)) { if (is_dir($old_plugins_rrd_dir) && !is_dir($plugins_rrd_dir)) {
rename($old_plugins_dir, $plugins_dir); rename($old_plugins_rrd_dir, $plugins_rrd_dir);
} }
if (!is_dir($plugins_rrd_dir)) { if (!is_dir($plugins_rrd_dir)) {

1
includes/rrdtool.inc.php
View File

@@ -300,6 +300,7 @@ function rrd_name($host, $extra, $extension = ".rrd")
{ {
global $config; global $config;
$filename = safename(is_array($extra) ? implode("-", $extra) : $extra); $filename = safename(is_array($extra) ? implode("-", $extra) : $extra);
$host = str_replace(':', '_', trim($host, '[]'));
return implode("/", array($config['rrd_dir'], $host, $filename.$extension)); return implode("/", array($config['rrd_dir'], $host, $filename.$extension));
} // rrd_name } // rrd_name