Revert "Merge branch 'master' into alai97/synthetics-cicd-testing-doc…

…-updates"

This reverts commit 6305af5, reversing
changes made to 38929a2.

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-11-16 16:18:54.348247",
-            "spec_repo_commit": "83cadae"
+            "regenerated": "2021-11-12 17:12:17.522786",
+            "spec_repo_commit": "a5c075c"
         },
         "v2": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-11-16 16:19:02.159824",
-            "spec_repo_commit": "83cadae"
+            "regenerated": "2021-11-12 17:12:25.756227",
+            "spec_repo_commit": "a5c075c"
         }
     }
 }

.eslintignore

@@ -5,4 +5,3 @@ src/scripts/components/global-modals.js
 src/scripts/components/header.js
 src/scripts/components/platforms.js
 src/scripts/components/sidenav.js
-src/scripts/jqmath-vanilla.js

.gitlab-ci.yml

@@ -121,7 +121,6 @@ build_preview:
 #     - post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
 #     - version_static_assets
 #     - touch Makefile.config
-#     - make clean-examples
 #     - make examples
 #     - sync_integration_descriptions
 #     #- sync_integration_descriptions_cached
@@ -265,7 +264,6 @@ build_live:
     - post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
     - notify_slack "<https://github.com/DataDog/documentation/commit/${CI_COMMIT_SHA}|${CI_COMMIT_SHA:0:8}> sent to gitlab for production deployment. <${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}|details>" "#FFD700"
     - touch Makefile.config
-    - make clean-examples
     - make examples
     - sync_integration_descriptions
     - sync_integration_metrics

Makefile

