Merge branch 'master' into alai97/synthetics-cicd-testing-navigationa…

…l-update

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2022-01-04 14:47:25.386182",
-            "spec_repo_commit": "116ef08"
+            "regenerated": "2022-01-05 07:41:25.398713",
+            "spec_repo_commit": "d72de97"
         },
         "v2": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2022-01-04 14:47:31.192414",
-            "spec_repo_commit": "116ef08"
+            "regenerated": "2022-01-05 07:41:32.870275",
+            "spec_repo_commit": "d72de97"
         }
     }
 }

.gitignore

@@ -84,8 +84,9 @@ npm-debug.log*
 content/en/real_user_monitoring/android/_index.md
 content/en/real_user_monitoring/android/data_collected.md
 content/en/real_user_monitoring/android/advanced_configuration.md
-content/en/real_user_monitoring/android/troubleshooting.md
 content/en/real_user_monitoring/android/integrated_libraries.md
+content/en/real_user_monitoring/android/mobile_vitals.md
+content/en/real_user_monitoring/android/troubleshooting.md
 content/en/real_user_monitoring/error_tracking/android.md
 content/en/real_user_monitoring/browser/_index.md
 content/en/logs/log_collection/javascript.md

Makefile

@@ -123,10 +123,12 @@ clean-auto-doc: ##Remove all doc automatically created
 	rm -f content/en/real_user_monitoring/android/data_collected.md ;fi
 	@if [ content/en/real_user_monitoring/android/advanced_configuration.md ]; then \
 	rm -f content/en/real_user_monitoring/android/advanced_configuration.md ;fi
-	@if [ content/en/real_user_monitoring/android/troubleshooting.md ]; then \
-	rm -f content/en/real_user_monitoring/android/troubleshooting.md ;fi
 	@if [ content/en/real_user_monitoring/android/integrated_libraries.md ]; then \
 	rm -f content/en/real_user_monitoring/android/integrated_libraries.md ;fi
+	@if [ content/en/real_user_monitoring/android/mobile_vitals.md ]; then \
+	rm -f content/en/real_user_monitoring/android/mobile_vitals.md ;fi
+	@if [ content/en/real_user_monitoring/android/troubleshooting.md ]; then \
+	rm -f content/en/real_user_monitoring/android/troubleshooting.md ;fi
 	@if [ content/en/real_user_monitoring/error_tracking/android.md ]; then \
 	rm -f content/en/real_user_monitoring/error_tracking/android.md ;fi
 	@if [ content/en/real_user_monitoring/error_tracking/ios.md ]; then \

assets/styles/style.scss

@@ -35,7 +35,7 @@
 @import "pages/security_monitoring";
 
 // Components
-@import 'components/iconfont'; // imported from websites-modules
+@import 'base/iconfont'; // imported from websites-modules
 @import 'components/announcement-banner'; // imported from websites-modules
 @import 'components/badge';
 @import 'components/cards';

config/_default/config.yaml

@@ -39,16 +39,14 @@ module:
      mounts:
      - source: layouts/partials/announcement_banner.html
        target: layouts/partials/announcement_banner.html
-     - source: assets/scss/components/_announcement-banner.scss
+     - source: assets/styles/components/_announcement-banner.scss
        target: assets/styles/components/_announcement-banner.scss
-     - source: assets/scss/base/_iconfont.scss
-       target: assets/styles/components/_iconfont.scss
-     - source: static/fonts/icon-font/iconfont.woff2
+     - source: assets/styles/base/_iconfont.scss
+       target: assets/styles/base/_iconfont.scss
+     - source: static/fonts/iconfont.woff2
        target: static/fonts/iconfont.woff2
-     - source: static/fonts/icon-font/iconfont.woff
+     - source: static/fonts/iconfont.woff
        target: static/fonts/iconfont.woff
-     - source: static/fonts/icon-font/iconfont.woff2
-       target: static/fonts/iconfont.woff2
 
   mounts:
     # default mounts

config/_default/menus/menus.en.yaml

@@ -1757,22 +1757,22 @@ main:
     parent: tracing_setup_overview
     identifier: tracing_configure_data_security
     weight: 107
-  - name: Trace Search and Analytics
-    url: tracing/trace_search_and_analytics/
+  - name: Trace Explorer
+    url: tracing/trace_explorer/
     parent: tracing
-    identifier: trace_search_and_analytics
+    identifier: trace_explorer
     weight: 4
   - name: Query Syntax
-    url: tracing/trace_search_and_analytics/query_syntax/
-    parent: trace_search_and_analytics
+    url: tracing/trace_explorer/query_syntax/
+    parent: trace_explorer
     weight: 403
-  - name: Monitoring Analytics
-    url: monitors/monitor_types/apm/?tab=appanalytics
-    parent: trace_search_and_analytics
-    weight: 404
   - name: Request Flow Map
-    url: tracing/trace_search_and_analytics/request_flow_map/
-    parent: trace_search_and_analytics
+    url: tracing/trace_explorer/request_flow_map/
+    parent: trace_explorer
+    weight: 404
+  - name: Monitoring Analytics
+    url: monitors/create/types/apm/
+    parent: trace_explorer
     weight: 405
   - name: Trace Retention and Ingestion
     url: tracing/trace_retention_and_ingestion/
@@ -2692,16 +2692,21 @@ main:
     parent: rum_android
     identifier: rum_android_advanced
     weight: 202
-  - name: Troubleshooting
-    url: real_user_monitoring/android/troubleshooting/
+  - name: Mobile Vitals
+    url: real_user_monitoring/android/mobile_vitals/
     parent: rum_android
-    identifier: rum_troubleshooting_android
+    identifier: rum_android_mobile_vitals
     weight: 203
   - name: Integrated Libraries
     url: real_user_monitoring/android/integrated_libraries/
     parent: rum_android
     identifier: rum_android_libraries
     weight: 204
+  - name: Troubleshooting
+    url: real_user_monitoring/android/troubleshooting/
+    parent: rum_android
+    identifier: rum_troubleshooting_android
+    weight: 205
   - name: iOS Monitoring
     url: real_user_monitoring/ios/
     parent: rum

content/en/account_management/billing/apm_tracing_profiler.md

@@ -164,7 +164,7 @@ Yes. Let Datadog know if you are interested in buying the Continuous Profiler wi
 
 
 [1]: /tracing/
-[2]: /tracing/trace_search_and_analytics/
+[2]: /tracing/trace_explorer/
 [3]: /tracing/trace_retention_and_ingestion/#retention-filters
 [4]: /account_management/billing/pricing/#infrastructure-monitoring
 [5]: /account_management/billing/pricing/#apm

content/en/account_management/saml/_index.md

@@ -125,7 +125,7 @@ When a user logs in who has the specified identity provider attribute, they are
 
 You can make changes to a mapping by clicking the **pencil** icon or removing it by clicking the **garbage** icon. These actions affect only the mapping, not the identity provider attributes or the Datadog roles.
 
-Alternatively, you can create and change mappings of SAML attributes to Datadog roles with the `authn_mappings` endpoint. For more information, see [Federated Authentication to Role Mapping API][17].
+Alternatively, you can create and change mappings of SAML attributes to Datadog roles with the `authn_mappings` endpoint. For more information, see [Federated Authentication to Role Mapping API][25].
 
 ## Additional features
 
