Skip to content

Update elastic/logs integrations to 8.13.3 (#613)#628

Merged
ebadyano merged 1 commit intoelastic:8.15from
ebadyano:8.15
Jul 15, 2024
Merged

Update elastic/logs integrations to 8.13.3 (#613)#628
ebadyano merged 1 commit intoelastic:8.15from
ebadyano:8.15

Conversation

@ebadyano
Copy link
Contributor

backport for #613 to 8.15

Update integrations for elastic/logs to 8.13.3
@ebadyano ebadyano added the backport This PR is a backport of some other PR label Jul 15, 2024
@ebadyano ebadyano requested a review from gbanasiak July 15, 2024 12:26
Copy link
Contributor

@gbanasiak gbanasiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

I've noticed we still define number_of_shards in 2 places although I don't think we should for serverless:

component/track-custom-shared-settings.json <-- OK
8:        "number_of_shards": "{{ number_of_shards | default(1) }}",

component/auditbeat-mappings.json <-- NOT OK ?
13:        "number_of_shards": 1,

composable/logs-k8-application.log.json <-- NOT OK ?
16:        "number_of_shards": "{{ number_of_shards | default(1) }}",

PS. The above is just a BTW comment - we're not touching number of shards here.

@ebadyano ebadyano merged commit 536056b into elastic:8.15 Jul 15, 2024
@ebadyano
Copy link
Contributor Author

@gbanasiak I am blanking out a bit, I thought {# non-serverless-index-settings-marker-start #}{ was supposed to do something about the settings we dont want in serverless..but dont recall the details

@gbanasiak
Copy link
Contributor

The thing is we allow the restricted settings in track-custom-shared-settings.json when executed as operator user but only if explicitly asked for (include_non_serverless_index_settings):

{# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
{% if p_include_non_serverless_index_settings %}
"number_of_shards": "{{ number_of_shards | default(1) }}",
"number_of_replicas": "{{ number_of_replicas | default(1) }}"{%- if refresh_interval -%},{%- endif -%}
{% endif %}
{%- endif -%}{# non-serverless-index-settings-marker-end #}

But auditbeat and logs-k8-application have slipped through it seems, and will have number_of_shards configured when run as operator, regardless of the defaults applied by the platform. We should address that in a separate PR I think.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of some other PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments