Merge pull request DataDog#6715 from DataDog/cswatt/container-logs

[DOCS-406] add openshift to container logs and note on container logs to agent page

Author: Pierre Guceski

content/en/account_management/billing/_index.md

@@ -61,6 +61,7 @@ You can set specific email addresses to receive invoices on the [Plan][10] page
  {{< nextlink href="account_management/billing/vsphere/" >}}vSphere integration{{< /nextlink >}}
 {{< /whatsnext >}}
 
+
 [1]: https://app.datadoghq.com/account/usage/hourly
 [2]: /infrastructure
 [3]: /agent
@@ -71,4 +72,3 @@ You can set specific email addresses to receive invoices on the [Plan][10] page
 [8]: https://app.datadoghq.com/account/billing_history
 [9]: mailto:billing@datadoghq.com
 [10]: https://app.datadoghq.com/account/billing
-

content/en/account_management/billing/custom_metrics.md

@@ -160,24 +160,24 @@ These allocations are counted across your entire infrastructure. For example, if
 
 {{< img src="account_management/billing/custom_metrics/host_custom_metrics.png" alt="host_custom_metrics" >}}
 
-The billable number of custom metrics is based on the average number of custom metrics (from all paid hosts) per hour over a given month. Contact [Sales][8] or your [Customer Success][26] Manager to discuss custom metrics for your account or to purchase an additional custom metrics package.
+The billable number of custom metrics is based on the average number of custom metrics (from all paid hosts) per hour over a given month. Contact [Sales][8] or your [Customer Success][9] Manager to discuss custom metrics for your account or to purchase an additional custom metrics package.
 
 ## Standard integrations
 
 The following standard integrations can potentially emit custom metrics.
 
 | Type of integrations | Integrations |
 |------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------|
-| Limited to 350 custom metrics by default. | [ActiveMQ XML][9] / [Go-Expvar][10] / [Java-JMX][11] |
-| No default limit on custom metrics collection. | [Directory][12] /[Linux Proc Extras][13] /[Nagios][14] /[PDH Check][15] /[Prometheus][16] /[SNMP][17] /[Windows Services][18] /[WMI][19] |
-| Can be configured to collect custom metrics. | [MySQL][20] /[Oracle][21] /[Postgres][22] /[SQL Server][23] |
-| Custom metrics sent from cloud integrations | [AWS][24] |
+| Limited to 350 custom metrics by default. | [ActiveMQ XML][10] / [Go-Expvar][11] / [Java-JMX][12] |
+| No default limit on custom metrics collection. | [Directory][13] /[Linux Proc Extras][14] /[Nagios][15] /[PDH Check][16] /[Prometheus][17] /[SNMP][18] /[Windows Services][19] /[WMI][20] |
+| Can be configured to collect custom metrics. | [MySQL][21] /[Oracle][22] /[Postgres][23] /[SQL Server][24] |
+| Custom metrics sent from cloud integrations | [AWS][25] |
 
 ## Troubleshooting
 
-For technical questions, contact [Datadog support][25].
+For technical questions, contact [Datadog support][26].
 
-For billing questions, contact your [Customer Success][26] Manager.
+For billing questions, contact your [Customer Success][9] Manager.
 
 [1]: /integrations
 [2]: /developers/metrics/custom_metrics
@@ -187,21 +187,21 @@ For billing questions, contact your [Customer Success][26] Manager.
 [6]: /account_management/billing/usage_details
 [7]: https://app.datadoghq.com/metric/summary
 [8]: mailto:sales@datadoghq.com
-[9]: /integrations/activemq/#activemq-xml-integration
-[10]: /integrations/go_expvar
-[11]: /integrations/java/
-[12]: /integrations/directory
-[13]: /integrations/linux_proc_extras
-[14]: /integrations/nagios
-[15]: /integrations/pdh_check
-[16]: /integrations/prometheus
-[17]: /integrations/snmp
-[18]: /integrations/windows_service
-[19]: /integrations/wmi_check
-[20]: /integrations/mysql
-[21]: /integrations/oracle
-[22]: /integrations/postgres
-[23]: /integrations/sqlserver
-[24]: /integrations/amazon_web_services
-[25]: /help
-[26]: mailto:success@datadoghq.com
+[9]: mailto:success@datadoghq.com
+[10]: /integrations/activemq/#activemq-xml-integration
+[11]: /integrations/go_expvar
+[12]: /integrations/java/
+[13]: /integrations/directory
+[14]: /integrations/linux_proc_extras
+[15]: /integrations/nagios
+[16]: /integrations/pdh_check
+[17]: /integrations/prometheus
+[18]: /integrations/snmp
+[19]: /integrations/windows_service
+[20]: /integrations/wmi_check
+[21]: /integrations/mysql
+[22]: /integrations/oracle
+[23]: /integrations/postgres
+[24]: /integrations/sqlserver
+[25]: /integrations/amazon_web_services
+[26]: /help

