Skip to content

Commit

Permalink
Added https user/pass to the default config (#2023)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
tsg authored and ruflin committed Jul 13, 2016
1 parent 787f45b commit dff726c
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 10 deletions.
4 changes: 2 additions & 2 deletions filebeat/filebeat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions filebeat/filebeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions libbeat/_meta/config.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions libbeat/_meta/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/metricbeat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions metricbeat/metricbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packetbeat/packetbeat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions packetbeat/packetbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions winlogbeat/winlogbeat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions winlogbeat/winlogbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dff726c

Please sign in to comment.