diff --git a/.package-version b/.package-version index f138478cef4..e1fbaf798fa 100644 --- a/.package-version +++ b/.package-version @@ -1,8 +1,9 @@ { +<<<<<<< HEAD "version": "9.0.8-SNAPSHOT", - "build_id": "9.0.8-2b9f4fc8", - "manifest_url": "https://snapshots.elastic.co/9.0.8-2b9f4fc8/manifest-9.0.8-SNAPSHOT.json", - "summary_url": "https://snapshots.elastic.co/9.0.8-2b9f4fc8/summary-9.0.8-SNAPSHOT.html", + "build_id": "9.0.8-ae254220", + "manifest_url": "https://snapshots.elastic.co/9.0.8-ae254220/manifest-9.0.8-SNAPSHOT.json", + "summary_url": "https://snapshots.elastic.co/9.0.8-ae254220/summary-9.0.8-SNAPSHOT.html", "core_version": "9.0.8", - "stack_build_id": "9.0.8-2b9f4fc8-SNAPSHOT" + "stack_build_id": "9.0.8-ae254220-SNAPSHOT" } \ No newline at end of file diff --git a/testing/integration/k8s/testdata/journald-input.yml b/testing/integration/k8s/testdata/journald-input.yml new file mode 100644 index 00000000000..5dd1f3bfa90 --- /dev/null +++ b/testing/integration/k8s/testdata/journald-input.yml @@ -0,0 +1,23 @@ +outputs: + default: + type: elasticsearch + hosts: + - ${ES_HOST} + username: ${ELASTICSEARCH_USERNAME} + password: ${ELASTICSEARCH_PASSWORD} + +agent: + monitoring: + enabled: false + +inputs: + - id: journald + log_level: debug + type: journald + data_stream: + namespace: "${EA_POLICY_NAMESPACE}" + streams: + - id: journald-input-id + paths: + - "/opt/journald/" + merge: true diff --git a/testing/integration/k8s/testdata/journald-otel.yml b/testing/integration/k8s/testdata/journald-otel.yml new file mode 100644 index 00000000000..d965ae0a018 --- /dev/null +++ b/testing/integration/k8s/testdata/journald-otel.yml @@ -0,0 +1,36 @@ +receivers: + filebeatreceiver: + filebeat: + inputs: + - type: journald + id: journald-input + paths: + - /opt/journal/ + merge: true + + output: + otelconsumer: + logging: + level: debug + selectors: + - '*' + +processors: + resource: + attributes: + - key: data_stream.namespace + action: insert + value: "${EA_POLICY_NAMESPACE}" + +exporters: + elasticsearch: + endpoint: "${ES_HOST}" + api_key: "${ES_API_KEY_ENCODED}" + +service: + pipelines: + logs: + receivers: [filebeatreceiver] + processors: [resource] + exporters: + - elasticsearch