From ebe537383f36e044ccf449dc334291fa6e80bd6b Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Wed, 24 Jun 2020 13:34:04 +0200 Subject: [PATCH] [Ingest Manager] Rename input.type logs to logfile (#19360) [Ingest Manager] Rename input.type logs to logfile (#19360) --- .../docs/elastic-agent_configuration_example.yml | 2 +- x-pack/elastic-agent/pkg/agent/program/supported.go | 2 +- .../pkg/agent/program/testdata/constraints_config.yml | 2 +- .../pkg/agent/program/testdata/single_config.yml | 4 ++-- x-pack/elastic-agent/spec/filebeat.yml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml b/x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml index 4c30013562a..47a22e9d1b4 100644 --- a/x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml +++ b/x-pack/elastic-agent/docs/elastic-agent_configuration_example.yml @@ -35,7 +35,7 @@ settings.monitoring: #logging.level: trace inputs: - - type: logs + - type: logfile name: epm/nginx version: 1.7.0 dataset.namespace: prod diff --git a/x-pack/elastic-agent/pkg/agent/program/supported.go b/x-pack/elastic-agent/pkg/agent/program/supported.go index c581283e150..32e3d83334c 100644 --- a/x-pack/elastic-agent/pkg/agent/program/supported.go +++ b/x-pack/elastic-agent/pkg/agent/program/supported.go @@ -20,7 +20,7 @@ func init() { // spec/endpoint.yml // spec/filebeat.yml // spec/metricbeat.yml - unpacked := packer.MustUnpack("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") + unpacked := packer.MustUnpack("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") SupportedMap = make(map[string]bool) for f, v := range unpacked { diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/constraints_config.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/constraints_config.yml index b445fb80e16..999888895b5 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/constraints_config.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/constraints_config.yml @@ -16,7 +16,7 @@ outputs: ca_sha256: "7lHLiyp4J8m9kw38SJ7SURJP4bXRZv/BNxyyXkCcE/M=" inputs: - - type: logs + - type: logfile streams: - paths: - /var/log/hello1.log diff --git a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config.yml b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config.yml index 493a6a99dd0..02f88fd9f17 100644 --- a/x-pack/elastic-agent/pkg/agent/program/testdata/single_config.yml +++ b/x-pack/elastic-agent/pkg/agent/program/testdata/single_config.yml @@ -35,7 +35,7 @@ inputs: dataset: name: "" hosts: ["http://127.0.0.1:8080"] -- type: logs +- type: logfile use_output: default streams: - paths: @@ -43,7 +43,7 @@ inputs: - /var/log/hello2.log vars: var: value -- type: logs +- type: logfile dataset: type: testtype use_output: default diff --git a/x-pack/elastic-agent/spec/filebeat.yml b/x-pack/elastic-agent/spec/filebeat.yml index 02178ccbb66..20305373674 100644 --- a/x-pack/elastic-agent/spec/filebeat.yml +++ b/x-pack/elastic-agent/spec/filebeat.yml @@ -38,6 +38,7 @@ rules: path: type mapper: logs: log + logfile: log event/file: log event/stdin: stdin event/tcp: tcp