diff --git a/diagnostics/opensearch/filebeat/conf/filebeat-k8s.yml b/diagnostics/opensearch/filebeat/conf/filebeat-k8s.yml index 607479c..bc01777 100644 --- a/diagnostics/opensearch/filebeat/conf/filebeat-k8s.yml +++ b/diagnostics/opensearch/filebeat/conf/filebeat-k8s.yml @@ -43,15 +43,15 @@ setup.template.name: "filebeat-%{[agent.version]}" setup.template.pattern: "filebeat-%{[agent.version]}-*" output.elasticsearch: hosts: '${ELASTIC_HOST}' - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_NAME:}%{+yyyy.MM.dd}" + index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_SUFFIX:}%{+yyyy.MM.dd}" indices: - index: "%{[datastream]}" when.not.equals: datastream: "unknown" - - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_NAME:}%{[tenant.name]}-%{[kubernetes.container.name]}-%{+yyyy.MM.dd}" + - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_SUFFIX:}%{[tenant.name]}-%{[kubernetes.container.name]}-%{+yyyy.MM.dd}" when.equals: serviceLevelIndex: "yes" - - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_NAME:}%{[tenant.name]}-%{+yyyy.MM.dd}" + - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_SUFFIX:}%{[tenant.name]}-%{+yyyy.MM.dd}" when.equals: tenantLevelIndex: "yes" bulk_max_size: '${BULK_MAX_SIZE:50}' diff --git a/diagnostics/opensearch/filebeat/conf/filebeat.yml b/diagnostics/opensearch/filebeat/conf/filebeat.yml index f88a4b7..293f5d9 100644 --- a/diagnostics/opensearch/filebeat/conf/filebeat.yml +++ b/diagnostics/opensearch/filebeat/conf/filebeat.yml @@ -30,15 +30,15 @@ setup.template.name: "filebeat-%{[agent.version]}" setup.template.pattern: "filebeat-%{[agent.version]}-*" output.elasticsearch: hosts: '${ELASTIC_HOST}' - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_NAME:}%{+yyyy.MM.dd}" + index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_SUFFIX:}%{+yyyy.MM.dd}" indices: - index: "%{[datastream]}" when.not.equals: datastream: "unknown" - - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_NAME:}%{[tenant.name]}-%{[docker.attrs.ROLE_NAME]}-%{+yyyy.MM.dd}" + - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_SUFFIX:}%{[tenant.name]}-%{[docker.attrs.ROLE_NAME]}-%{+yyyy.MM.dd}" when.equals: serviceLevelIndex: "yes" - - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_NAME:}%{[tenant.name]}-%{+yyyy.MM.dd}" + - index: "filebeat-%{[agent.version]}-${CUSTOM_INDEX_SUFFIX:}%{[tenant.name]}-%{+yyyy.MM.dd}" when.equals: tenantLevelIndex: "yes" bulk_max_size: '${BULK_MAX_SIZE:50}'