Skip to content

Commit

Permalink
Merge branch 'master' into heston/DOCS-8410-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
hestonhoffman committed Aug 23, 2024
2 parents 9ddfa10 + 6984000 commit 48c5b23
Show file tree
Hide file tree
Showing 1,985 changed files with 44,455 additions and 31,702 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-08-21 15:18:19.675370",
"spec_repo_commit": "4470dfc1"
"regenerated": "2024-08-22 19:12:41.364401",
"spec_repo_commit": "9ce6b1ec"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-08-21 15:18:27.960966",
"spec_repo_commit": "4470dfc1"
"regenerated": "2024-08-22 19:12:49.181375",
"spec_repo_commit": "9ce6b1ec"
}
}
}
3 changes: 3 additions & 0 deletions .github/workflows/check_cache_values.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
- 'local/bin/py/build/configurations/pull_config_preview.yaml'
- 'local/bin/py/build/configurations/pull_config.yaml'

permissions:
contents: read

# Stop the current running job if a new push is made to the PR
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/code-freeze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ on:
# only target `master` branch
- master

permissions:
contents: read
pull-requests: read
checks: write

env:
ACTIVE_FREEZE: "false"
# toggle to true like below to enable + change the job unique name and add a required branch protection!
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/datadog-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ on: [push]

name: Datadog Static Analysis

permissions:
contents: read

jobs:
static-analysis:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/preview_link.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
paths:
- 'content/en/**.md'

permissions:
contents: read
pull-requests: write

jobs:
preview-link:
if: contains(github.head_ref, '/')
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/synthetics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

permissions:
contents: read

jobs:
synthetic_testing:
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/vale_linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
- 'content/en/**/*'
- 'layouts/shortcodes/**/*.md'

permissions:
contents: read

jobs:
vale:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/validate_filenames.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

permissions:
contents: read
pull-requests: write

jobs:
run_static_asset_validation:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ placeholders: hugpython update_pre_build
hugpython: local/etc/requirements3.txt
@${PY3} -m venv --clear $@ && . $@/bin/activate && $@/bin/pip install --upgrade pip wheel && $@/bin/pip install -r $<;\
if [[ "$(CI_COMMIT_REF_NAME)" != "" ]]; then \
$@/bin/pip install https://binaries.ddbuild.io/dd-source/python/assetlib-0.0.41265762-py3-none-any.whl; \
$@/bin/pip install https://binaries.ddbuild.io/dd-source/python/assetlib-0.0.42552816-py3-none-any.whl; \
fi

update_pre_build: hugpython
Expand Down
44 changes: 40 additions & 4 deletions config/_default/menus/main.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2052,12 +2052,43 @@ menu:
parent: incidents
identifier: incidents_guide
weight: 10
- name: On-Call
url: service_management/on-call/
pre: incidents
parent: service_management_heading
identifier: oncall
weight: 30000
- name: Onboard a Team
url: service_management/on-call/teams/
parent: oncall
identifier: oncall_teams
weight: 1
- name: Send a Page
url: service_management/on-call/pages/
parent: oncall
identifier: oncall_pages
weight: 2
- name: Escalation Policies
url: service_management/on-call/escalation_policies/
parent: oncall
identifier: oncall_escalation_policies
weight: 3
- name: Schedules
url: service_management/on-call/schedules/
parent: oncall
identifier: oncall_schedules
weight: 4
- name: Profile Settings
url: service_management/on-call/profile_settings/
parent: oncall
identifier: oncall_profile_settings
weight: 5
- name: Event Management
url: service_management/events/
pre: events
identifier: events
parent: service_management_heading
weight: 30000
weight: 40000
- name: Ingest Events
url: service_management/events/ingest/
identifier: event_ingest
Expand Down Expand Up @@ -2188,7 +2219,7 @@ menu:
pre: case-management
parent: service_management_heading
identifier: case_management
weight: 40000
weight: 50000
- name: Projects
url: service_management/case_management/projects
parent: case_management
Expand Down Expand Up @@ -3751,16 +3782,21 @@ menu:
parent: llm_obs_setup
identifier: llm_obs_setup_api
weight: 303
- name: Configuration
url: llm_observability/configuration/
parent: llm_obs
identifier: llm_obs_configuration
weight: 4
- name: Submit Evaluations
url: llm_observability/submit_evaluations/
parent: llm_obs
identifier: llm_obs_submit_evaluations
weight: 4
weight: 5
- name: Guides
url: llm_observability/guide/
parent: llm_obs
identifier: llm_obs_guide
weight: 5
weight: 6
- name: CI Visibility
url: continuous_integration/
pre: ci
Expand Down
5 changes: 4 additions & 1 deletion content/en/account_management/billing/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ Other AWS resources such as ELB, RDS, and DynamoDB are not part of monthly infra

