Skip to content

Commit

Permalink
Merge master into datadog-api-spec/test/dshivara/OMG-58
Browse files Browse the repository at this point in the history
  • Loading branch information
2 parents 2acb2ce + d43bdd6 commit c3df061
Show file tree
Hide file tree
Showing 58 changed files with 959 additions and 712 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-12-13 15:31:47.674190",
"spec_repo_commit": "e7a707af"
"regenerated": "2024-12-16 18:29:13.331043",
"spec_repo_commit": "a179b579"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-12-13 15:31:55.671458",
"spec_repo_commit": "e7a707af"
"regenerated": "2024-12-16 18:29:21.222347",
"spec_repo_commit": "a179b579"
}
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ Within 10 minutes of merging to master, it deploys automatically.
[18]: /CONTRIBUTING.md
[19]: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account
[20]: https://datadoghq.atlassian.net/wiki/spaces/docs4docs/pages/3960766866/Build+setup+guide
[21]: https://slack.com/help/articles/221769328-Locate-your-Slack-URL-or-ID
[21]: https://www.highviewapps.com/kb/how-do-i-find-my-slack-username/
6 changes: 6 additions & 0 deletions assets/scripts/config/regions.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,12 @@ export default {
us5: 'https://api.us5.datadoghq.com/api/intake/otlp/v1/metrics',
eu: 'https://api.datadoghq.eu/api/intake/otlp/v1/metrics'
},
otlp_logs_endpoint: {
us: 'https://http-intake.logs.datadoghq.com/api/v2/logs',
us3: 'https://http-intake.logs.us3.datadoghq.com/api/v2/logs',
us5: 'https://http-intake.logs.us5.datadoghq.com/api/v2/logs',
eu: 'https://http-intake.logs.datadoghq.eu/api/v2/logs'
},
custom_costs_endpoint: {
us: 'api.datadoghq.com/api/v2/cost/custom_costs',
us3: 'api.us3.datadoghq.com/api/v2/cost/custom_costs',
Expand Down
24 changes: 12 additions & 12 deletions config/_default/menus/main.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -473,15 +473,10 @@ menu:
url: agent/fleet_automation
parent: agent
weight: 8
- name: Upgrade the Agent
url: agent/upgrade
parent: agent
identifier: agent_upgrade
weight: 9
- name: Troubleshooting
url: agent/troubleshooting/
parent: agent
weight: 10
weight: 9
identifier: agent_troubleshooting
- name: Container Hostname Detection
identifier: agent_troubleshooting_hostname_containers
Expand Down Expand Up @@ -669,36 +664,41 @@ menu:
identifier: otel_ingest
parent: otel_interoperability
weight: 701
- name: OTLP Logs Intake Endpoint
url: /opentelemetry/otlp_logs
identifier: otel_otlp_logs
parent: otel_interoperability
weight: 702
- name: Trace Context Propagation
url: /opentelemetry/interoperability/trace_context_propagation
identifier: otel_propagation
parent: otel_interoperability
weight: 702
weight: 703
- name: OpenTelemetry API Support
url: /opentelemetry/interoperability/api_support
identifier: otel_instrumentation
parent: otel_interoperability
weight: 703
weight: 704
- name: OpenTelemetry Instrumentation Libraries
url: /opentelemetry/interoperability/instrumentation_libraries/
identifier: otel_instrumentation_libraries
parent: otel_interoperability
weight: 704
weight: 705
- name: Environment Variable Configuration
url: /opentelemetry/interoperability/environment_variable_support
identifier: otel_env_var_configuration
parent: otel_interoperability
weight: 705
weight: 706
- name: Correlate RUM and Traces
url: /opentelemetry/interoperability/connect_rum_and_traces
identifier: otel_rum
parent: otel_interoperability
weight: 706
weight: 707
- name: Correlate Logs and Traces
url: /tracing/other_telemetry/connect_logs_and_traces/opentelemetry/
identifier: otel_logs
parent: otel_interoperability
weight: 707
weight: 708
- name: Compatibility
url: opentelemetry/compatibility/
identifier: otel_compatibility
Expand Down
24 changes: 20 additions & 4 deletions content/en/account_management/login_methods.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,35 @@ The following login methods are available:

## Enabling or disabling a default login method

As an organization manager you can enable or disable the default login methods for your organization. New organizations start with **Datadog Username and Password** and **Sign in with Google** enabled and configured for all organizations and users. After you configure SAML, **Sign in with SAML** is also enabled.
As an organization manager, you can enable or disable the default login methods for your organization. New organizations start with **Datadog Username and Password** and **Sign in with Google** enabled and configured for all organizations and users. After you configure SAML, **Sign in with SAML** is also enabled.

1. Navigate to [Login Methods][3].
2. Set the **Enabled by Default** setting for each method to `On` or `Off`, according to your organization's preference or policy requirements.
3. Confirm your selection.

**Note**: You cannot disable all login methods for an organization. At least one login method must be enabled by default for your organization.

## Requiring Multi-factor Authentication

For enhanced security, organization managers can enforce [Multi-factor Authentication][4] (MFA) for all users in the organization that log in with an email and password.

1. Navigate to [Login Methods][3].
2. Set the **Require Multi-Factor Authentication** setting to `On` or `Off`, according to your organization's preference or policy requirements.
3. Confirm your selection.

Setting **Require Multi-Factor Authentication** to `On` has two effects:
- Users that log in with an email and password must register a second authentication factor before accessing the organization.
- In Login Methods, a link to [**View users without MFA**][5] appears. Click on the link to see the users list, filtered on users without MFA.

The setting to require multi-factor authentication is independent of the default login method settings. Regardless of which login methods you enable by default, enforcing MFA requires a second authentication factor for users that log in with an email and password.

## Reviewing user overrides

Using overrides, you can change the available login methods for individual users. In the following example, **Sign in with Google** is Off by default in the organization, but one user has it enabled by having an override set.

{{< img src="account_management/login_methods_disabled_overrides_set.png" alt="Login method disabled, with user override enabled" style="width:80%;">}}
{{< img src="account_management/login_methods_enabled_off.png" alt="Login method disabled, with user override enabled" style="width:80%;">}}

In [User Management][4], you can filter users by the override methods set, or view users who have the Default login methods enabled:
In [User Management][6], you can filter users by the override methods set, or view users who have the Default login methods enabled:

{{< img src="account_management/users/user_page_login_methods_override_view.png" alt="User Management view filtered to show users by login methods set." style="width:80%;">}}

Expand All @@ -40,4 +54,6 @@ You can edit the user's overrides or remove the override altogether to allow the
[1]: /account_management/users/#edit-a-users-login-methods
[2]: /account_management/saml/
[3]: https://app.datadoghq.com/organization-settings/login-methods
[4]: https://app.datadoghq.com/organization-settings/users
[4]: /account_management/multi-factor_authentication/
[5]: https://app.datadoghq.com/organization-settings/users?filter%5Ballowed_login_methods%5D=standard&filter%5Bmfa_enabled%5D=false&filter%5Bstatus%5D=Active
[6]: https://app.datadoghq.com/organization-settings/users
12 changes: 7 additions & 5 deletions content/en/account_management/multi-factor_authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Multi-Factor Authentication (MFA), or Two-Factor Authentication (2FA) requires a

- **MFA for native Datadog accounts**: MFA is available as an extra layer of security during login for accounts that log into Datadog directly using an email and password. Native email/password accounts are more vulnerable to attack than accounts maintained through an identity provider.
- **Opt-in MFA**: MFA is available for end users as an optional feature. Enable MFA at any time through your personal settings.
- **Mandatory MFA**: Administrators can require all users in an organization that log in with an email and password to register a second authentication factor before accessing the organization. To turn on MFA enforcement, see [Login methods][1].
- **Authenticator apps**: Any authenticator app that supports time-based one-time password (TOTP) authentication can be used for MFA. Examples include Microsoft Authenticator, Google Authenticator, Authy, and Duo.

## Limitations
Expand All @@ -24,7 +25,7 @@ To configure MFA for your account, log in using your **email and password**. Use

## Configure MFA for your user account

To find the [Password & Authentication page][1]:
To find the [Password & Authentication page][2]:

1. Ensure you are logged in with a username and password combination, not through SSO.
1. Navigate to **Personal Settings** from your account menu.
Expand All @@ -47,7 +48,7 @@ To view if a user has MFA configured or not, you can filter on the Users table.

If you don't have access to your authenticator app, during the login process you can use a recovery code instead of a one-time password. Each of the recovery codes can only be used once.

1. Navigate to the [login page][2].
1. Navigate to the [login page][3].
1. Enter your email address and password, then select **Log in**.
1. Select **Don't have access to your authenticator?**
1. Enter one of your unused recovery codes and click **Verify**.
Expand All @@ -56,7 +57,7 @@ If you don't have access to your authenticator app, during the login process you

If you don't have access to your authenticator app or recovery codes, during the login process you can request a one-time recovery link via email.

1. Navigate to the [login page][2].
1. Navigate to the [login page][3].
1. Enter your email address and password, then select **Log in**.
1. Select **Don't have access to your authenticator?**
1. Select **Don't have access to your recovery codes? Get a one time recovery link via email.**
Expand All @@ -65,5 +66,6 @@ If you don't have access to your authenticator app or recovery codes, during the

If you have lost access to your registered authenticator app, Datadog recommends that you remove the lost device and add a new one. Maintaining a valid authenticator app helps prevent issues logging into your account in the future.

[1]: https://app.datadoghq.com/personal-settings/password-and-authentication
[2]: https://app.datadoghq.com
[1]: /account_management/login_methods/#requiring-multi-factor-authentication
[2]: https://app.datadoghq.com/personal-settings/password-and-authentication
[3]: https://app.datadoghq.com
1 change: 1 addition & 0 deletions content/en/agent/guide/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ cascade:
{{< /whatsnext >}}

{{< whatsnext desc="Agent versioning guides:" >}}
{{< nextlink href="agent/guide/upgrade" >}}Upgrade to Agent 7{{< /nextlink >}}
{{< nextlink href="agent/guide/version_differences" >}}Agent Version differences{{< /nextlink >}}
{{< nextlink href="agent/guide/upgrade_between_minor_versions" >}}Upgrade Between Minor Versions of the Datadog Agent{{< /nextlink >}}
{{< nextlink href="agent/guide/agent-v6-python-3" >}}Python version management: Use Python 3 with Datadog Agent v6{{< /nextlink >}}
Expand Down
1 change: 0 additions & 1 deletion content/en/agent/guide/dogstream.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ aliases:
<div class="alert alert-danger">
This is a deprecated feature of Agent 5. New feature releases are discontinued.
<br>
Agent v6 is available! <a href="https://github.com/DataDog/datadog-agent/blob/master/docs/agent/upgrade.md">Upgrade to the newest version</a> to benefit from the new functionality.
</div>

Log files contain tons of valuable application and business data.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Upgrade to Datadog Agent 7
aliases:
- /agent/versions/upgrade_to_agent_v7/
- /agent/upgrade/
further_reading:
- link: "/agent/guide/python-3/"
tag: "Documentation"
Expand Down
2 changes: 1 addition & 1 deletion content/en/api/v1/synthetics/examples.json
Original file line number Diff line number Diff line change
Expand Up @@ -4550,7 +4550,7 @@
],
"to_ts": 0
},
"html": "<div class=\"\"><div class=\"row \">\n <div class=\"col-12 first-column\">\n <div class=\"row first-row \">\n <div class=\"col-4 column\">\n <p class=\"key\">from_ts&nbsp;[<em>required</em>]</p>\n </div>\n <div class=\"col-2 column\"><p>int64</p></div>\n <div class=\"col-6 column\"><p>Timestamp in seconds (Unix epoch) for the start of uptime.</p></div>\n </div>\n \n </div>\n </div><div class=\"row \">\n <div class=\"col-12 first-column\">\n <div class=\"row first-row \">\n <div class=\"col-4 column\">\n <p class=\"key\">public_ids&nbsp;[<em>required</em>]</p>\n </div>\n <div class=\"col-2 column\"><p>[string]</p></div>\n <div class=\"col-6 column\"><p>An array of Synthetic test IDs you want to delete.</p></div>\n </div>\n \n </div>\n </div><div class=\"row \">\n <div class=\"col-12 first-column\">\n <div class=\"row first-row \">\n <div class=\"col-4 column\">\n <p class=\"key\">to_ts&nbsp;[<em>required</em>]</p>\n </div>\n <div class=\"col-2 column\"><p>int64</p></div>\n <div class=\"col-6 column\"><p>Timestamp in seconds (Unix epoch) for the end of uptime.</p></div>\n </div>\n \n </div>\n </div></div>"
"html": "<div class=\"\"><div class=\"row \">\n <div class=\"col-12 first-column\">\n <div class=\"row first-row \">\n <div class=\"col-4 column\">\n <p class=\"key\">from_ts&nbsp;[<em>required</em>]</p>\n </div>\n <div class=\"col-2 column\"><p>int64</p></div>\n <div class=\"col-6 column\"><p>Timestamp in seconds (Unix epoch) for the start of uptime.</p></div>\n </div>\n \n </div>\n </div><div class=\"row \">\n <div class=\"col-12 first-column\">\n <div class=\"row first-row \">\n <div class=\"col-4 column\">\n <p class=\"key\">public_ids&nbsp;[<em>required</em>]</p>\n </div>\n <div class=\"col-2 column\"><p>[string]</p></div>\n <div class=\"col-6 column\"><p>An array of Synthetic test IDs you want uptimes for.</p></div>\n </div>\n \n </div>\n </div><div class=\"row \">\n <div class=\"col-12 first-column\">\n <div class=\"row first-row \">\n <div class=\"col-4 column\">\n <p class=\"key\">to_ts&nbsp;[<em>required</em>]</p>\n </div>\n <div class=\"col-2 column\"><p>int64</p></div>\n <div class=\"col-6 column\"><p>Timestamp in seconds (Unix epoch) for the end of uptime.</p></div>\n </div>\n \n </div>\n </div></div>"
}
},
"GetTest": {
Expand Down
7 changes: 4 additions & 3 deletions content/en/cloud_cost_management/google_cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,11 @@ Continue to follow the steps indicated in [Setup & Configuration][3].
## Cost types
You can visualize your ingested data using the following cost types:

| Cost Type | Description |
| ----------| ----------------------------------|
| `gcp.cost.amortized` | Total cost of resources allocated at the time of usage over an interval. Costs include promotion credits as well as committed usage discount credits. |
| Cost Type | Description |
|-------------------------------------------------| ----------------------------------|
| `gcp.cost.amortized` | Total cost of resources allocated at the time of usage over an interval. Costs include promotion credits as well as committed usage discount credits. |
| `gcp.cost.amortized.shared.resources.allocated` | All of your Google Cloud Platform amortized costs, with additional breakdowns and insights for container workloads. Requires [container cost allocation][14].|
| `gcp.cost.ondemand` | Total public, on-demand cost of resources before public and private discounts are applied over an interval. |

### Out-of-the-box tags
Datadog adds out-of-the-box tags to ingested cost data to help you further break down and allocate your costs. These tags are derived from your [detailed usage cost report][16] and make it easier to discover and understand cost data.
Expand Down
Loading

0 comments on commit c3df061

Please sign in to comment.