Skip to content

Commit

Permalink
Fixing #4892, #4890, #3131 - Re-index options
Browse files Browse the repository at this point in the history
Issue #3131 has been available through the Edit Device interface for some time.  So, marking that complete.  The other two address first a bug in 1.2.22 with the removal of re-index records from the poller_command table, and introduces parallel processing to the whole re-index game.
  • Loading branch information
TheWitness committed Aug 18, 2022
1 parent a0a8b7d commit ca2a654
Show file tree
Hide file tree
Showing 3 changed files with 351 additions and 80 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Cacti CHANGELOG

1.2.23
-issue#4892: Recache Loop after many devices go offline
-feature#3131: Button to reindex bad indexes
-feature#4890: Add multi threading for Poller rechace script

1.2.22
-security#4834: When creating new graphs, cross site injection is possible
-issue#4768: When creating user from template, multiple Domain FullName and Mail are not propagated
Expand Down
34 changes: 31 additions & 3 deletions include/global_settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@
'size' => '5'
),
'timeouts_header' => array(
'friendly_name' => __('Background Timeout Settings'),
'friendly_name' => __('Background Timeout and Concurrent Process Settings'),
'collapsible' => 'true',
'method' => 'spacer',
),
Expand Down Expand Up @@ -1279,8 +1279,8 @@
)
),
'commands_timeout' => array(
'friendly_name' => __('Background Commands Timeout'),
'description' => __('The maximum amount of time Cacti\'s Background Commands script can run without generating a timeout error and being killed.'),
'friendly_name' => __('Poller Commands Timeout'),
'description' => __('The maximum amount of time Cacti\'s Background Commands script can run without generating a timeout error and being killed. This script will perform tasks such as re-indexing Devices and pruning devices from Remote Data Collectors.'),
'method' => 'drop_array',
'default' => '300',
'array' => array(
Expand All @@ -1291,6 +1291,34 @@
'1200' => __('%s Minutes', 20)
)
),
'commands_processes' => array(
'friendly_name' => __('Poller Command Concurrent Processes'),
'description' => __('The number of concurrent Poller Command processes. The will be at most one concurrent command per host within the Poller Command pool.'),
'default' => '1',
'method' => 'drop_array',
'array' => array(
1 => __('1 Process'),
2 => __('%d Processes', 2),
3 => __('%d Processes', 3),
4 => __('%d Processes', 4),
5 => __('%d Processes', 5),
6 => __('%d Processes', 6),
7 => __('%d Processes', 7),
8 => __('%d Processes', 8),
9 => __('%d Processes', 9),
10 => __('%d Processes', 10),
11 => __('%d Processes', 11),
12 => __('%d Processes', 12),
13 => __('%d Processes', 13),
14 => __('%d Processes', 14),
15 => __('%d Processes', 15),
16 => __('%d Processes', 16),
17 => __('%d Processes', 17),
18 => __('%d Processes', 18),
19 => __('%d Processes', 19),
20 => __('%d Processes', 20),
)
),
'maintenance_timeout' => array(
'friendly_name' => __('Maintenance Background Generation Timeout'),
'description' => __('The maximum amount of time a Cacti\'s Maintenance script can run without generating a timeout error and being killed.'),
Expand Down
Loading

0 comments on commit ca2a654

Please sign in to comment.