Skip to content

Commit 6305af5

Browse files
alai97alai97
committed
Merge branch 'master' into alai97/synthetics-cicd-testing-doc-updates
2 parents 38929a2 + ed58283 commit 6305af5

File tree

101 files changed

+5544
-1576
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

+5544
-1576
lines changed

‎.apigentools-info

+4-4
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-12 17:12:17.522786",
8-
"spec_repo_commit": "a5c075c"
7+
"regenerated": "2021-11-16 16:18:54.348247",
8+
"spec_repo_commit": "83cadae"
99
},
1010
"v2": {
1111
"apigentools_version": "1.5.1.dev2",
12-
"regenerated": "2021-11-12 17:12:25.756227",
13-
"spec_repo_commit": "a5c075c"
12+
"regenerated": "2021-11-16 16:19:02.159824",
13+
"spec_repo_commit": "83cadae"
1414
}
1515
}
1616
}

‎.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ 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

+2
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ 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
124125
# - make examples
125126
# - sync_integration_descriptions
126127
# #- sync_integration_descriptions_cached
@@ -264,6 +265,7 @@ build_live:
264265
- post_dd_event "documentation deploy ${CI_COMMIT_REF_NAME} started" "${CI_PROJECT_URL}/pipelines/${CI_PIPELINE_ID}" "info"
265266
- 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"
266267
- touch Makefile.config
268+
- make clean-examples
267269
- make examples
268270
- sync_integration_descriptions
269271
- sync_integration_metrics

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ 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 \;
269270

270271
-cp -Rn examples/content ./
271272

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

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.ma-block{
2+
tr{
3+
background: white !important;
4+
}
5+
td{
6+
border-left: none !important;
7+
}
8+
}

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