## AWS resource exclusion

You can limit the AWS metrics collected for some services to specific resources. On the [Datadog-AWS integration page][3], select the AWS account and click on the **Metric Collection** tab. Under **Limit Metric Collection to Specific Resources** you can then exclude metrics for one or more of EC2, Lambda, ELB, Application ELB, Network ELB, RDS, SQS, and CloudWatch custom metrics.
You can limit the AWS metrics collected for some services to specific resources. On the [Datadog-AWS integration page][3], select the AWS account and click on the **Metric Collection** tab. Under **Limit Metric Collection to Specific Resources** you can then limit metrics for one or more of EC2, Lambda, ELB, Application ELB, Network ELB, RDS, SQS, and CloudWatch custom metrics.
Ensure that the tags added to this section are assigned to the corresponding resources on AWS.

**Note**: If using exclusion notation (`!`), ensure the resource lacks the specified tag.

{{< img src="account_management/billing/aws-resource-exclusion.png" alt="The metric collection tab of an AWS account within the Datadog AWS integration page showing the option to limit metric collection to specific resources with a dropdown menu to select AWS service and a field to add tags in key:value format" >}}

Expand Down
4 changes: 3 additions & 1 deletion content/en/account_management/org_settings/ip_allowlist.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ The IP allowlist feature does not block access to the following:

Applications and integrations that submit telemetry from the Agent (metrics, traces, and logs), and those that use an API key provided by the user, are not impacted by the IP allowlist. Datadog recommends utilizing the [Audit Trail][5] to monitor for IP addresses from third party applications and integrations.

To allow mobile app clients to connect to Datadog when the IP allowlist feature is enabled, Datadog recommends that the mobile devices connect to an allowed network range via VPN.

### Functionality

Only users with the **Org Management** permission can configure the IP allowlist.
Expand All @@ -57,7 +59,7 @@ When you enable or modify the IP allowlist, the system enforces constraints to m
To find the [IP allowlist UI][6]:

1. Navigate to **Organization Settings** from your account menu.
1. Under **Access**, select **IP Allowlist**.
1. Under **Security**, select **IP Allowlist**.

The IP allowlist table lists the CIDR ranges contained in the IP allowlist.

Expand Down
2 changes: 1 addition & 1 deletion content/en/agent/guide/windows-agent-ddagent-user.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Requirements:

**Note**: If you encounter permission issues with `system` and `winproc` checks upon installing, make sure the `ddagentuser` is a member of the Performance Monitor Users and Event Log Readers groups.

**Note**: The user cannot be specified in the installer UI. Use the command line to pass the `DDAGENTUSER_NAME` and other parameters. They are taken into account, even in a UI install.
**Note**: For Agent version < `7.40.0`, the user cannot be specified in the installer UI. Use the command line to pass the `DDAGENTUSER_NAME` and other parameters. They are taken into account, even in a UI install.

### Installation with group policy

Expand Down
2 changes: 1 addition & 1 deletion content/en/api/v1/organizations/examples.json

Large diffs are not rendered by default.

114 changes: 57 additions & 57 deletions content/en/api/v1/synthetics/examples.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"request": {
"host": "datadoghq.com",
"port": 443
"port": "443"
}
},
"locations": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
],
"request": {
"host": "grpcbin.test.k6.io",
"port": 9000,
"port": "9000",
"service": "grpcbin.GRPCBin",
"method": "Index",
"message": "{}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"request": {
"host": "localhost",
"port": 50051,
"port": "50051",
"service": "Hello",
"method": "GET",
"message": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"request": {
"host": "https://datadoghq.com",
"message": "message",
"port": 443
"port": "443"
}
},
"locations": [
Expand Down
Loading

0 comments on commit 48c5b23

Please sign in to comment.