Skip to content

Commit

Permalink
Clean up ingest management docs (elastic#1211) (elastic#1221)
Browse files Browse the repository at this point in the history
* Update forum link

* Remove todo and reviewer notes
  • Loading branch information
dedemorton authored Jun 26, 2020
1 parent d5d2dd9 commit 20473bf
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 18 deletions.
10 changes: 1 addition & 9 deletions docs/en/ingest-management/getting-started.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ into problems and need to modify your setup to get this feature running. Please
do not enable or use {ingest-management} in a production environment.
// end::experimental-warning[]

For feedback and questions, please contact us in the
https://ela.st/ingest-manager-feedback[discuss forum].

//TODO: Add link to limitations topic after it is merged.
For feedback and questions, please contact us in the {im-forum}[discuss forum].

[float]
[[ingest-manager-prereqs]]
Expand Down Expand Up @@ -147,11 +144,6 @@ image::images/kibana-ingest-manager-configurations-default-with-nginx.png[{inges

include::{beats-repo-dir}/x-pack/elastic-agent/docs/elastic-agent.asciidoc[tag=agent-install-intro]

//REVIEWERS: I know this section makes the docs longer, but it's easier for users
//Don't worry too much about the length because I have some code for a tabbed
//panel that I will use to display this content. I'll follow up later with a PR
//that adds this code.

include::{beats-repo-dir}/x-pack/elastic-agent/docs/install-elastic-agent.asciidoc[tag=install-elastic-agent]

To configure {agent}, you can use the {ingest-manager} app in {kib} (see
Expand Down
4 changes: 1 addition & 3 deletions docs/en/ingest-management/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
:doctype: book
:beats-repo-dir: {beats-root}
:im-forum: https://discuss.elastic.co/tags/c/elastic-stack/81/stack-ingest-management

= Ingest Management Guide

include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]

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

//TODO: remove this temporary override after review approval
:release-state: released

include::ingest-management-overview.asciidoc[leveloffset=+1]

include::ingest-management-limitations.asciidoc[leveloffset=+2]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ on
* No support for Kubernetes or Docker autodiscovery

Experimental releases are not officially supported, but we encourage you to
report issues in our https://ela.st/agent-discuss[discuss forum].
report issues in our {im-forum}[discuss forum].
2 changes: 0 additions & 2 deletions docs/en/ingest-management/ingest-management-overview.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ experimental[]
[[elastic-agent]]
== {agent}

//TODO: We use "makes it easier" too frequently in this topic. Clean it up.

{agent} is a single, unified way to add monitoring for logs, metrics, and
other types of data to each host. A single Agent makes it easier and faster
to deploy monitoring across your infrastructure. The Agent's single, unified
Expand Down
5 changes: 2 additions & 3 deletions docs/en/ingest-management/troubleshooting.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ following GitHub repositories:
* https://github.com/elastic/beats/issues[{beats}]
* https://github.com/elastic/package-registry/issues[{package-registry}]

Contact us in the https://ela.st/ingest-manager-feedback[discuss forum]. Your feedback is very
valuable to us.
Contact us in the {im-forum}[discuss forum]. Your feedback is very valuable to us.


**Common problems:**
Expand Down Expand Up @@ -118,7 +117,7 @@ To find more about the error, open your browser's development console, navigate
to the **Network** tab, and refresh the page. One of the requests to the
{ingest-manager} API will most likely have returned an error. If the error
message doesn't give you enough information to fix the problem, please contact
us in the https://ela.st/ingest-manager-feedback[discuss forum].
us in the {im-forum}[discuss forum].

[float]
[[agent-enrollment-timeout]]
Expand Down

0 comments on commit 20473bf

Please sign in to comment.