From dff726cb2dc3ec0a73081e563531df169cf737e9 Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Wed, 13 Jul 2016 13:24:40 +0200 Subject: [PATCH] Added https user/pass to the default config (#2023) Since we removed the template stuff from the default config, we can add the user/pass instead so it's easy to enabled https. It also updates the sample user/pass used, to match the default in Shield, closing #1735. Depends on #1993. --- filebeat/filebeat.full.yml | 4 ++-- filebeat/filebeat.yml | 5 +++++ libbeat/_meta/config.full.yml | 4 ++-- libbeat/_meta/config.yml | 5 +++++ metricbeat/metricbeat.full.yml | 4 ++-- metricbeat/metricbeat.yml | 5 +++++ packetbeat/packetbeat.full.yml | 4 ++-- packetbeat/packetbeat.yml | 5 +++++ winlogbeat/winlogbeat.full.yml | 4 ++-- winlogbeat/winlogbeat.yml | 5 +++++ 10 files changed, 35 insertions(+), 10 deletions(-) diff --git a/filebeat/filebeat.full.yml b/filebeat/filebeat.full.yml index 23d8e13b160..d42962ee312 100644 --- a/filebeat/filebeat.full.yml +++ b/filebeat/filebeat.full.yml @@ -313,8 +313,8 @@ output.elasticsearch: # Optional protocol and basic auth credentials. #protocol: "https" - #username: "admin" - #password: "s3cr3t" + #username: "elastic" + #password: "changeme" # Dictionary of HTTP parameters to pass within the url with index operations. #parameters: diff --git a/filebeat/filebeat.yml b/filebeat/filebeat.yml index ae30266d53c..e98639b6b17 100644 --- a/filebeat/filebeat.yml +++ b/filebeat/filebeat.yml @@ -82,6 +82,11 @@ output.elasticsearch: # Array of hosts to connect to. hosts: ["localhost:9200"] + # Optional protocol and basic auth credentials. + #protocol: "https" + #username: "elastic" + #password: "changeme" + #----------------------------- Logstash output -------------------------------- #output.logstash: # The Logstash hosts diff --git a/libbeat/_meta/config.full.yml b/libbeat/_meta/config.full.yml index d23ec609937..ad86527122d 100644 --- a/libbeat/_meta/config.full.yml +++ b/libbeat/_meta/config.full.yml @@ -95,8 +95,8 @@ output.elasticsearch: # Optional protocol and basic auth credentials. #protocol: "https" - #username: "admin" - #password: "s3cr3t" + #username: "elastic" + #password: "changeme" # Dictionary of HTTP parameters to pass within the url with index operations. #parameters: diff --git a/libbeat/_meta/config.yml b/libbeat/_meta/config.yml index 2e6cdfe46e1..fe52afdf54f 100644 --- a/libbeat/_meta/config.yml +++ b/libbeat/_meta/config.yml @@ -24,6 +24,11 @@ output.elasticsearch: # Array of hosts to connect to. hosts: ["localhost:9200"] + # Optional protocol and basic auth credentials. + #protocol: "https" + #username: "elastic" + #password: "changeme" + #----------------------------- Logstash output -------------------------------- #output.logstash: # The Logstash hosts diff --git a/metricbeat/metricbeat.full.yml b/metricbeat/metricbeat.full.yml index 92ae0cd3cef..d64756c0e15 100644 --- a/metricbeat/metricbeat.full.yml +++ b/metricbeat/metricbeat.full.yml @@ -240,8 +240,8 @@ output.elasticsearch: # Optional protocol and basic auth credentials. #protocol: "https" - #username: "admin" - #password: "s3cr3t" + #username: "elastic" + #password: "changeme" # Dictionary of HTTP parameters to pass within the url with index operations. #parameters: diff --git a/metricbeat/metricbeat.yml b/metricbeat/metricbeat.yml index abf95938b34..e2fc374e0e9 100644 --- a/metricbeat/metricbeat.yml +++ b/metricbeat/metricbeat.yml @@ -70,6 +70,11 @@ output.elasticsearch: # Array of hosts to connect to. hosts: ["localhost:9200"] + # Optional protocol and basic auth credentials. + #protocol: "https" + #username: "elastic" + #password: "changeme" + #----------------------------- Logstash output -------------------------------- #output.logstash: # The Logstash hosts diff --git a/packetbeat/packetbeat.full.yml b/packetbeat/packetbeat.full.yml index bc39ec60991..11f65c1682c 100644 --- a/packetbeat/packetbeat.full.yml +++ b/packetbeat/packetbeat.full.yml @@ -479,8 +479,8 @@ output.elasticsearch: # Optional protocol and basic auth credentials. #protocol: "https" - #username: "admin" - #password: "s3cr3t" + #username: "elastic" + #password: "changeme" # Dictionary of HTTP parameters to pass within the url with index operations. #parameters: diff --git a/packetbeat/packetbeat.yml b/packetbeat/packetbeat.yml index cce91765bec..049903048f2 100644 --- a/packetbeat/packetbeat.yml +++ b/packetbeat/packetbeat.yml @@ -113,6 +113,11 @@ output.elasticsearch: # Array of hosts to connect to. hosts: ["localhost:9200"] + # Optional protocol and basic auth credentials. + #protocol: "https" + #username: "elastic" + #password: "changeme" + #----------------------------- Logstash output -------------------------------- #output.logstash: # The Logstash hosts diff --git a/winlogbeat/winlogbeat.full.yml b/winlogbeat/winlogbeat.full.yml index 651434ed0a4..91be97f0a74 100644 --- a/winlogbeat/winlogbeat.full.yml +++ b/winlogbeat/winlogbeat.full.yml @@ -130,8 +130,8 @@ output.elasticsearch: # Optional protocol and basic auth credentials. #protocol: "https" - #username: "admin" - #password: "s3cr3t" + #username: "elastic" + #password: "changeme" # Dictionary of HTTP parameters to pass within the url with index operations. #parameters: diff --git a/winlogbeat/winlogbeat.yml b/winlogbeat/winlogbeat.yml index 5ebf7c42935..f325e221d6e 100644 --- a/winlogbeat/winlogbeat.yml +++ b/winlogbeat/winlogbeat.yml @@ -48,6 +48,11 @@ output.elasticsearch: # Array of hosts to connect to. hosts: ["localhost:9200"] + # Optional protocol and basic auth credentials. + #protocol: "https" + #username: "elastic" + #password: "changeme" + #----------------------------- Logstash output -------------------------------- #output.logstash: # The Logstash hosts