Merge remote-tracking branch 'upstream/master' into feature/ci-pipeli…

…ne-2.0

* upstream/master:
  Add Cloud Foundry dashboards for metricbeat (elastic#21124)
  [Metricbeat][Kibana] Apply backoff when errored at getting usage stats (elastic#20772)
  Update input-log.asciidoc (elastic#20965) (elastic#21153)
  Remove redirects page (elastic#19574)
  [Ingest Manager] Fixed input types for filebeat (elastic#21131)
  docs: add beat specific install widget (elastic#21050)
  docs: link to APM privs for API keys (elastic#20911)
  Fix index out of range error when getting AWS account name (elastic#21101)
  Agent info docs and ci test pr (elastic#19805)
  Handling missing counters in application_pool metricset  (elastic#21071)

CHANGELOG.next.asciidoc

@@ -339,9 +339,12 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix SQL module mapping NULL values as string {pull}18955[18955] {issue}18898[18898
 - Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680]
 - Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736]
+- The Kibana collector applies backoff when errored at getting usage stats {pull}20772[20772]
 - Update fields.yml in the azure module, missing metrics field. {pull}20918[20918]
 - The `elasticsearch/index` metricset only requests wildcard expansion for hidden indices if the monitored Elasticsearch cluster supports it. {pull}20938[20938]
 - Disable Kafka metricsets based on Jolokia by default. They require a different configuration. {pull}20989[20989]
+- Fix panic index out of range error when getting AWS account name. {pull}21101[21101] {issue}21095[21095]
+- Handle missing counters in the application_pool metricset. {pull}21071[21071]
 
 *Packetbeat*
 
@@ -698,6 +701,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add billing metricset into googlecloud module. {pull}20812[20812] {issue}20738[20738]
 - Move `compute_vm_scaleset` to light metricset. {pull}21038[21038] {issue}20985[20985]
 - Sanitize `event.host`. {pull}21022[21022]
+- Add overview and platform health dashboards to Cloud Foundry module. {pull}21124[21124]
 
 *Packetbeat*
 

README.md

@@ -50,6 +50,10 @@ on the [elastic.co site](https://www.elastic.co/guide/):
 * [Packetbeat](https://www.elastic.co/guide/en/beats/packetbeat/current/index.html)
 * [Winlogbeat](https://www.elastic.co/guide/en/beats/winlogbeat/current/index.html)
 
+## Documentation and Getting Started information for the Elastic Agent
+
+You can find the documentation and getting started guides for the Elastic Agent
+on the [elastic.co site](https://www.elastic.co/downloads/elastic-agent)
 
 ## Getting Help
 

auditbeat/docs/index.asciidoc

@@ -53,4 +53,4 @@ include::./faq.asciidoc[]
 
 include::{libbeat-dir}/contributing-to-beats.asciidoc[]
 
-include::{libbeat-dir}/shared/redirects.asciidoc[]
+

filebeat/docs/index.asciidoc

@@ -64,4 +64,4 @@ include::./faq.asciidoc[]
 
 include::{libbeat-dir}/contributing-to-beats.asciidoc[]
 
-include::{libbeat-dir}/shared/redirects.asciidoc[]
+

filebeat/docs/inputs/input-log.asciidoc

@@ -73,7 +73,7 @@ of the file. To solve this problem you can configure `file_identity` option. Pos
 values besides the default `inode_deviceid` are `path` and `inode_marker`.
 
 Selecting `path` instructs {beatname_uc} to identify files based on their
-paths. This is a quick way to aviod rereading files if inode and device ids
+paths. This is a quick way to avoid rereading files if inode and device ids
 might change. However, keep in mind if the files are rotated (renamed), they
 will be reread and resubmitted.
 

heartbeat/docs/index.asciidoc

@@ -51,4 +51,4 @@ include::./faq.asciidoc[]
 
 include::{libbeat-dir}/contributing-to-beats.asciidoc[]
 
-include::{libbeat-dir}/shared/redirects.asciidoc[]
+

journalbeat/docs/index.asciidoc

@@ -44,4 +44,4 @@ include::./troubleshooting.asciidoc[]
 
 include::./faq.asciidoc[]
 
-include::{libbeat-dir}/shared/redirects.asciidoc[]
+

libbeat/docs/command-reference.asciidoc

@@ -156,18 +156,7 @@ Create an API Key with the specified privilege(s). No required flags.
 +
 The user requesting to create an API Key needs to have APM privileges used by the APM Server.
 A superuser, by default, has these privileges. For other users,
-you can create them. Create a role that is then assigned to the user:
-+
-["source","sh",subs="attributes"]
-----
-PUT /_security/role/apm-privileges {
-	"applications": [{
-	  "application": "apm",
-	  "privileges": ["sourcemap:write", "event:write", "config_agent:read"],
-	  "resources": ["*"]
-	}]
-}
-----
+you can create them. See <<privileges-api-key,create an API key user>> for required privileges.
 
 *`info`*::
 Query API Key(s). `--id` or `--name` required.
@@ -252,7 +241,7 @@ the credentials required by your cloud service provider.
 ----
 
 *`FUNCTION_NAME`*::
-Specifies the name of the function to deploy.  
+Specifies the name of the function to deploy.
 
 *FLAGS*
 
@@ -498,7 +487,7 @@ ifeval::["{beatname_lc}"=="functionbeat"]
 [[package-command]]
 ==== `package` command
 
-{package-command-short-desc}. 
+{package-command-short-desc}.
 
 *SYNOPSIS*
 
@@ -513,7 +502,7 @@ ifeval::["{beatname_lc}"=="functionbeat"]
 Shows help for the `package` command.
 
 *`-o, --output`*::
-Specifies the full path pattern to use when creating the packages. 
+Specifies the full path pattern to use when creating the packages.
 
 {global-flags}
 
@@ -538,7 +527,7 @@ the credentials required by your cloud service provider.
 ----
 
 *`FUNCTION_NAME`*::
-Specifies the name of the function to remove.  
+Specifies the name of the function to remove.
 
 *FLAGS*
 
@@ -941,7 +930,7 @@ the credentials required by your cloud service provider.
 ----
 
 *`FUNCTION_NAME`*::
-Specifies the name of the function to update.  
+Specifies the name of the function to update.
 
 *FLAGS*
 

libbeat/docs/tab-widgets/install-widget-filebeat.asciidoc

@@ -0,0 +1,114 @@
+:beatname_uc: Filebeat
+:beatname_lc: filebeat
+++++
+<div class="tabs" data-tab-group="os">
+  <div role="tablist" aria-label="Install-f">
+    <button role="tab"
+            aria-selected="true"
+            aria-controls="deb-tab-install-filebeat"
+            id="deb-install-filebeat">
+      DEB
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="rpm-tab-install-filebeat"
+            id="rpm-install-filebeat"
+            tabindex="-1">
+      RPM
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="mac-tab-install-filebeat"
+            id="mac-install-filebeat"
+            tabindex="-1">
+      MacOS
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="brew-tab-install-filebeat"
+            id="brew-install-filebeat"
+            tabindex="-1">
+      Brew
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="linux-tab-install-filebeat"
+            id="linux-install-filebeat"
+            tabindex="-1">
+      Linux
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="win-tab-install-filebeat"
+            id="win-install-filebeat"
+            tabindex="-1">
+      Windows
+    </button>
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="deb-tab-install-filebeat"
+       aria-labelledby="deb-install-filebeat">
+++++
+
+include::install.asciidoc[tag=deb]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="rpm-tab-install-filebeat"
+       aria-labelledby="rpm-install-filebeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=rpm]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="mac-tab-install-filebeat"
+       aria-labelledby="mac-install-filebeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=mac]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="brew-tab-install-filebeat"
+       aria-labelledby="brew-install-filebeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=brew]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="linux-tab-install-filebeat"
+       aria-labelledby="linux-install-filebeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=linux]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="win-tab-install-filebeat"
+       aria-labelledby="win-install-filebeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=win]
+
+++++
+  </div>
+</div>
+++++

libbeat/docs/tab-widgets/install-widget-heartbeat.asciidoc

@@ -0,0 +1,114 @@
+:beatname_uc: Heartbeat
+:beatname_lc: heartbeat
+++++
+<div class="tabs" data-tab-group="os">
+  <div role="tablist" aria-label="Install-h">
+    <button role="tab"
+            aria-selected="true"
+            aria-controls="deb-tab-install-heartbeat"
+            id="deb-install-heartbeat">
+      DEB
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="rpm-tab-install-heartbeat"
+            id="rpm-install-heartbeat"
+            tabindex="-1">
+      RPM
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="mac-tab-install-heartbeat"
+            id="mac-install-heartbeat"
+            tabindex="-1">
+      MacOS
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="brew-tab-install-heartbeat"
+            id="brew-install-heartbeat"
+            tabindex="-1">
+      Brew
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="linux-tab-install-heartbeat"
+            id="linux-install-heartbeat"
+            tabindex="-1">
+      Linux
+    </button>
+    <button role="tab"
+            aria-selected="false"
+            aria-controls="win-tab-install-heartbeat"
+            id="win-install-heartbeat"
+            tabindex="-1">
+      Windows
+    </button>
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="deb-tab-install-heartbeat"
+       aria-labelledby="deb-install-heartbeat">
+++++
+
+include::install.asciidoc[tag=deb]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="rpm-tab-install-heartbeat"
+       aria-labelledby="rpm-install-heartbeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=rpm]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="mac-tab-install-heartbeat"
+       aria-labelledby="mac-install-heartbeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=mac]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="brew-tab-install-heartbeat"
+       aria-labelledby="brew-install-heartbeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=brew]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="linux-tab-install-heartbeat"
+       aria-labelledby="linux-install-heartbeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=linux]
+
+++++
+  </div>
+  <div tabindex="0"
+       role="tabpanel"
+       id="win-tab-install-heartbeat"
+       aria-labelledby="win-install-heartbeat"
+       hidden="">
+++++
+
+include::install.asciidoc[tag=win]
+
+++++
+  </div>
+</div>
+++++