Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/base/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const DATADOG_SITE_US3 = 'us3.datadoghq.com'
export const DATADOG_SITE_US5 = 'us5.datadoghq.com'
export const DATADOG_SITE_AP1 = 'ap1.datadoghq.com'
export const DATADOG_SITE_AP2 = 'ap2.datadoghq.com'
export const DATADOG_SITE_UK1 = 'uk1.datadoghq.com'
export const DATADOG_SITE_GOV = 'ddog-gov.com'
export const DATADOG_SITE_US2_GOV = 'us2.ddog-gov.com'

Expand All @@ -14,6 +15,7 @@ export const DATADOG_SITES: string[] = [
DATADOG_SITE_US5,
DATADOG_SITE_AP1,
DATADOG_SITE_AP2,
DATADOG_SITE_UK1,
DATADOG_SITE_GOV,
DATADOG_SITE_US2_GOV,
]
Expand Down
3 changes: 3 additions & 0 deletions packages/base/src/helpers/__tests__/validation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ describe('validation', () => {
expect(isValidDatadogSite('ap2.datadoghq.com')).toBe(true)
expect(isValidDatadogSite('AP2.datadoghq.com')).toBe(true)

expect(isValidDatadogSite('uk1.datadoghq.com')).toBe(true)
expect(isValidDatadogSite('UK1.datadoghq.com')).toBe(true)

expect(isValidDatadogSite('us3.datadoghq.com')).toBe(true)
expect(isValidDatadogSite('US3.datadoghq.com')).toBe(true)

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-cloud-run/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ You must expose these environment variables in the environment where you are run
| Environment Variable | Description | Example |
| -------------------- | ----------- | ------- |
| `DD_API_KEY` | Datadog API Key. Sets the `DD_API_KEY` environment variable on your Cloud Run service. | `export DD_API_KEY=<API_KEY>` |
| `DD_SITE` | Set which Datadog site to send data. Possible values are `datadoghq.com`, `datadoghq.eu`, `us3.datadoghq.com`, `us5.datadoghq.com`, `ap1.datadoghq.com`, `ap2.datadoghq.com`, `ddog-gov.com`, and `us2.ddog-gov.com`. The default is `datadoghq.com`. | `export DD_SITE=datadoghq.com` |
| `DD_SITE` | Set which Datadog site to send data. Possible values are `datadoghq.com`, `datadoghq.eu`, `us3.datadoghq.com`, `us5.datadoghq.com`, `ap1.datadoghq.com`, `ap2.datadoghq.com`, `uk1.datadoghq.com`, `ddog-gov.com`, and `us2.ddog-gov.com`. The default is `datadoghq.com`. | `export DD_SITE=datadoghq.com` |

### Arguments

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-container-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ You must expose these environment variables in the environment where you are run
| Environment Variable | Description | Example |
| -------------------- | ----------- | ------- |
| `DD_API_KEY` | **Required**. Datadog API Key. Sets the `DD_API_KEY` environment variable on your Container App. For more information about getting a Datadog API key, see the [API key documentation][1]. | `export DD_API_KEY=<API_KEY>` |
| `DD_SITE` | Set which Datadog site to send data to. Possible values are `datadoghq.com`, `datadoghq.eu`, `us3.datadoghq.com`, `us5.datadoghq.com`, `ap1.datadoghq.com`, `ap2.datadoghq.com`, `ddog-gov.com`, and `us2.ddog-gov.com`. The default is `datadoghq.com`. | `export DD_SITE=datadoghq.com` |
| `DD_SITE` | Set which Datadog site to send data to. Possible values are `datadoghq.com`, `datadoghq.eu`, `us3.datadoghq.com`, `us5.datadoghq.com`, `ap1.datadoghq.com`, `ap2.datadoghq.com`, `uk1.datadoghq.com`, `ddog-gov.com`, and `us2.ddog-gov.com`. The default is `datadoghq.com`. | `export DD_SITE=datadoghq.com` |

### Arguments

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-lambda/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ You must expose these environment variables in the environment where you are run
| `DATADOG_API_KEY` | Datadog API Key. Sets the `DD_API_KEY` environment variable on your Lambda function configuration. For more information about getting a Datadog API key, see the [API key documentation][5]. | `export DATADOG_API_KEY=<API_KEY>` |
| `DATADOG_API_KEY_SECRET_ARN` | The ARN of the secret storing the Datadog API key in AWS Secrets Manager. Sets the `DD_API_KEY_SECRET_ARN` on your Lambda function configuration. Notes: `DD_API_KEY_SECRET_ARN` is ignored when `DD_KMS_API_KEY` is set. Add the `secretsmanager:GetSecretValue` permission to the Lambda execution role. | `export DATADOG_API_KEY_SECRET_ARN=<SECRETS_MANAGER_RESOURCE_ARN>` |
| `DATADOG_KMS_API_KEY` | Datadog API Key encrypted using KMS. Sets the `DD_KMS_API_KEY` environment variable on your Lambda function configuration. Note: `DD_API_KEY` is ignored when `DD_KMS_API_KEY` is set. | `export DATADOG_KMS_API_KEY=<KMS_ENCRYPTED_API_KEY>` |
| `DATADOG_SITE` | Set which Datadog site to send data. Only needed when using the Datadog Lambda Extension. Possible values are `datadoghq.com` , `datadoghq.eu` , `us3.datadoghq.com`, `us5.datadoghq.com`, `ap1.datadoghq.com`, `ap2.datadoghq.com`, `ddog-gov.com`, and `us2.ddog-gov.com`. The default is `datadoghq.com`. Sets the `DD_SITE` environment variable on your Lambda function configurations. | `export DATADOG_SITE="datadoghq.com"` |
| `DATADOG_SITE` | Set which Datadog site to send data. Only needed when using the Datadog Lambda Extension. Possible values are `datadoghq.com` , `datadoghq.eu` , `us3.datadoghq.com`, `us5.datadoghq.com`, `ap1.datadoghq.com`, `ap2.datadoghq.com`, `uk1.datadoghq.com`, `ddog-gov.com`, and `us2.ddog-gov.com`. The default is `datadoghq.com`. Sets the `DD_SITE` environment variable on your Lambda function configurations. | `export DATADOG_SITE="datadoghq.com"` |


### Arguments
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ describe('instrument', () => {
}
}
expect(error?.message).toBe(
'Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, ap1.datadoghq.com, ap2.datadoghq.com, ddog-gov.com, or us2.ddog-gov.com.'
'Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, ap1.datadoghq.com, ap2.datadoghq.com, uk1.datadoghq.com, ddog-gov.com, or us2.ddog-gov.com.'
)
})

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-lambda/src/functions/instrument.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export const calculateUpdateRequest = async (
changedEnvVars[SITE_ENV_VAR] = site
} else {
throw new Error(
'Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, ap1.datadoghq.com, ap2.datadoghq.com, ddog-gov.com, or us2.ddog-gov.com.'
'Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, ap1.datadoghq.com, ap2.datadoghq.com, uk1.datadoghq.com, ddog-gov.com, or us2.ddog-gov.com.'
)
}
}
Expand Down
Loading