From 0806da4d8e2620000b744fe5767b8e27c98e62b8 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Sat, 8 Dec 2018 17:03:44 +0100 Subject: [PATCH] Cherry-pick #8898, #9063 and #9223 to 6.x: Build docker images when building packages (#9433) Include generation of docker images in the process of building the rest of released packages by extending `mage package`. (#8898) (cherry picked from commit 9294384563a3f7ecd1ba9b532948279f0b528952) Tag container images with snapshot information (#9063) (cherry picked from commit 1dd4fbf559e515c9141c1cb0308742a9efb10cf3) * Compress docker artifacts with gzip (#9223) (cherry picked from commit 675f2b000b067ad9fb2ee2fbe2bb3d98ecfab30c) Co-authored-by: Gil Raphaelli --- _meta/beat.docker.yml | 4 ++++ journalbeat.docker.yml | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 _meta/beat.docker.yml create mode 100644 journalbeat.docker.yml diff --git a/_meta/beat.docker.yml b/_meta/beat.docker.yml new file mode 100644 index 000000000000..2c87c0346b69 --- /dev/null +++ b/_meta/beat.docker.yml @@ -0,0 +1,4 @@ +journalbeat.inputs: +- paths: [] + seek: tail + diff --git a/journalbeat.docker.yml b/journalbeat.docker.yml new file mode 100644 index 000000000000..aa709469a724 --- /dev/null +++ b/journalbeat.docker.yml @@ -0,0 +1,11 @@ +journalbeat.inputs: +- paths: [] + seek: tail + +processors: +- add_cloud_metadata: ~ + +output.elasticsearch: + hosts: '${ELASTICSEARCH_HOSTS:elasticsearch:9200}' + username: '${ELASTICSEARCH_USERNAME:}' + password: '${ELASTICSEARCH_PASSWORD:}'