From 627d307a330f4997eeb5704cf1766ffb50aa3831 Mon Sep 17 00:00:00 2001 From: Alex K <8418476+fearful-symmetry@users.noreply.github.com> Date: Mon, 25 Jan 2021 07:30:59 -0800 Subject: [PATCH] [Elastic Log Driver] Change hosts config flag (#23628) * change hosts config flag * add changelog now (cherry picked from commit 72880cabdc237e06e21365f276ff0ffe9decbb45) --- CHANGELOG.next.asciidoc | 3 +++ x-pack/dockerlogbeat/docs/configuration.asciidoc | 2 +- x-pack/dockerlogbeat/docs/install.asciidoc | 4 ++-- x-pack/dockerlogbeat/docs/usage.asciidoc | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 2697a75edf8c..66ab3bbac809 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -316,6 +316,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Functionbeat* +*Elastic Logging Plugin* +- Fix out of date CLI flags on docs. {pull}23628[23628] + ==== Added diff --git a/x-pack/dockerlogbeat/docs/configuration.asciidoc b/x-pack/dockerlogbeat/docs/configuration.asciidoc index 7be2a1fe1f1c..e8d398b0b875 100644 --- a/x-pack/dockerlogbeat/docs/configuration.asciidoc +++ b/x-pack/dockerlogbeat/docs/configuration.asciidoc @@ -152,7 +152,7 @@ The local log also supports the `max-file`, `max-size` and `compress` options th ["source","sh",subs="attributes"] ---- docker run --log-driver=elastic/{log-driver-alias}:{version} \ - --log-opt endpoint="myhost:9200" \ + --log-opt hosts="myhost:9200" \ --log-opt user="myusername" \ --log-opt password="mypassword" \ --log-opt max-file=10 \ diff --git a/x-pack/dockerlogbeat/docs/install.asciidoc b/x-pack/dockerlogbeat/docs/install.asciidoc index ab36f67877d5..6aa51aba0b19 100644 --- a/x-pack/dockerlogbeat/docs/install.asciidoc +++ b/x-pack/dockerlogbeat/docs/install.asciidoc @@ -80,7 +80,7 @@ example: ["source","sh",subs="attributes"] ---- docker run --log-driver=elastic/{log-driver-alias}:{version} \ - --log-opt endpoint="https://myhost:9200" \ + --log-opt hosts="https://myhost:9200" \ --log-opt user="myusername" \ --log-opt password="mypassword" \ -it debian:jessie /bin/bash @@ -98,7 +98,7 @@ example: { "log-driver" : "elastic/{log-driver-alias}:{version}", "log-opts" : { - "endpoint" : "https://myhost:9200", + "hosts" : "https://myhost:9200", "user" : "myusername", "password" : "mypassword" } diff --git a/x-pack/dockerlogbeat/docs/usage.asciidoc b/x-pack/dockerlogbeat/docs/usage.asciidoc index bf23049c1999..446206e35449 100644 --- a/x-pack/dockerlogbeat/docs/usage.asciidoc +++ b/x-pack/dockerlogbeat/docs/usage.asciidoc @@ -16,7 +16,7 @@ The following examples show common configurations for the {log-driver}. ["source","sh",subs="attributes"] ---- docker run --log-driver=elastic/{log-driver-alias}:{version} \ - --log-opt endpoint="myhost:9200" \ + --log-opt hosts="myhost:9200" \ --log-opt user="myusername" \ --log-opt password="mypassword" \ -it debian:jessie /bin/bash @@ -29,7 +29,7 @@ docker run --log-driver=elastic/{log-driver-alias}:{version} \ { "log-driver" : "elastic/{log-driver-alias}:{version}", "log-opts" : { - "endpoint" : "myhost:9200", + "hosts" : "myhost:9200", "user" : "myusername", "password" : "mypassword", } @@ -71,7 +71,7 @@ docker run --log-driver=elastic/{log-driver-alias}:{version} \ ["source","sh",subs="attributes"] ---- docker run --log-driver=elastic/{log-driver-alias}:{version} \ - --log-opt endpoint="myhost:9200" \ + --log-opt hosts="myhost:9200" \ --log-opt user="myusername" \ --log-opt password="mypassword" \ --log-opt index="eld-%{[agent.version]}-%{+yyyy.MM.dd}" \ @@ -85,7 +85,7 @@ docker run --log-driver=elastic/{log-driver-alias}:{version} \ { "log-driver" : "elastic/{log-driver-alias}:{version}", "log-opts" : { - "endpoint" : "myhost:9200", + "hosts" : "myhost:9200", "user" : "myusername", "index" : "eld-%{[agent.version]}-%{+yyyy.MM.dd}", "password" : "mypassword",