Skip to content

Commit

Permalink
Cherrypick doc changes (#3487 and #3483) into 5.2 (#3504)
Browse files Browse the repository at this point in the history
* Add heartbeat to list of beats in platform ref

* Add SSL flags to import_dashboards CLI help
  • Loading branch information
dedemorton authored and ruflin committed Jan 31, 2017
1 parent 253c3c1 commit 537ae25
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions libbeat/docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ include::./version.asciidoc[]
:metricbeat: http://www.elastic.co/guide/en/beats/metricbeat/{doc-branch}
:filebeat: http://www.elastic.co/guide/en/beats/filebeat/{doc-branch}
:winlogbeat: http://www.elastic.co/guide/en/beats/winlogbeat/{doc-branch}
:heartbeat: http://www.elastic.co/guide/en/beats/heartbeat/{doc-branch}
:securitydoc: https://www.elastic.co/guide/en/x-pack/5.2
:security: X-Pack Security
:ES-version: {stack-version}
Expand Down
1 change: 1 addition & 0 deletions libbeat/docs/installing-beats.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ Each Beat is a separately installable product. To get up and running quickly wit
* {metricbeat}/metricbeat-getting-started.html[Metricbeat]
* {filebeat}/filebeat-getting-started.html[Filebeat]
* {winlogbeat}/winlogbeat-getting-started.html[Winlogbeat]
* {heartbeat}/heartbeat-getting-started.html[Heartbeat]


13 changes: 13 additions & 0 deletions libbeat/docs/newdashboards.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@ The Beat name. The Beat name is required when importing from a zip archive. When
the Beat. When running the script from source, the default value is "", so you need to set this option in order to install the index pattern and
the dashboards for a single Beat. Otherwise the script imports the index pattern and the dashboards for all Beats.

*`-cacert <certificate_authority>`*::
The Certificate Authority to use for server verification.

*`-cert <client_certificate>`*::
The certificate to use for SSL client authentication. The certificate must be in
PEM format.

*`-dir <local_dir>`*::
Local directory that contains the subdirectories: dashboard, visualization, search, and index-pattern. The default value is the current directory.

Expand All @@ -164,9 +171,15 @@ Local zip archive with the dashboards. The archive can contain Kibana dashboards
You should only use this option if you want to change the index pattern name that's used by default. For example, if the
default is `metricbeat-*`, you can change it to `custombeat-*`.

*`-insecure`*::
If specified, "insecure" SSL connections are allowed.

*`-k <kibana_index>`*::
The Elasticsearch index pattern where Kibana saves its configuration. The default value is `.kibana`.

*`-key <client_key>`*::
The client certificate key. The key must be in PEM format.

*`-only-dashboards`*::
If specified, then only the dashboards, along with their visualizations and searches, are imported. The index pattern is
not imported. By default, this is false.
Expand Down

0 comments on commit 537ae25

Please sign in to comment.