Skip to content

elastic/logs: use the common custom settings component template for K8s application logs #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inqueue merged 2 commits into from
Mar 11, 2025
Merged

elastic/logs: use the common custom settings component template for K8s application logs #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c09c362
clean up jinja and improve readability
inqueue Mar 11, 2025
1432a76
Reference component template track-custom-shared-settings and remove …
inqueue Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions elastic/logs/templates/component/track-custom-shared-settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) %}
{% set p_include_non_serverless_index_settings = (include_non_serverless_index_settings | default(build_flavor != "serverless")) -%}
{
"template": {
"settings": {
"index": {
{# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
{% if p_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 #}
{% if refresh_interval -%}
"refresh_interval": "{{ refresh_interval }}"
"number_of_replicas": "{{ number_of_replicas | default(1) }}"
{%- if refresh_interval -%},
"refresh_interval": {{ refresh_interval | tojson }}
{%- endif %}
{%- endif %}
{%- endif %}
{#- non-serverless-index-settings-marker-end #}
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions elastic/logs/templates/composable/logs-k8-application.log.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,26 @@
"limit": "10000"
}
},
{# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
"number_of_routing_shards": "30",
"number_of_shards": "{{ number_of_shards | default(1) }}",
"number_of_replicas": "{{ number_of_replicas | default(1) }}",
{%- endif -%}{# non-serverless-index-settings-marker-end #}
"query": {
"default_field": [
"message"
]
},
{%- if disable_pipelines is not true %}
"default_pipeline": "logs-k8-app",
}
{#- non-serverless-index-settings-marker-start #}
{%- if build_flavor != "serverless" or serverless_operator == true %},
"number_of_routing_shards": "30"
{%- endif %}
{#- non-serverless-index-settings-marker-end #}
{%- if disable_pipelines is not true %},
"default_pipeline": "logs-k8-app"
{%- endif %}
{% if route_on_sort_fields | default(false) is true %}
{%- if route_on_sort_fields | default(false) is true %},
"sort": {
"field": [ "host.name", "event.code", "log.file.path", "@timestamp" ],
"order": [ "asc", "asc", "asc", "desc" ]
},
"logsdb.route_on_sort_fields": true,
"logsdb.route_on_sort_fields": true
{% endif %}
"refresh_interval": "5s"
}
},
"mappings": {
Expand Down Expand Up @@ -2005,6 +2004,7 @@
},
"composed_of": [
"logs-mappings",
"track-custom-shared-settings",
"track-custom-mappings",
"track-data-stream-lifecycle",
"track-shared-logsdb-mode"
Expand Down
Loading