+139
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
/* "fm" classes are mostly for imitating MathML in browsers without it; we try to roughly mimic
2+
Firefox's MathML layout, which seems better than http://www.w3.org/TR/mathml-for-css/ */
3+
4+
/* Cambria [Math]'s line height currently (2/11) is large in most non-Microsoft browsers: */
5+
fmath, .fm-math { font-family: STIXGeneral, 'DejaVu Serif', 'DejaVu Sans',
6+
/* Cambria, 'Cambria Math', */ Times, 'Lucida Sans Unicode',
7+
OpenSymbol, 'Standard Symbols L', serif; line-height: 1.2 }
8+
fmath mtext, .fm-math mtext
9+
{ line-height: normal }
10+
fmath mo, .fm-mo, .ma-sans-serif, fmath mi[mathvariant*=sans-serif],
11+
fmath mn[mathvariant*=sans-serif], fmath mtext[mathvariant*=sans-serif],
12+
fmath ms[mathvariant*=sans-serif]
13+
/* some (crossbrowsertesting/browsershots) IE7s require no line break before
14+
'Lucida Sans Unicode': */
15+
{ font-family: STIXGeneral, 'DejaVu Sans', 'DejaVu Serif', /* Cambria, 'Cambria Math', */ 'Lucida Sans Unicode',
16+
'Arial Unicode MS', 'Lucida Grande', Times,
17+
OpenSymbol, 'Standard Symbols L', sans-serif }
18+
.fm-mo-Luc /* avoid extra space at character tops, especially when stretched */
19+
{ font-family: STIXGeneral, 'DejaVu Sans', 'DejaVu Serif', /* Cambria, 'Cambria Math', */ 'Lucida Sans Unicode',
20+
'Lucida Grande', 'Arial Unicode MS', Times,
21+
OpenSymbol, 'Standard Symbols L', sans-serif }
22+
* html fmath, * html .fm-math, * html fmath mo, * html .fm-mo, * html .IE6-LSU
23+
{ font-family: 'Lucida Sans Unicode' !important } /* IE <=6 only */
24+
mo.fm-radic { font-family: 'Lucida Sans Unicode', 'Lucida Grande',
25+
Verdana, sans-serif !important }
26+
.ma-script, fmath mi[mathvariant*=script], fmath mo[mathvariant*=script],
27+
fmath mn[mathvariant*=script], fmath mtext[mathvariant*=script], fmath ms[mathvariant*=script]
28+
{ font-family:
29+
'England Hand DB', 'Embassy BT', 'Amazone BT', 'Bank Script D',
30+
'URW Chancery L', 'Lucida Calligraphy', 'Apple Chancery',
31+
'Monotype Corsiva', Corsiva,
32+
'Vivaldi D', Gabriola, 'Segoe Script', cursive }
33+
.ma-fraktur, fmath mi[mathvariant*=fraktur], fmath mo[mathvariant*=fraktur],
34+
fmath mn[mathvariant*=fraktur], fmath mtext[mathvariant*=fraktur],
35+
fmath ms[mathvariant*=fraktur]
36+
{ font-family: UnifrakturMaguntia, Impact, fantasy }
37+
fmath mi[mathvariant*=monospace], fmath mo[mathvariant*=monospace],
38+
fmath mn[mathvariant*=monospace], fmath mtext[mathvariant*=monospace],
39+
fmath ms[mathvariant*=monospace]
40+
{ font-family: monospace }
41+
/* .ma-double-struck currently ignored */
42+
43+
.fm-mi-length-1 { font-style: italic }
44+
fmath mi[mathvariant] { font-style: normal }
45+
46+
.ma-bold, fmath mi[mathvariant*=bold], fmath mo[mathvariant*=bold],
47+
fmath mn[mathvariant*=bold], fmath mtext[mathvariant*=bold], fmath ms[mathvariant*=bold]
48+
{ font-weight: bold }
49+
.ma-nonbold { font-weight: normal }
50+
.ma-upright { font-style: normal !important }
51+
.ma-italic, fmath mi[mathvariant*=italic], fmath mo[mathvariant*=italic],
52+
fmath mn[mathvariant*=italic], fmath mtext[mathvariant*=italic], fmath ms[mathvariant*=italic]
53+
{ font-style: italic }
54+
55+
fmath.ma-block { display: block; text-align: center; text-indent: 0;
56+
page-break-inside: avoid }
57+
58+
/* note an operator might be 'mo' or "embellished": */
59+
.fm-separator { padding: 0 0.56ex 0 0 }
60+
.fm-infix-loose { padding: 0 0.56ex } /* typically a relation */
61+
.fm-infix { padding: 0 0.44ex }
62+
.fm-prefix { padding: 0 0.33ex 0 0 }
63+
.fm-postfix { padding: 0 0 0 0.33ex }
64+
.fm-prefix-tight { padding: 0 0.11ex 0 0 }
65+
.fm-postfix-tight { padding: 0 0 0 0.11ex }
66+
.fm-quantifier { padding: 0 0.11ex 0 0.22ex } /* to match MathML */
67+
/* fences should have no padding */
68+
.ma-non-marking { display: none }
69+
70+
.fm-large-op { font-size: 1.3em }
71+
.fm-inline .fm-large-op { font-size: 1em }
72+
73+
fmath mrow { white-space: nowrap }
74+
75+
.fm-vert { display: inline-block; vertical-align: middle }
76+
77+
fmath table, fmath tbody, fmath tr, fmath td /* reset to default(?) styles */
78+
{ border: 0 !important; padding: 0 !important; margin: 0 !important;
79+
outline: 0 !important }
80+
81+
fmath table { border-collapse: collapse !important; text-align: center !important;
82+
table-layout: auto !important; float: none !important }
83+
84+
.fm-frac { padding: 0 1px !important }
85+
td.fm-den-frac { border-top: solid thin !important }
86+
87+
.fm-root { font-size: 0.6em }
88+
.fm-radicand { padding: 0 1px 0 0; border-top: solid; margin-top: 0.1em }
89+
90+
.fm-script { font-size: 0.71em }
91+
.fm-script .fm-script .fm-script { font-size: 1em }
92+
93+
td.fm-underover-base { line-height: 1 !important }
94+
95+
td.fm-mtd { padding: 0.5ex 0.4em !important; vertical-align: baseline !important }
96+
97+
fmath mphantom { visibility: hidden }
98+
fmath menclose, menclose.fm-menclose
99+
{ display: inline-block }
100+
fmath menclose[notation=top], menclose.fm-menclose[notation=top]
101+
{ border-top: solid thin }
102+
fmath menclose[notation=right], menclose.fm-menclose[notation=right]
103+
{ border-right: solid thin }
104+
fmath menclose[notation=bottom], menclose.fm-menclose[notation=bottom]
105+
{ border-bottom: solid thin }
106+
fmath menclose[notation=left], menclose.fm-menclose[notation=left]
107+
{ border-left: solid thin }
108+
fmath menclose[notation=box], menclose.fm-menclose[notation=box]
109+
{ border: solid thin }
110+
fmath none { display: none } /* probably unnecessary */
111+
112+
mtd.middle, fmath td.middle { vertical-align: middle !important }
113+
114+
fmath table[columnalign=left], fmath tr[columnalign=left], fmath td[columnalign=left]
115+
{ text-align: left !important }
116+
fmath table[columnalign=right], fmath tr[columnalign=right], fmath td[columnalign=right]
117+
{ text-align: right !important }
118+
fmath td[rowalign=top]
119+
{ vertical-align: top !important }
120+
fmath td[rowalign=bottom]
121+
{ vertical-align: bottom !important }
122+
fmath td[rowalign=center]
123+
{ vertical-align: middle !important }
124+
125+
mtable.ma-join-align > mtr > mtd:first-child,
126+
fmath span.ma-join-align > table > tbody > tr > td:first-child
127+
{ text-align: right; padding-right: 0 !important }
128+
mtable.ma-join-align > mtr > mtd:first-child + mtd,
129+
fmath span.ma-join-align > table > tbody > tr > td:first-child + td
130+
{ text-align: left; padding-left: 0 !important }
131+
mtable.ma-join1-align > mtr > mtd:first-child, /* e.g. for cases after a stretched { */
132+
fmath span.ma-join1-align > table > tbody > tr > td:first-child
133+
{ text-align: left; padding-left: 0 !important }
134+
135+
mtable.ma-binom > mtr > mtd, fmath span.ma-binom > table > tbody > tr > td
136+
{ padding: 0 !important }
137+
mtable.ma-binom > mtr:first-child > mtd,
138+
fmath span.ma-binom > table > tbody > tr:first-child > td
139+
{ padding: 0 0 0.18em 0 !important }

