Skip to content

Commit 88bcd37

Browse files
alai97alai97
committed
Revert "Merge branch 'master' into alai97/synthetics-cicd-testing-doc-updates"
This reverts commit 6305af5, reversing changes made to 38929a2.
1 parent 2e127d5 commit 88bcd37

File tree

101 files changed

+1576
-5544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1576
-5544
lines changed

‎.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.5.1.dev2",
7-
"regenerated": "2021-11-16 16:18:54.348247",
8-
"spec_repo_commit": "83cadae"
7+
"regenerated": "2021-11-12 17:12:17.522786",
8+
"spec_repo_commit": "a5c075c"
99
},
1010
"v2": {
1111
"apigentools_version": "1.5.1.dev2",
12-
"regenerated": "2021-11-16 16:19:02.159824",
13-
"spec_repo_commit": "83cadae"
12+
"regenerated": "2021-11-12 17:12:25.756227",
13+
"spec_repo_commit": "a5c075c"
1414
}
1515
}
1616
}

‎.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ src/scripts/components/global-modals.js
55
src/scripts/components/header.js
66
src/scripts/components/platforms.js
77
src/scripts/components/sidenav.js
8-
src/scripts/jqmath-vanilla.js

‎.gitlab-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ build_preview:
121121
# - post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
122122
# - version_static_assets
123123
# - touch Makefile.config
124-
# - make clean-examples
125124
# - make examples
126125
# - sync_integration_descriptions
127126
# #- sync_integration_descriptions_cached
@@ -265,7 +264,6 @@ build_live:
265264
- post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
266265
- 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"
267266
- touch Makefile.config
268-
- make clean-examples
269267
- make examples
270268
- sync_integration_descriptions
271269
- sync_integration_metrics

‎Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ examples/python: examples/datadog-api-client-python clean-python-examples
266266

267267
examples/ruby: examples/datadog-api-client-ruby clean-ruby-examples
268268
@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
269-
@find examples/content -iname \*.rb -exec mv {} {}beta \;
270269

271270
-cp -Rn examples/content ./
272271

‎assets/styles/jqmath-vanilla/_jqmath-vanilla-overrides.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎assets/styles/jqmath-vanilla/jqmath-0.4.3.css

Lines changed: 0 additions & 139 deletions
This file was deleted.

‎assets/styles/style.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
@import 'bootstrap-custom';
33
@import 'webfonts';
44

5-
// jqmath
6-
@import 'jqmath-vanilla/jqmath-0.4.3';
7-
@import 'jqmath-vanilla/jqmath-vanilla-overrides';
8-
95
// base
106
@import 'base/variables';
117
@import 'base/mixins';

‎config/_default/menus/menus.en.yaml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,6 +2297,10 @@ main:
22972297
url: logs/log_configuration/rehydrating
22982298
parent: log_configuration
22992299
weight: 209
2300+
- name: Sensitive Data Detection
2301+
url: logs/log_configuration/sensitive_data_detection/
2302+
parent: log_configuration
2303+
weight: 210
23002304
- name: Connect Logs and Traces
23012305
url: tracing/connect_logs_and_traces/
23022306
parent: log_management
@@ -5532,18 +5536,6 @@ api:
55325536
- TriggerCITests
55335537
unstable: []
55345538
order: 6
5535-
- name: Trigger some Synthetics tests
5536-
url: '#trigger-some-synthetics-tests'
5537-
identifier: trigger-some-synthetics-tests
5538-
parent: synthetics
5539-
generated: true
5540-
params:
5541-
versions:
5542-
- v1
5543-
operationids:
5544-
- TriggerTests
5545-
unstable: []
5546-
order: 0
55475539
- name: Delete tests
55485540
url: '#delete-tests'
55495541
identifier: delete-tests

‎content/en/account_management/org_settings/oauth_apps.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ Use the **OAuth Apps** management page under [Organization Settings][1] to manag
1515
## Setup
1616
### Permissions
1717

18-
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.
18+
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.
1919

2020
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.
2121

2222
### Enable
2323

24-
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].
24+
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].
2525

2626
### Disable
2727

@@ -46,7 +46,7 @@ Revoking a user's OAuth access to an application removes all access to that appl
4646
{{< partial name="whats-next/whats-next.html" >}}
4747

4848
[1]: https://app.datadoghq.com/organization-settings/
49-
[2]: /account_management/rbac/permissions/#general-permissions
50-
[3]: /account_management/rbac/?tab=datadogapplication#custom-role
51-
[4]: /developers/datadog_apps/
52-
[5]: /developers/datadog_apps/#oauth-api-access
49+
[2]: /developers/datadog_apps/
50+
[3]: /developers/datadog_apps/#oauth-api-access
51+
[4]: /account_management/rbac/permissions/#general-permissions
52+
[5]: /account_management/rbac/?tab=datadogapplication#custom-role

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ title: RPM GPG Key Rotation
33
kind: faq
44
---
55

6-
<div class="alert alert-warning">
7-
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.
8-
</div>
9-
10-
116
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.
127

138
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.

0 commit comments

Comments
 (0)