补充elasticsearch插件num_most_recent_indices参数逻辑&完善indice 8000 s_include生效范围 #1203
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2、补充elasticsearch插件ilm_indices、indices_settings、indices_mappings、indices_aliases 参数indices_include生效逻辑以及参数num_most_recent_indices处理逻辑
There was a problem hiding this comment.
Pull Request Overview
This PR enhances the Elasticsearch plugin by adding logic to process the num_most_recent_indices parameter and extends the indices_include filtering across multiple collectors.
- Updated configuration and function signatures to pass num_most_recent_indices and indexMatchers for indices, indices settings, mappings, and ILM indices.
- Adjusted parameter names and updated test cases to match the new logic.
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| inputs/elasticsearch/elasticsearch.go | Changed the toml tag for index aliases and updated NewIndices to take new parameters. |
| inputs/elasticsearch/collector/indices*.go | Updated NewIndices, gatherIndividualIndicesStats, and categorization logic to include num_most_recent_indices and indexMatchers. |
| inputs/elasticsearch/collector/indices_settings*.go | Updated NewIndicesSettings and processing logic with additional filtering and sorting based on the new parameters. |
| inputs/elasticsearch/collector/indices_mappings*.go | Modified NewIndicesMappings and related fetch/collect methods to support the new parameters. |
| inputs/elasticsearch/collector/ilm_indices*.go | Extended ILM indices collector with new filtering and num_most_recent_indices processing logic. |
Comments suppressed due to low confidence (3)
inputs/elasticsearch/elasticsearch.go:59
- The configuration key was updated to 'export_indices_aliases' for consistency with plural naming. Please ensure that the documentation and any related configuration samples are updated accordingly.
ExportIndexAliases bool `toml:"export_indices_aliases"`
inputs/elasticsearch/collector/indices_settings.go:248
- Verify that lexicographical sorting using sort.Strings yields the correct ordering for determining the most recent indices, especially if the index names encode timestamps or other non-lexicographic orderings.
sort.Strings(matchingIndices)
inputs/elasticsearch/collector/indices.go:2526
- Confirm that using sort.Strings for ordering matchingIndices correctly reflects index recency according to the expected naming convention. If index names do not sort chronologically in lexicographical order, consider implementing a custom sorting function.
sort.Strings(matchingIndices)
kongfei605
reviewed
Apr 26, 2025
| @@ -56,7 +56,7 @@ type ( | |||
| ExportIndices bool `toml:"export_indices"` | |||
| ExportIndicesSettings bool `toml:"export_indices_settings"` | |||
| ExportIndicesMappings bool `toml:"export_indices_mappings"` | |||
| ExportIndexAliases bool `toml:"export_index_aliases"` | |||
| ExportIndexAliases bool `toml:"export_indices_aliases"` | |||
There was a problem hiding this comment.
可以用两个配置，一个配置兼容已有用户的export_index_aliases, 一个配置是新的正确语义的配置export_indices_aliases。 初始化时，老配置的可以给个提示deprecated，然后老的配置赋值给新的配置，后面流程都用新的配置。
|
Thank you @longjun91 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1、elasticsearch插件增加num_most_recent_indices参数处理逻辑
2、补充elasticsearch插件ilm_indices、indices_settings、indices_mappings、indices_aliases 参数indices_include生效逻辑以及参数num_most_recent_indices处理逻辑