merge master

alk-mandrianarijaona · Aug 5, 2019 · 99294d0 · 99294d0
2 parents b2755c9 + ae7cfa6
commit 99294d0
Show file tree

Hide file tree

Showing 178 changed files with 8,962 additions and 2,471 deletions.
diff --git a/config/_default/menus/menus.en.yaml b/config/_default/menus/menus.en.yaml
diff --git a/config/_default/menus/menus.fr.yaml b/config/_default/menus/menus.fr.yaml
diff --git a/config/_default/menus/menus.ja.yaml b/config/_default/menus/menus.ja.yaml
diff --git a/config/_default/params.yaml b/config/_default/params.yaml
@@ -14,7 +14,14 @@ code_languages:
   - display_name: Curl
     key: bash
 footer_scripts:
-  - snowplow: false
   - marketo: false
-  - adroll: false
 
+algolia:
+  appId: EOIG7V0A2O
+  apiKey: c7ec32b3838892b10610af30d06a4e42
+  indexName: docsearch_docs_prod
+
+datadog:
+  clientToken: pube66a8c26c2159b101d6c36b5317fa7f9
+  forwardErrorsToLogs: true
+  logging_handler: console
diff --git a/config/development/params.yaml b/config/development/params.yaml
@@ -1,4 +1,7 @@
-environment: local
+environment: development
 img_url: "http://localhost:1313/"
 corp_url: "https://www.datadoghq.com/"
 static_url: "http://localhost:1313/"
+
+datadog:
+  logging_handler: console
diff --git a/config/live/params.yaml b/config/live/params.yaml
@@ -1,7 +1,13 @@
 environment: live
 img_url: "https://datadog-docs.imgix.net/"
 static_url: "https://docs.datadoghq.com/"
+ga: UA-21102638-5
 footer_scripts:
 - snowplow: true
 - marketo: true
 - adroll: true
+
+datadog:
+  clientToken: pub16bb5ef3e9bf55f156338987e27246c7
+  applicationId: 3493b4e7-ab12-4852-8836-ba96af7bc745
+  logging_handler: http
diff --git a/config/preview/config.yaml b/config/preview/config.yaml
@@ -1,4 +1,4 @@
 baseURL: https://docs-staging.datadoghq.com/
 buildfuture: true
 builddrafts: true
-enableGitInfo: true
+enableGitInfo: true
diff --git a/config/preview/params.yaml b/config/preview/params.yaml
@@ -1,3 +1,11 @@
 environment: preview
 img_url: "https://datadog-docs.imgix.net/"
 static_url: "https://docs-staging.datadoghq.com/"
+ga: UA-21102638-9
+footer_scripts:
+  - marketo: true
+
+datadog:
+  clientToken: pub36877d3864fab670b5ae7e1d5d26cb08
+  applicationId: c4e83ad8-4eda-4d2e-aae1-d943abce0463
+  logging_handler: http
diff --git a/content/en/account_management/saml/_index.md b/content/en/account_management/saml/_index.md
@@ -13,7 +13,7 @@ further_reading:
 
 Configuring [SAML (Security Assertion Markup Language)][1] for your Datadog account lets you and all your teammates log in to Datadog using the credentials stored in your organization's Active Directory, LDAP, or other identity store that has been configured with a SAML Identity Provider.
 
-**Note**: Created users must accept email verification for SAML to work. If you don't have SAML enabled on your Datadog account, reach out to [support][2] to enable it.
+**Note**: If you don't have SAML enabled on your Datadog account, reach out to [support][2] to enable it.
 
 Here's a two-minute video walkthrough:
 

diff --git a/content/en/account_management/saml/auth0.md b/content/en/account_management/saml/auth0.md
@@ -22,12 +22,12 @@ SAML is set up [Using Auth0 with a SAML2 Web App][1].
 
 This is the official Auth0 [Datadog SAML Configuration][2].
 
-**Application Callback URL**:  
+**Application Callback URL**:
 ```text
 https://app.datadoghq.com/account/saml/assertion
 ```
 
-**Settings**:  
+**Settings**:
 ```json
 {
   "audience": "https://app.datadoghq.com/account/saml/metadata.xml",

diff --git a/content/en/account_management/saml/azure.md b/content/en/account_management/saml/azure.md
@@ -13,10 +13,10 @@ further_reading:
   text: "Configuring Teams & Organizations with Multiple Accounts"
 ---
 
-Below is a step by step guide to configure Azure AD as a SAML IdP within Datadog:  
+Below is a step by step guide to configure Azure AD as a SAML IdP within Datadog:
 **Note**: an Azure AD Premium Subscription is required to set this up
 
-#### Configuration 
+#### Configuration
 
 1. Navigate to `https://portal.azure.com/`.
 
@@ -74,19 +74,19 @@ Below is a step by step guide to configure Azure AD as a SAML IdP within Datadog
     {{< img src="account_management/saml/SAML_Configuration___Datadog11.png" alt="SAML_Configuration___Datadog11" responsive="true" style="width:70%;">}}
 
 19. Begin to log in to Datadog via Azure AD by pressing **Enable**:
-    
+
     {{< img src="account_management/saml/SAML_Configuration___Datadog12.png" alt="SAML_Configuration___Datadog12" responsive="true" style="width:70%;">}}
 
 
-#### Optional 
+#### Optional
 
 If you are using an SSO via a Datadog button or link, you need to add a Sign-on URL. To do this, navigate back to the SSO Configuration section of the Azure Application (Step 8) and check off **Show advanced URL settings**:
 
 Then paste the Single Sign-on URL that is displayed in the [Datadog SAML page][1].
 
 {{< img src="account_management/saml/SAML_Configuration___Datadog13.png" alt="SAML_Configuration___Datadog13" responsive="true" style="width:60%;">}}
 