content/en/agent/basic_agent_usage/windows.md

@@ -76,16 +76,15 @@ Each configuration item is added as a property to the command line. The followin
 | `PROXY_PORT` | Number | If using a proxy, sets your proxy port. [Learn more about using a proxy with the Datadog Agent][7]. |
 | `PROXY_USER` | String | If using a proxy, sets your proxy user. [Learn more about using a proxy with the Datadog Agent][7]. |
 | `PROXY_PASSWORD` | String | If using a proxy, sets your proxy password. For the process/container Agent, this variable is required for passing in an authentication password and cannot be renamed. [Learn more about using a proxy with the Datadog Agent][7]. |
-| `DDAGENTUSER_NAME` | String | Override the default `ddagentuser` username used during Agent installation _(v6.11.0+)_. [Learn more about the Datadog Windows Agent User][3]. |
-| `DDAGENTUSER_PASSWORD` | String | Override the cryptographically secure password generated for the `ddagentuser` user during Agent installation _(v6.11.0+)_. Must be provided for installs on domain servers. [Learn more about the Datadog Windows Agent User][3]. |
+| `DDAGENTUSER_NAME` | String | Override the default `ddagentuser` username used during Agent installation _(v6.11.0+)_. [Learn more about the Datadog Windows Agent User][2]. |
+| `DDAGENTUSER_PASSWORD` | String | Override the cryptographically secure password generated for the `ddagentuser` user during Agent installation _(v6.11.0+)_. Must be provided for installs on domain servers. [Learn more about the Datadog Windows Agent User][2]. |
 | `APPLICATIONDATADIRECTORY` | Path | Override the directory to use for the configuration file directory tree. May only be provided on initial install; not valid for upgrades. Default: `C:\ProgramData\Datadog`. _(v6.11.0+)_ |
 | `PROJECTLOCATION` | Path | Override the directory to use for the binary file directory tree. May only be provided on initial install; not valid for upgrades. Default: `%PROGRAMFILES%\Datadog\Datadog Agent`. _(v6.11.0+)_ |
 
 **Note**: If a valid `datadog.yaml` is found and has an API key configured, that file takes precedence over all specified command line options.
 
 [1]: https://s3.amazonaws.com/ddagent-windows-stable/datadog-agent-7-latest.amd64.msi
-[2]: /agent/proxy
-[3]: /agent/faq/windows-agent-ddagent-user
+[2]: /agent/faq/windows-agent-ddagent-user
 {{% /tab %}}
 {{% tab "Upgrading" %}}
 

content/en/agent/kubernetes/daemonset_setup.md

@@ -242,7 +242,7 @@ The Agent has then two ways to collect logs: from the Docker socket, and from th
 * Docker is not the runtime
 * More than 10 containers are used within each pod
 
-The Docker API is optimized to get logs from one container at a time. When there are many containers in the same pod, collecting logs through the Docker socket might be consuming much more resources than going through the files:
+The Docker API is optimized to get logs from one container at a time. When there are many containers in the same host, collecting logs through the Docker socket might be consuming much more resources and impact your running applications. Therefore, Datadog recommends the K8s file method.
 
 {{< tabs >}}
 {{% tab "K8s File" %}}

content/en/agent/logs/_index.md

@@ -46,9 +46,9 @@ To send logs with environment variables, configure the following:
 
 For more details about the compression perfomances and batching size, refer to the [HTTPS section][2].
 
+
 [1]: /agent/guide/agent-configuration-files
 [2]: /agent/logs/#send-logs-over-https
-
 {{% /tab %}}
 {{% tab "HTTP uncompressed" %}}
 
@@ -91,19 +91,17 @@ To collect logs for a given integration, uncomment the logs section in that inte
 Consult the <a href="/integrations/#cat-log-collection">list of supported integrations</a> that include out of the box log configurations.
 </div>
 
-See the setup instructions for [Kubernetes][2] or [Docker][3] if you are using a containerized infrastructure.
-
-If an integration does not support logs by default, use the custom log collection.
+If you're using Kubernetes, make sure to [enable log collection in your DaemonSet setup][2]. If you're using Docker, [enable log collection for the containerized Agent][3]. For more information about log collection fron containerized environments, refer to the [Countainer Log Collection][4] documentation. If an integration does not support logs by default, use the custom log collection.
 
 ## Custom log collection
 
 Datadog Agent v6 can collect logs and forward them to Datadog from files, the network (TCP or UDP), journald, and Windows channels:
 
