Skip to content

Commit

Permalink
[DOCS] Draft changes for X-Pack content inclusion
Browse files Browse the repository at this point in the history
  • Loading branch information
lcawl committed Jan 8, 2018
1 parent 748f2e6 commit 96555a6
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 10 deletions.
5 changes: 2 additions & 3 deletions libbeat/docs/https.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ output.elasticsearch:

Elasticsearch doesn't have built-in basic authentication, but you can achieve it
either by using a web proxy or by using X-Pack to secure Elasticsearch. For more
information, see the X-Pack documentation about
{securitydoc}/xpack-security.html[securing Elasticsearch], including the topic
about {securitydoc}/beats.html[Beats and security].
information, see the X-Pack documentation about
{securitydoc}/xpack-security.html[securing Elasticsearch].

{beatname_uc} verifies the validity of the server certificates and only accepts trusted
certificates. Creating a correct SSL/TLS infrastructure is outside the scope of
Expand Down
15 changes: 8 additions & 7 deletions libbeat/docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
:stack-version: 7.0.0-alpha1
:doc-branch: master
:go-version: 1.9.2
:release-state: unreleased
:python: 2.7.9
:docker: 1.12
:docker-compose: 1.11
:stack-version: 7.0.0-alpha1
:doc-branch: master
:go-version: 1.9.2
:release-state: unreleased
:python: 2.7.9
:docker: 1.12
:docker-compose: 1.11
:branch: master
42 changes: 42 additions & 0 deletions packetbeat/docs/index-shared1.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

include::../../libbeat/docs/version.asciidoc[]

include::{asciidoc-dir}/../../shared/attributes.asciidoc[]

:libbeat: http://www.elastic.co/guide/en/beats/libbeat/{doc-branch}
:kibana-ref: https://www.elastic.co/guide/en/kibana/{doc-branch}
:beatsdevguide: http://www.elastic.co/guide/en/beats/devguide/{doc-branch}
:packetbeat: http://www.elastic.co/guide/en/beats/packetbeat/{doc-branch}
: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}
:logstashdoc: https://www.elastic.co/guide/en/logstash/{doc-branch}
:elasticsearch: https://www.elastic.co/guide/en/elasticsearch/reference/{doc-branch}
:securitydoc: https://www.elastic.co/guide/en/x-pack/{doc-branch}
:kibanadoc: https://www.elastic.co/guide/en/kibana/{doc-branch}
:plugindoc: https://www.elastic.co/guide/en/elasticsearch/plugins/{doc-branch}
:version: {stack-version}
:beatname_lc: packetbeat
:beatname_uc: Packetbeat
:beatname_pkg: {beatname_lc}
:security: X-Pack Security
:dockerimage: docker.elastic.co/beats/{beatname_lc}:{version}
:dockergithub: https://github.com/elastic/beats-docker/tree/{doc-branch}

include::overview.asciidoc[]

include::../../libbeat/docs/contributing-to-beats.asciidoc[]

include::gettingstarted.asciidoc[]

include::../../libbeat/docs/repositories.asciidoc[]

include::setting-up-running.asciidoc[]

include::upgrading.asciidoc[]

include::configuring-howto.asciidoc[]

include::fields.asciidoc[]

include::securing-packetbeat.asciidoc[]
8 changes: 8 additions & 0 deletions packetbeat/docs/index-shared2.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

include::visualizing-data-packetbeat.asciidoc[]

include::filtering.asciidoc[]

include::troubleshooting.asciidoc[]

include::faq.asciidoc[]

0 comments on commit 96555a6

Please sign in to comment.