‎assets/styles/style.scss

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
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+
59
// base
610
@import 'base/variables';
711
@import 'base/mixins';

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

+12-4
Original file line numberDiff line numberDiff line change
@@ -2297,10 +2297,6 @@ 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
23042300
- name: Connect Logs and Traces
23052301
url: tracing/connect_logs_and_traces/
23062302
parent: log_management
@@ -5536,6 +5532,18 @@ api:
55365532
- TriggerCITests
55375533
unstable: []
55385534
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
55395547
- name: Delete tests
55405548
url: '#delete-tests'
55415549
identifier: delete-tests

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

+6-6
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][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.
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.
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][2] that have [OAuth API Access][3].
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].
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]: /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
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

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

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ 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+
611
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.
712

813
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

+19-16
Original file line numberDiff line numberDiff line change
@@ -124,43 +124,45 @@ Open the following ports to benefit from all the **Agent** functionalities:
124124
: Port for most Agent data (Metrics, APM, Live Processes/Containers)
125125

126126
123/udp
127-
: Port for NTP ([more details on the importance of NTP][1]).
127+
: Port for NTP ([more details on the importance of NTP][1]).<br>
128+
See [default NTP targets][2].
128129

129130
{{< region-param key="tcp_endpoint_port_ssl" >}}/tcp
130131
: Port for log collection over TCP.<br>
131-
See [logs endpoints][2] for other connection types.
132+
See [logs endpoints][3] for other connection types.
132133

133134
10255/tcp
134-
: Port for the [Kubernetes HTTP Kubelet][3]
135+
: Port for the [Kubernetes HTTP Kubelet][4]
135136

136137
10250/tcp
137-
: Port for the [Kubernetes HTTPS Kubelet][3]
138+
: Port for the [Kubernetes HTTPS Kubelet][4]
138139

139140
#### Inbound
140141

141142
Used for Agent services communicating with each other locally within the host only.
142143

143144
5000/tcp
144-
: Port for the [go_expvar server][4]
145+
: Port for the [go_expvar server][5]
145146

146147
5001/tcp
147148
: Port the IPC API listens to
148149

149150
5002/tcp
150-
: Port for the [Agent browser GUI][5]
151+
: Port for the [Agent browser GUI][6]
151152

152153
8125/udp
153154
: 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`.
154155

155156
8126/tcp
156-
: Port for the [APM receiver][6]
157+
: Port for the [APM receiver][7]
157158

158159
[1]: /agent/faq/network-time-protocol-ntp-offset-issues/
159-
[2]: /logs/log_collection/#datadog-logs-endpoints
160-
[3]: /agent/basic_agent_usage/kubernetes/
161-
[4]: /integrations/go_expvar/
162-
[5]: /agent/basic_agent_usage/#gui
163-
[6]: /tracing/
160+
[2]: /integrations/ntp/#overview
161+
[3]: /logs/log_collection/#datadog-logs-endpoints
162+
[4]: /agent/basic_agent_usage/kubernetes/
163+
[5]: /integrations/go_expvar/
164+
[6]: /agent/basic_agent_usage/#gui
165+
[7]: /tracing/
164166
{{% /tab %}}
165167
{{% tab "Agent v5 & v4" %}}
166168

@@ -170,15 +172,15 @@ Used for Agent services communicating with each other locally within the host on
170172
: Port for most Agent data (Metrics, APM, Live Processes/Containers)
171173

172174
123/udp
173-
: Port for NTP ([more details on the importance of NTP][1]).
174-
175+
: Port for NTP ([more details on the importance of NTP][1]).<br>
176+
See [default NTP targets][2].
175177
#### Inbound
176178

177179
8125/udp
178180
: 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`.
179181

180182
8126/tcp
181-
: Port for the [APM Receiver][2]
183+
: Port for the [APM Receiver][3]
182184

183185
17123/tcp
184186
: Agent forwarder, used to buffer traffic in case of network splits between the Agent and Datadog
@@ -187,7 +189,8 @@ Used for Agent services communicating with each other locally within the host on
187189
: Optional graphite adapter
188190

189191
[1]: /agent/faq/network-time-protocol-ntp-offset-issues/
190-
[2]: /tracing/
192+
[2]: /integrations/ntp/#overview
193+
[3]: /tracing/
191194
{{% /tab %}}
192195
{{< /tabs >}}
193196

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ After addressing the incompatibilities, the same command returns nothing:
5858

5959
```bash
6060
$ python2 -m pylint -sn --py3k ~/dev/my-check.py
61-
$
61+
$
6262
```
6363

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

0 commit comments

Comments
 (0)