admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-08 21:16:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Attempt at fixing step and heartbeat during import

Browse Source 
Step and heartbeat was always set to default when importing profiles with a newly created datasource_profile(example 1 minute polling profile).

Now step and heartbeat is read from the profile.

New installations and upgrades do not have a datasource_profile. $profile_id is returned as an array in that case. Not to happy about the fix for that, but it works.

Tested import with default profile, 1 minute polling profile as well as new installation import of Disk IO. Works fine.
This commit is contained in:
Micke2k committed 2016-04-09 21:58:10 +04:00
1 parent 12d5de1068
commit 0fef67d0a6
1 file changed
+14 -3
Download Patch File Download Diff File Expand all files Collapse all files
lib/import.php
+14 -3
View File
@@ -305,9 +305,15 @@ function xml_to_data_template($hash, &$xml_array, &$hash_cache, $import_as_new,
}
}
/* use the polling interval as the step if we are to use the default rra settings */
/* use the profiles step if we are not importing a new one */
if ($import_as_new == false) {
$save['rrd_step'] = db_fetch_cell('SELECT step FROM data_source_profiles ORDER BY `default` DESC LIMIT 1');
$save['rrd_step'] = db_fetch_cell('SELECT step FROM data_source_profiles WHERE id=' . $profile_id . '');
}
/* Fix for importing during installation - use the polling interval as the step if we are to use the default rra settings */
if (is_array($profile_id) == true) {
$save['rrd_step'] = read_config_option('poller_interval');
}
$data_template_data_id = sql_save($save, 'data_template_data');
@@ -352,8 +358,13 @@ function xml_to_data_template($hash, &$xml_array, &$hash_cache, $import_as_new,
}
}
/* use the polling interval * 2 as the heartbeat if we are to use the default rra settings */
/* use the profiles step * 2 as the heartbeat if we are not importing a new profile */
if ($import_as_new === false) {
$save['rrd_heartbeat'] = db_fetch_cell('SELECT step FROM data_source_profiles WHERE id=' . $profile_id . '') * 2;
}
/* Fix for importing during installation - use the polling interval as the step if we are to use the default rra settings */
if (is_array($profile_id) == true) {
$save['rrd_heartbeat'] = read_config_option('poller_interval') * 2;
}