Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Elasticsearch module examples to show http in the URL #8226

Merged
merged 1 commit into from
Sep 11, 2018
Merged

Update Elasticsearch module examples to show http in the URL #8226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions libbeat/docs/shared-kibana-config.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Here is an example configuration:

[source,yaml]
----
setup.kibana.host: "localhost:5601"
setup.kibana.host: "http://localhost:5601"
----

[float]
Expand Down Expand Up @@ -71,7 +71,7 @@ Example config:
[source,yaml]
----
setup.kibana.host: "192.0.2.255:5601"
setup.kibana.protocol: "https"
setup.kibana.protocol: "http"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change wasn't really necessary, but I figured it might be better to show this variation (when protocol is specified) with http.

setup.kibana.path: /kibana
----

Expand Down Expand Up @@ -109,8 +109,7 @@ Example configuration:

[source,yaml]
----
setup.kibana.host: "192.0.2.255:5601"
setup.kibana.protocol: "https"
setup.kibana.host: "https://192.0.2.255:5601"
setup.kibana.ssl.enabled: true
setup.kibana.ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
setup.kibana.ssl.certificate: "/etc/pki/client/cert.pem"
Expand Down
5 changes: 2 additions & 3 deletions libbeat/docs/shared-ssl-config.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Example output config with SSL enabled:

[source,yaml]
----
output.elasticsearch.hosts: ["192.168.1.42:9200"]
output.elasticsearch.hosts: ["https://192.168.1.42:9200"]
output.elasticsearch.ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
output.elasticsearch.ssl.certificate: "/etc/pki/client/cert.pem"
output.elasticsearch.ssl.key: "/etc/pki/client/cert.key"
Expand All @@ -27,8 +27,7 @@ Example Kibana endpoint config with SSL enabled:

[source,yaml]
----
setup.kibana.host: "192.0.2.255:5601"
setup.kibana.protocol: "https"
setup.kibana.host: "https://192.0.2.255:5601"
setup.kibana.ssl.enabled: true
setup.kibana.ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
setup.kibana.ssl.certificate: "/etc/pki/client/cert.pem"
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/elasticsearch.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ metricbeat.modules:
#- shard
#- ml_job
period: 10s
hosts: ["localhost:9200"]
hosts: ["http://localhost:9200"]

# Set to false to fetch all entries
#index_recovery.active_only: true
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/metricbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ metricbeat.modules:
#- shard
#- ml_job
period: 10s
hosts: ["localhost:9200"]
hosts: ["http://localhost:9200"]

# Set to false to fetch all entries
#index_recovery.active_only: true
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/_meta/config.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#- shard
#- ml_job
period: 10s
hosts: ["localhost:9200"]
hosts: ["http://localhost:9200"]

# Set to false to fetch all entries
#index_recovery.active_only: true
2 changes: 1 addition & 1 deletion metricbeat/module/elasticsearch/_meta/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# - node
# - node_stats
period: 10s
hosts: ["localhost:9200"]
hosts: ["http://localhost:9200"]
#username: "user"
#password: "secret"
2 changes: 1 addition & 1 deletion metricbeat/modules.d/elasticsearch.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
# - node
# - node_stats
period: 10s
hosts: ["localhost:9200"]
hosts: ["http://localhost:9200"]
#username: "user"
#password: "secret"