I'm specifically working with RHEL 5 at this point. Not sure how this would affect windows, or even debian based packages.

Available in development branch svn://svn.zabbix.com/branches/dev/ZBXNEXT-497

(1) there is no mention on how the solution is supposed to work...

nikolajs.agafonovs Only files with ".conf" extension will be processed as config files. Should I describe it now in documentation?

<richlv> i'd like to suggest to make this parameter support regexps... hardcoding to *.conf does not seem good, and hopefully we already have code for this from logrt items

asaveljevs Regexps might be a bit confusing. Instead, file globbing like "/path/to/configs/*.conf" should probably be preferred.

<richlv> or that, yes - though i can't recall existing code for that in zabbix, thus i suggested regexps first

<richlv> for the record, it was decided to support globs/placeholders asterisks in filename only. thus something like /path/01*files*.conf would work. it would also allow to somewhat order the included files, in a similar way to initscripts

nikolajs.agafonovs wildcards in filenames now working for unix and windows. One can check it in svn://svn.zabbix.com/branches/dev/ZBXNEXT-497 RESOLVED in r44366

asaveljevs This subissue was for deciding on the approach. Bugs with the implementation will be reported as separate subissues. CLOSED.

(2) The currently implemented solution is likely to crash if there is no "." symbol in the file name.

nikolajs.agafonovs RESOLVED in r44236

asaveljevs Please see r44261. It fixes a bit of style and a memory leak. RESOLVED.

asaveljevs Since it was decided to redesign the solution, r44261 no longer matters. WON'T FIX.

(3) The currently implemented solution is Windows-only.

nikolajs.agafonovs RESOLVED in r44236

asaveljevs CLOSED.

(4) need to substitute strtok() function with some another function

asaveljevs It might be better to rewrite the algorithm so that it works without tokenizing.

nikolajs.agafonovs tokenizing could be used as general function, something like zbx_strtok()

nikolajs.agafonovscode refactored and fixed. RESOLVED in r44609

wiper I like the alternate idea better. While in theory tokenizing the patter first and then matching against it might give better performance for directories with large number of include files, it's not a concern here and the alternate implementation is simpler.
CLOSED

(5) Alternative implementation is available at svn://svn.zabbix.com/branches/dev/ZBXNEXT-497-alt . Unit test are available, too.

wiper Please review my changes in r44958 and 44966 (you can revert the last one if you don't like it)

wiper scratch the r44958, reverting it

asaveljevs Decided to abandon the *strcompare_func idea. CLOSED.

(6) In parse_cfg_object() function there are separate code path for directory processing in nix and windows. It would make a bit cleaner code (less 'embedded' ifdefs) if it was moved into parse_cfg_dir() function, which would have nix and windows versions.

asaveljevs RESOLVED in r45016.

wiper CLOSED

(7) If "Include" parameter contains a slash at the end, then we should check that the path is a directory. Currently, it can be parsed as a file, too.

asaveljevs RESOLVED in r45038.

wiper CLOSED

Successfully tested

Please review minor changes in r45160

asaveljevs Looks correct.

Available in pre-2.3.0 (trunk) r45179.

(8) Documentation.

Added to 'what's new': https://www.zabbix.com/documentation/2.4/manual/introduction/whatsnew240#daemon_improvements.

Reviewed by asaveljevs. CLOSED.

<richlv> i'd suggest to change "Ability to exclude files from Include directory" to something like "...include specific files..." - that seems to make it more clear what the new feature is

martins-v Changed to "include specific".

<richlv> thanks, CLOSED

(9) Pages describing daemon configuration should be updated, too:

• https://www.zabbix.com/documentation/2.4/manual/appendix/config/zabbix_agentd
• https://www.zabbix.com/documentation/2.4/manual/appendix/config/zabbix_agentd_win
• https://www.zabbix.com/documentation/2.4/manual/appendix/config/zabbix_agent
• https://www.zabbix.com/documentation/2.4/manual/appendix/config/zabbix_proxy
• https://www.zabbix.com/documentation/2.4/manual/appendix/config/zabbix_server

It might be that https://www.zabbix.com/documentation/2.4/manual/appendix/config/special_notes_include needs to be adjusted as well.

martins-v Updated all of the listed. RESOLVED.

asaveljevs CLOSED.

(10) Pattern example should be included in sample configuration files.

asaveljevs RESOLVED in r45255.

wiper CLOSED

asaveljevs Merged into trunk in r45256.