@@ -266,7 +266,6 @@ examples/python: examples/datadog-api-client-python clean-python-examples
 
 examples/ruby: examples/datadog-api-client-ruby clean-ruby-examples
 	@cd examples/datadog-api-client-ruby; ./extract-code-blocks.sh $(EXAMPLES_DIR) || (echo "Error copying Ruby code examples, aborting build."; exit 1); if [ -d examples ]; then cp -R examples/* $(EXAMPLES_DIR)/; fi
-	@find examples/content -iname \*.rb -exec mv {} {}beta \;
 
 	-cp -Rn examples/content ./
 

assets/styles/style.scss

@@ -2,10 +2,6 @@
 @import 'bootstrap-custom';
 @import 'webfonts';
 
-// jqmath 
-@import 'jqmath-vanilla/jqmath-0.4.3';
-@import 'jqmath-vanilla/jqmath-vanilla-overrides';
-
 // base
 @import 'base/variables';
 @import 'base/mixins';

config/_default/menus/menus.en.yaml

@@ -2297,6 +2297,10 @@ main:
     url: logs/log_configuration/rehydrating
     parent: log_configuration
     weight: 209
+  - name: Sensitive Data Detection
+    url: logs/log_configuration/sensitive_data_detection/
+    parent: log_configuration
+    weight: 210
   - name: Connect Logs and Traces
     url: tracing/connect_logs_and_traces/
     parent: log_management
@@ -5532,18 +5536,6 @@ api:
         - TriggerCITests
       unstable: []
       order: 6
-  - name: Trigger some Synthetics tests
-    url: '#trigger-some-synthetics-tests'
-    identifier: trigger-some-synthetics-tests
-    parent: synthetics
-    generated: true
-    params:
-      versions:
-        - v1
-      operationids:
-        - TriggerTests
-      unstable: []
-      order: 0
   - name: Delete tests
     url: '#delete-tests'
     identifier: delete-tests

content/en/account_management/org_settings/oauth_apps.md

@@ -15,13 +15,13 @@ Use the **OAuth Apps** management page under [Organization Settings][1] to manag
 ## Setup
 ### Permissions
 
-By default, users with [Datadog Standard and Datadog Admin roles][2] can access the OAuth Apps management page. If your organization has [custom roles][3] defined, add your user to any custom role with `org_authorized_apps_read` and `org_authorized_apps_write` permissions. 
+By default, users with [Datadog Standard and Datadog Admin roles][4] can access the OAuth Apps management page. If your organization has [custom roles][5] defined, add your user to any custom role with `org_authorized_apps_read` and `org_authorized_apps_write` permissions. 
 
 Only users with the Datadog Admin role or the `org_authorized_apps_write` permission can manage OAuth applications on this page, such as disabling applications or revoking OAuth access for a user.
 
 ### Enable
 
-Enabled OAuth applications allow users with necessary permissions to authorize access on their behalf. OAuth applications include the Datadog Mobile App and your custom [Datadog Apps][4] that have [OAuth API Access][5]. 
+Enabled OAuth applications allow users with necessary permissions to authorize access on their behalf. OAuth applications include the Datadog Mobile App and your custom [Datadog Apps][2] that have [OAuth API Access][3]. 
 
 ### Disable
 
@@ -46,7 +46,7 @@ Revoking a user's OAuth access to an application removes all access to that appl
 {{< partial name="whats-next/whats-next.html" >}}
 
 [1]: https://app.datadoghq.com/organization-settings/
-[2]: /account_management/rbac/permissions/#general-permissions
-[3]: /account_management/rbac/?tab=datadogapplication#custom-role
-[4]: /developers/datadog_apps/
-[5]: /developers/datadog_apps/#oauth-api-access
+[2]: /developers/datadog_apps/
+[3]: /developers/datadog_apps/#oauth-api-access
+[4]: /account_management/rbac/permissions/#general-permissions
+[5]: /account_management/rbac/?tab=datadogapplication#custom-role

content/en/agent/faq/rpm-gpg-key-rotation-agent-6.md

@@ -3,11 +3,6 @@ title: RPM GPG Key Rotation
 kind: faq
 ---
 
-<div class="alert alert-warning">
-This page pertains to the 2019 key rotation. For the 2022 key rotation, consult the <a href="/agent/faq/linux-agent-2022-key-rotation">2022 Linux Agent Key Rotation</a> documentation.
-</div>
-
-
 Starting with v6.14.0, the Agent RPM packages are signed with a different GPG key. As a common best practice, Datadog periodically updates the GPG key.
 
 Hosts using RPM packages located in the [Datadog Yum repository][1] are affected by this change and need to trust the key by importing the associated public key in their hosts' keyrings.

content/en/agent/guide/network.md

@@ -124,45 +124,43 @@ Open the following ports to benefit from all the **Agent** functionalities:
 : Port for most Agent data (Metrics, APM, Live Processes/Containers)
 
 123/udp
-: Port for NTP ([more details on the importance of NTP][1]).<br>
-See [default NTP targets][2].
+: Port for NTP ([more details on the importance of NTP][1]).
 
 {{< region-param key="tcp_endpoint_port_ssl" >}}/tcp
 : Port for log collection over TCP.<br>
-See [logs endpoints][3] for other connection types.
+See [logs endpoints][2] for other connection types.
 
 10255/tcp
-: Port for the [Kubernetes HTTP Kubelet][4]
+: Port for the [Kubernetes HTTP Kubelet][3]
 
 10250/tcp
-: Port for the [Kubernetes HTTPS Kubelet][4]
+: Port for the [Kubernetes HTTPS Kubelet][3]
 
 #### Inbound
 
 Used for Agent services communicating with each other locally within the host only.
 
 5000/tcp
-: Port for the [go_expvar server][5]
+: Port for the [go_expvar server][4]
 
 5001/tcp
 : Port the IPC API listens to
 
 5002/tcp
-: Port for the [Agent browser GUI][6]
+: Port for the [Agent browser GUI][5]
 
 8125/udp
 : Port for DogStatsD unless `dogstatsd_non_local_traffic` is set to true. This port is available on localhost: `127.0.0.1`, `::1`, `fe80::1`.
 
 8126/tcp
-: Port for the [APM receiver][7]
+: Port for the [APM receiver][6]
 
 [1]: /agent/faq/network-time-protocol-ntp-offset-issues/
-[2]: /integrations/ntp/#overview
-[3]: /logs/log_collection/#datadog-logs-endpoints
-[4]: /agent/basic_agent_usage/kubernetes/
-[5]: /integrations/go_expvar/
-[6]: /agent/basic_agent_usage/#gui
-[7]: /tracing/
+[2]: /logs/log_collection/#datadog-logs-endpoints
+[3]: /agent/basic_agent_usage/kubernetes/
+[4]: /integrations/go_expvar/
+[5]: /agent/basic_agent_usage/#gui
+[6]: /tracing/
 {{% /tab %}}
 {{% tab "Agent v5 & v4" %}}
 
@@ -172,15 +170,15 @@ Used for Agent services communicating with each other locally within the host on
 : Port for most Agent data (Metrics, APM, Live Processes/Containers)
 
 123/udp
-: Port for NTP ([more details on the importance of NTP][1]).<br>
-See [default NTP targets][2].
+: Port for NTP ([more details on the importance of NTP][1]).
+
 #### Inbound
 
 8125/udp
 : Port for DogStatsD unless `dogstatsd_non_local_traffic` is set to true. This port is available on localhost: `127.0.0.1`, `::1`, `fe80::1`.
 
 8126/tcp
-: Port for the [APM Receiver][3]
+: Port for the [APM Receiver][2]
 
 17123/tcp
 : Agent forwarder, used to buffer traffic in case of network splits between the Agent and Datadog
@@ -189,8 +187,7 @@ See [default NTP targets][2].
 : Optional graphite adapter
 
 [1]: /agent/faq/network-time-protocol-ntp-offset-issues/
-[2]: /integrations/ntp/#overview
-[3]: /tracing/
+[2]: /tracing/
 {{% /tab %}}
 {{< /tabs >}}
 

content/en/agent/guide/python-3.md

@@ -58,7 +58,7 @@ After addressing the incompatibilities, the same command returns nothing:
 
 ```bash
 $ python2 -m pylint -sn --py3k ~/dev/my-check.py
-$ 
+$
 ```
 
 While `pylint` catches any issue that could prevent the Python 3 interpreter from running code at all, it cannot check for logical validity. After code changes are made, make sure to run the check and validate the output.