-1. Create a new `<CUSTOM_LOG_SOURCE>.d/` folder in the `conf.d/` directory at the root of your [Agent's configuration directory][4].
+1. Create a new `<CUSTOM_LOG_SOURCE>.d/` folder in the `conf.d/` directory at the root of your [Agent's configuration directory][5].
 2. Create a new `conf.yaml` file in this new folder.
 3. Add a custom log collection configuration group with the parameters below.
-4. [Restart your Agent][5] to take into account this new configuration.
-5. Run the [Agent's status subcommand][6] and look for `<CUSTOM_LOG_SOURCE>` under the Checks section.
+4. [Restart your Agent][6] to take into account this new configuration.
+5. Run the [Agent's status subcommand][7] and look for `<CUSTOM_LOG_SOURCE>` under the Checks section.
 
 Below are examples of custom log collection setup:
 
@@ -209,12 +207,12 @@ List of all available parameters for log collection:
 | `port` | Yes | If `type` is **tcp** or **udp**, set the port for listening to logs. |
 | `path` | Yes | If `type` is **file** or **journald**, set the file path for gathering logs. |
 | `channel_path` | Yes | If `type` is **windows_event**, list the Windows event channels for collecting logs. |
-| `service` | Yes | The name of the service owning the log. If you instrumented your service with [Datadog APM][7], this must be the same service name. |
-| `source` | Yes | The attribute that defines which integration is sending the logs. If the logs do not come from an existing integration, then this field may include a custom source name. However, it is recommended that you match this value to the namespace of any related [custom metrics][8] you are collecting, for example: `myapp` from `myapp.request.count`. |
+| `service` | Yes | The name of the service owning the log. If you instrumented your service with [Datadog APM][8], this must be the same service name. |
+| `source` | Yes | The attribute that defines which integration is sending the logs. If the logs do not come from an existing integration, then this field may include a custom source name. However, it is recommended that you match this value to the namespace of any related [custom metrics][9] you are collecting, for example: `myapp` from `myapp.request.count`. |
 | `include_units` | No | If `type` is **journald**, list of the specific journald units to include. |
 | `exclude_units` | No | If `type` is **journald**, list of the specific journald units to exclude. |
 | `sourcecategory` | No | A multiple value attribute used to refine the source attribute, for example: `source:mongodb, sourcecategory:db_slow_logs`. |
-| `tags` | No | A list of tags added to each log collected ([learn more about tagging][9]). |
+| `tags` | No | A list of tags added to each log collected ([learn more about tagging][10]). |
 
 ## Send logs over HTTPS
 
@@ -268,8 +266,8 @@ When logs are sent through HTTPS, use the same [set of proxy settings][11] as th
 [1]: https://app.datadoghq.com/account/settings#agent
 [2]: /agent/kubernetes/daemonset_setup/#log-collection
 [3]: /agent/docker/log
-[4]: /agent/guide/agent-configuration-files
-[5]: /agent/guide/agent-commands/#start-stop-and-restart-the-agent
+[4]: /logs/log_collection/#container-log-collection
+[5]: /agent/guide/agent-configuration-files
 [6]: /agent/guide/agent-commands/#agent-status-and-information
 [7]: /tracing
 [8]: /developers/metrics/custom_metrics

content/en/api/logs_pipelines/logs_pipelines.md

@@ -7,16 +7,16 @@ external_redirect: /api/#logs-pipelines
 
 ## Logs Pipelines
 
-<mark>The Logs Pipelines endpoints are not supported in Datadog's client libraries. To request this functionality, contact [Datadog Support][1]. To set your pipeline permissions see the [Granting permissions within limited scopes][4] documentation.</mark>
+<mark>The Logs Pipelines endpoints are not supported in Datadog's client libraries. To request this functionality, contact [Datadog Support][1]. To set your pipeline permissions see the [Granting permissions within limited scopes][2] documentation.</mark>
 
 Pipelines and processors operate on incoming logs, parsing and transforming them into structured attributes for easier querying.
 
-* See the [Pipelines Configuration Page][2] for a list of the pipelines and processors currently configured in our UI.
-* For more information about Pipelines, see the [Pipeline documentation][3].
+* See the [Pipelines Configuration Page][3] for a list of the pipelines and processors currently configured in our UI.
+* For more information about Pipelines, see the [Pipeline documentation][4].
 
 **Note**: These endpoints are only available for admin users. Make sure to use an application key created by an admin.
 
 [1]: /help
-[2]: https://app.datadoghq.com/logs/pipelines
-[3]: /logs/processing
-[4]: /account_management/faq/managing-global-role-permissions/#granting-permissions-within-limited-scopes
+[2]: /account_management/faq/managing-global-role-permissions/#granting-permissions-within-limited-scopes
+[3]: https://app.datadoghq.com/logs/pipelines
+[4]: /logs/processing