-  
+
 #### Further Reading
 
 {{< partial name="whats-next/whats-next.html" >}}

diff --git a/content/en/account_management/saml/okta.md b/content/en/account_management/saml/okta.md
@@ -15,7 +15,7 @@ further_reading:
 
 It's recommended that you set up Datadog as an Okta application manually, as opposed to using a 'pre-configured' configuration.
 
-[Consult the dedicated Okta documentation, to know how to Configure SAML 2.0 for Datadog][1] 
+[Consult the dedicated Okta documentation, to know how to Configure SAML 2.0 for Datadog][1]
 
 ## General Details
 
@@ -28,7 +28,7 @@ It's recommended that you set up Datadog as an Okta application manually, as opp
 
 * **Audience URI (SP Entity ID)**: https://app.datadoghq.com/account/saml/metadata.xml
 
-* **Default Relay State**: 
+* **Default Relay State**:
 
 * **Name ID Format**: EmailAddress
 

diff --git a/content/en/agent/autodiscovery/ad_identifiers.md b/content/en/agent/autodiscovery/ad_identifiers.md
@@ -1,5 +1,5 @@
 ---
-title: Autodiscovery Container Identifier
+title: Autodiscovery Container Identifiers
 kind: documentation
 further_reading:
 - link: "/agent/autodiscovery/integrations"
@@ -10,13 +10,13 @@ further_reading:
   text: "Manage which Container to include in the Agent Autodiscovery"
 ---
 
-Autodiscovery Container Identifiers, or `ad_identifiers`, allow you to apply an Autodiscovery configuration file template to a given container, either by [using the container short image](#short-image-container-identifiers) or with a [custom Autodiscovery container identifier](#custom-autodiscovery-container-identifiers).
+Autodiscovery container identifiers, or `ad_identifiers`, allow you to apply an Autodiscovery configuration file template to a given container, either by using the [container short image](#short-image-container-identifiers) or with a [custom Autodiscovery container identifier](#custom-autodiscovery-container-identifiers).
 
-**Note**: With the other types of configuration—key-value stores, Docker labels, or Kubernetes pod annotations—the matching between an integration configuration template and the corresponding container is based on the `<CONTAINER_IDENTIFIER>` included in the key-value stores, labels, or annotations configuration.
+**Note**: For other configuration types—key-value stores, Docker labels, or Kubernetes pod annotations—the matching between an integration configuration template and the corresponding container is based on the `<CONTAINER_IDENTIFIER>` included in the key-value stores, labels, or annotations configuration.
 
 ## Short image container identifiers
 
-To apply the following Autodiscovery configuration template file to a given container, use the **container short image** name as `<INTEGRATION_AUTODISCOVERY_IDENTIFIER>`:
+To apply the following Autodiscovery configuration template to a given container, use the **container short image** name as the `<INTEGRATION_AUTODISCOVERY_IDENTIFIER>`:
 
 ```
 ad_identifiers:
@@ -29,7 +29,7 @@ instances:
   <INSTANCES_CONFIG>
 ```
 
-For instance, the following Apache Autodiscovery configuration file template used by the Agent:
+For example, the following Apache Autodiscovery configuration template can be used by the Agent:
 
 ```yaml
 ad_identifiers:
@@ -42,13 +42,23 @@ logs:
   service: webapp
 ```
 
-Matches **ANY** `httpd` container image on your host. Suppose you have one container running `library/httpd:latest` and another running `<WHATEVER>/httpd:v2`. The Agent would apply the above template to both containers since you have to provide short names for container images, e.g. `httpd`, NOT `library/httpd:latest`:
+This matches **ANY** `httpd` container image on your host. Suppose you have one container running `library/httpd:latest` and another running `<WHATEVER>/httpd:v2`. The Agent applies the above template to both containers since you have to provide short names for container images, e.g. `httpd`, NOT `library/httpd:latest`.
 
-As a consequence, when using short image as Autodiscovery container identifiers, **the Agent cannot distinguish between identically named images from different sources or with different tags**.
+When using short image names as Autodiscovery container identifiers, **the Agent cannot distinguish between identically named images from different sources or with different tags**.
+
+### Multiple identifiers
+
+Specify multiple image names by adding to the `ad_identifiers` list, for example:
+
+```yaml
+ad_identifiers:
+  - httpd
+  - my-custom-httpd-image
+```
 
 ## Custom Autodiscovery container identifiers
 
-To apply different Autodiscovery Configuration file templates to different containers running the same image, use a custom value as `<INTEGRATION_AUTODISCOVERY_IDENTIFIER>` and apply it with the `com.datadoghq.ad.check.id` label to identify your container. Let's say you have the following configuration file:
+To apply different Autodiscovery configuration templates to containers running the same image, use a custom value `<INTEGRATION_AUTODISCOVERY_IDENTIFIER>` and apply it with the `com.datadoghq.ad.check.id` label to identify your container. Using the following configuration file:
 
 ```
 ad_identifiers:
@@ -61,14 +71,12 @@ instances:
   <INSTANCES_CONFIG>
 ```
 
-To **ONLY**  apply this Autodiscovery configuration file template to one of your container, add to it the following label:
+Add the following label to apply this Autodiscovery configuration template to a specific container.
 
 ```
 com.datadoghq.ad.check.id: <INTEGRATION_AUTODISCOVERY_IDENTIFIER>
 ```
 
-The Agent then knows to apply the Autodiscovery configuration file to this specific container and not to another one.
-
 **Note**: The `com.datadoghq.ad.check.id` label takes precedence over the image/name.
 
 ## Further Reading