@@ -181,11 +181,12 @@ Certain Identity Providers (such as Microsoft's ADFS) can be configured to pull
 [14]: /account_management/saml/nopassword/
 [15]: /account_management/saml/okta/
 [16]: /account_management/saml/safenet/
-[17]: /account_management/authn_mapping/
+[17]: https://app.datadoghq.com/organization-settings/login-methods
 [18]: https://app.datadoghq.com/account/saml/metadata.xml
 [19]: https://app.datadoghq.com/saml/saml_setup
 [20]: https://app.datadoghq.com/account/team
 [21]: /account_management/multi_organization/#setting-up-saml
 [22]: https://help.okta.com/en/prod/Content/Topics/users-groups-profiles/usgp-add-custom-user-attributes.htm
 [23]: https://support.okta.com/help/s/article/How-to-View-a-SAML-Response-in-Your-Browser-for-Troubleshooting?language=en_US
 [24]: https://www.samltool.com/validate_response.php
+[25]: /account_management/authn_mapping/

content/en/agent/basic_agent_usage/osx.md

@@ -21,7 +21,7 @@ further_reading:
 
 This page outlines the basic features of the Datadog Agent for macOS. If you haven't installed the Agent yet, instructions can be found in the [Datadog Agent Integration][1] documentation.
 
-By default, the Agent is installed in a sandbox located at `/opt/datadog-agent`. You can move this folder wherever you like; however, this documentation assumes a default installation location.
+By default, the Agent is installed in a sandbox located at `/opt/datadog-agent`. You can move this folder anywhere; however, this documentation assumes a default installation location.
 
 **Note**: macOS 10.12 and above are supported by the Agent v6, macOS 10.10 and above by the Agent v5.
 

content/en/agent/basic_agent_usage/source.md

@@ -19,7 +19,7 @@ further_reading:
 
 This page outlines the basic features of the Datadog Agent. If you haven't installed the Agent yet, instructions can be found [in the Datadog Agent Integration page][1].
 
-By default, your Agent is installed in its own sandbox at `~/.datadog-agent`. You're free to move this folder wherever you like. However, this article assumes that the Agent is installed in its default location, so be sure to modify the instructions accordingly if you decide to move them.
+By default, your Agent is installed in its own sandbox at `~/.datadog-agent`. You're free to move this folder anywhere. However, this article assumes that the Agent is installed in its default location, so be sure to modify the instructions accordingly if you decide to move them.
 
 ## Commands
 

content/en/agent/logs/_index.md

@@ -159,7 +159,7 @@ List of all available parameters for log collection:
 | `exclude_units`  | No       | If `type` is **journald**, list of the specific journald units to exclude.                                                                                                                                                                                                                                                                               |
 | `sourcecategory` | No       | The attribute used to define the category a source attribute belongs to, for example: `source:postgres, sourcecategory:database` or `source: apache, sourcecategory: http_web_access`.                                                                                                                                                                                                                              |
 | `start_position` | No       | If `type` is **file**, set the position for the Agent to start reading the file. Valid values are `beginning` and `end` (default: `end`). If `path` contains a wildcard character, `beginning` is not supported. _Added in Agent v6.19/v7.19_                                                                                                            |
-| `encoding`       | No       | If `type` is **file**, set the encoding for the Agent to read the file. Set it to `utf-16-le` for UTF16 little-endian, `utf-16-be` for UTF16 big-endian, or `shift-jis` for Shift JIS. Any other value ignored, and the Agent reads the file as UTF8.  _Added `utf-16-le` and `utf-16be` in Agent v6.23/v7.23, `shift-jis` in Agent v6.34/v7.34_                                                                                      |
+| `encoding`       | No       | If `type` is **file**, set the encoding for the Agent to read the file. Set it to `utf-16-le` for UTF-16 little-endian, `utf-16-be` for UTF-16 big-endian, or `shift-jis` for Shift JIS. If set to any other value, the Agent reads the file as UTF-8.  _Added `utf-16-le` and `utf-16be` in Agent v6.23/v7.23, `shift-jis` in Agent v6.34/v7.34_                                                                                      |
 | `tags`           | No       | A list of tags added to each log collected ([learn more about tagging][11]).                                                                                                                                                                                                                                                                             |
 
 ## Further Reading

content/en/agent/logs/advanced_log_collection.md

@@ -20,13 +20,14 @@ further_reading:
   text: "Logging without Limits*"
 ---
 
-Apply log processing rules to a specific log collection configurations to:
-
+Customize your log collection configuration:
 * [Filter logs](#filter-logs)
 * [Scrub sensitive data from your logs](#scrub-sensitive-data-from-your-logs)
-* [Proceed to multi-line aggregation](#multi-line-aggregation)
-* [Tail directories by using wildcards](#tail-directories-by-using-wildcards)
-* [Logfile Encodings](#logfile-encodings)
+* [Aggregate multi-line logs](#multi-line-aggregation)
+* [Copy commonly used examples](#commonly-used-log-processing-rules)
+* [Use wildcards to monitor directories](#tail-directories-by-using-wildcards)
+* [Specify log file encodings](#logfile-encodings)
+* [Define global processing rules](#global-processing-rules)
 
 **Note**: If you set up multiple processing rules, they are applied sequentially and each rule is applied on the result of the previous one.
 
@@ -443,7 +444,7 @@ More examples:
 | 2020-10-27 05:10:49.657  | `\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\.\d{3}` |
 | {"date": "2018-01-02"    | `\{"date": "\d{4}-\d{2}-\d{2}`                |
 
-### Automatic Multi-line aggregation
+### Automatic multi-line aggregation
 With Agent 7.32+ `auto_multi_line_detection` can be enabled which allows the Agent to detect [common multi-line patterns][2] automatically. 
 
 <div class="alert alert-warning">
@@ -519,7 +520,7 @@ spec:
 {{% /tab %}}
 {{< /tabs >}}
 
-Automatic mutli-line detection uses a list of common regular expressions to attempt to match logs. If the built-in list is not sufficient, you can also add custom patterns in the `datadog.yaml` file:
+Automatic multi-line detection uses a list of common regular expressions to attempt to match logs. If the built-in list is not sufficient, you can also add custom patterns in the `datadog.yaml` file:
 
 ```yaml
 logs_config:
@@ -563,11 +564,11 @@ logs:
     source: go
 ```
 
-The example above will match `/var/log/myapp/log/myfile.log` but `/var/log/myapp/log/debug.log` and `/var/log/myapp/log/trace.log` will never be tailed.
+The example above matches `/var/log/myapp/log/myfile.log` and excludes `/var/log/myapp/log/debug.log` and `/var/log/myapp/log/trace.log`.
 
 **Note**: The Agent requires read and execute permissions on a directory to list all the available files in it.
 
-## Logfile Encodings
+## Log file encodings
 
 By default, the Datadog Agent assumes that logs use UTF-8 encoding. If your application logs use a different encoding, specify the `encoding` parameter in the logs configuration setting.
 

content/en/dashboards/guide/quick-graphs.md

@@ -71,7 +71,7 @@ Click **Export** to save your work to a Dashboard or Notebook. You can always co
 [3]: /dashboards/querying/#aggregate-and-rollup
 [4]: /dashboards/querying/#advanced-graphing
 [5]: /logs/explorer/
-[6]: /tracing/trace_search_and_analytics/
+[6]: /tracing/trace_explorer/
 [7]: /real_user_monitoring/explorer/search/
 [8]: /security_platform/explorer/
 [9]: /events/

content/en/dashboards/screenboards.md

@@ -25,14 +25,14 @@ Screenboards are dashboards with free-form layouts which can include a variety o
 
 Click on any screenboard graph to open an options menu:
 
-| Option                 | Description                                                   |
-|------------------------|---------------------------------------------------------------|
-| View in full screen    | View the graph in [full screen mode][1].                     |
-| View related processes | Jump to the [Live Processes][2] page scoped to your graph.   |
-| View related hosts     | Jump to the [Host Map][3] page scoped to your graph.         |
-| View related logs      | Populate a [Logs][4] panel scoped to your graph.             |
-| View related traces    | Populate a [Traces][5] panel scoped to your graph.          |
-| View related profiles  | Jump to the [Profiling][6] page scoped to your graph.       |
+| Option                 | Description                                                      |
+|------------------------|------------------------------------------------------------------|
+| View in full screen    | View the graph in [full screen mode][1].                         |
+| View related processes | Navigate to the [Live Processes][2] page scoped to your graph.   |
+| View related hosts     | Navigate to the [Host Map][3] page scoped to your graph.         |
+| View related logs      | Populate a [Logs][4] panel scoped to your graph.                 |
+| View related traces    | Populate a [Traces][5] panel scoped to your graph.               |
+| View related profiles  | Navigate to the [Profiling][6] page scoped to your graph.        |
 
 ## Further Reading
 

content/en/dashboards/widgets/table.md

@@ -66,7 +66,7 @@ In the following example, the `Average` column calculates a ratio of `Total Ente
 
 [1]: /dashboards/querying/#configuring-a-graph
 [2]: /logs/search_syntax/
-[3]: /tracing/trace_search_and_analytics/query_syntax/
+[3]: /tracing/trace_explorer/query_syntax/
 [4]: /real_user_monitoring/explorer/search/#search-syntax
 [5]: /tracing/profiler/search_profiles
 [6]: /security_monitoring/explorer/

content/en/database_monitoring/query_metrics.md

@@ -104,13 +104,13 @@ Datadog collects explain plans continuously, so a given query can have multiple
 
 {{< img src="database_monitoring/dbm_qd_explain_plans.png" alt="Explain plans information for a query" style="width:100%;">}}
 
-Select a plan to see cost metrics or its JSON. Click **View All Samples for This Plan** to jump over to Query Samples view for [the samples associated with it][4].
+Select a plan to see cost metrics or its JSON. Click **View All Samples for This Plan** to navigate to Query Samples view for [the samples associated with it][4].
 
 Not all queries have explain plans, for various reasons, including what type of query it is, or various configuration settings. See [Troubleshooting][5] for more details.
 
 ### Hosts running this query
 
-The **Hosts Running This Query** tab lists the hosts that run this query, with a context menu that lets you jump to related information for the hosts, such as logs or the network data, which can be useful for troubleshooting where latency problems are coming from.
+The **Hosts Running This Query** tab lists the hosts that run this query, with a context menu that lets you navigate to related information for the hosts, such as logs or the network data, which can be useful for troubleshooting where latency problems are coming from.
 
 {{< img src="database_monitoring/dbm_qd_hosts_running_query_menu.png" alt="Host action menu for pivoting to more information" style="width:100%;">}}