Skip to content

Commit

Permalink
Merge branch 'master' into may/remove-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
maycmlee authored Oct 28, 2024
2 parents 08ccf47 + 6386512 commit 8b3705e
Show file tree
Hide file tree
Showing 98 changed files with 10,291 additions and 1,745 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-10-25 13:07:12.077590",
"spec_repo_commit": "a2f558e8"
"regenerated": "2024-10-28 10:24:44.676000",
"spec_repo_commit": "2e09a3ec"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-10-25 13:07:19.967111",
"spec_repo_commit": "a2f558e8"
"regenerated": "2024-10-28 10:24:52.380008",
"spec_repo_commit": "2e09a3ec"
}
}
}
8 changes: 6 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
### Merge instructions
<!-- If you want us to merge this PR as soon as we've reviewed, check the box below. If you're waiting for a release or there are other considerations that you want us to be aware of, list them below. -->

- [ ] Please merge after reviewing
Merge queue is enabled in this repo. To have it automatically merged after it receives the required reviews, create the PR (from a branch that follows the `<yourname>/description` naming convention) and then add the following PR comment:

```
/merge
```

### Additional notes
<!-- Anything else we should know when reviewing?-->

<!-- Previewing the PR: Assuming you are a Datadog employee and named your branch `<yourname>/<description>`, a preview build will run and links to the preview output will be auto-generated and posted in the PR comments. The links will 404 until the preview build is finished running. -->
<!-- Previewing the PR: Assuming you are a Datadog employee and named your branch `<yourname>/<description>`, a preview build will run and links to the preview output will be auto-generated and posted in the PR comments. The links will 404 until the preview build is finished running. -->
2 changes: 1 addition & 1 deletion config/_default/menus/main.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5163,7 +5163,7 @@ menu:
parent: log_collection
identifier: log_collection_java
weight: 110
- name: NodeJS
- name: Node.js
identifier: log_collection_nodejs
url: logs/log_collection/nodejs/
parent: log_collection
Expand Down
2 changes: 1 addition & 1 deletion config/_default/menus/main.fr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4797,7 +4797,7 @@ menu:
parent: log_collection
identifier: log_collection_java
weight: 109
- name: NodeJS
- name: Node.js
identifier: log_collection_nodejs
url: logs/log_collection/nodejs/
parent: log_collection
Expand Down
2 changes: 1 addition & 1 deletion config/_default/menus/main.ja.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4797,7 +4797,7 @@ menu:
parent: log_collection
identifier: log_collection_java
weight: 109
- name: NodeJS
- name: Node.js
identifier: log_collection_nodejs
url: logs/log_collection/nodejs/
parent: log_collection
Expand Down
593 changes: 487 additions & 106 deletions content/en/api/v1/synthetics/examples.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion content/en/database_monitoring/setup_mongodb/mongodbatlas.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ The Datadog Agent requires read-only access to the MongoDB Atlas Cluster to coll
4. Add the following permissions to the custom role:
- `read` on the `admin` database
- `read` on the `local` database
- `read` on the `config` database (Sharded Cluster only)
- `clusterMonitor` on the `admin` database
- `read` on the databases you want to monitor, or `readAnyDatabase` to monitor all databases
- `read` on the user created databases you want to monitor, or `readAnyDatabase` to monitor all databases
5. Click **Add Custom Role**.

#### Create a monitoring user with the custom monitoring role
Expand Down
27 changes: 17 additions & 10 deletions content/en/ddsql_editor/reference/expressions_and_operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,27 @@ DDSQL implements the following comparison operators:

For tag references and tag groups, the equality operator (`=`) is treated as a "contains" comparison. See the [Querying Tags in DDSQL][1] for more details.

Additionally, DDSQL supports the following SQL keywords, which function as standard boolean operators:
## SQL comparison keywords

- `NOT`
- `AND`
- `OR`
DDSQL supports the following SQL keywords, which function as standard Boolean operators:

| Operator | Description | Example | Result |
|----------|------------------------|---------|--------|
| `NOT` | Filter records based on more than one condition. | `SELECT * FROM host WHERE NOT env = 'prod';` | Return all hosts that are not in the prod environment. |
| `AND` | Filter records based on more than one condition. | `SELECT * FROM host WHERE env = 'prod' AND cloud_provider = 'aws';` | Return all hosts that are in the prod environment and the AWS cloud provider. |
| `OR` | Filter records based on more than one condition. | `SELECT * FROM host WHERE env = 'prod' AND cloud_provider = 'aws';` | Return all hosts that are either in the prod environment or the aws cloud provider. |

DDSQL also supports the following comparator keywords as they are defined in the SQL standard:

- `IS NULL`
- `IS NOT NULL`
- `LIKE`
- `NOT LIKE`
- `IN`
- `NOT IN`
| Operator | Description | Example | Result |
|--------------|------------------------|---------|--------|
| `IS NULL` | Select rows if the specified field is null. | `SELECT * FROM host WHERE cloud_provider IS NULL;` | Return all rows that contain no data in the `cloud_provider` column. |
| `IS NOT NULL`| Select rows if the specified field is not null. Exclude rows with missing data. | `SELECT * FROM host WHERE cloud_provider IS NOT NULL;` | Return all rows that contain data in the `cloud_provider` column. |
| `LIKE` | Search for a specific pattern in a string value. You can use the following wildcard characters to define the patterns: <br>**Percent sign (%)**: Represents zero, one, or multiple characters. <br>**Underscore (_)**: Represents a single character. | `SELECT * FROM aws_eks_cluster WHERE LOWER(logging) LIKE '%"enabled":true%';` | Return all rows from the `aws_eks_cluster` table where the `logging` column is `"enabled":true`. |
| `NOT LIKE` | Exclude rows from a search, where the row has a specific pattern in a string value. You can use the wildcards `%` and `_` for pattern matching. | `SELECT * FROM aws_eks_cluster WHERE LOWER(logging) NOT LIKE '%"enabled":true%';` | Return all rows from the `aws_eks_cluster` table where the `logging` does **not** have `"enabled":true%'`. |
| `IN` | Find multiple values in a `WHERE` clause. The `IN` operator is shorthand for multiple `OR` conditions. | `SELECT * FROM host WHERE cloud_provider IN ('aws', 'gcp');` | Return all rows from `host` table where the `cloud_provider` value is either 'aws' or 'gcp'.|
| `NOT IN` | Replace a set of arguments with the `<>` or `!=` operator that is combined with the `AND` operator| `SELECT * FROM host WHERE cloud_provider NOT IN ('aws', 'gcp');` | Return all rows where `cloud_provider` is not `aws` or `gcp`. |


DDSQL supports the `BETWEEN` keyword such that `a BETWEEN x AND y` is equivalent to `a >= x AND a <= y`. See [the Postgres documentation for `BETWEEN`][2] for details.

Expand Down
2 changes: 1 addition & 1 deletion content/en/developers/community/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ This is for a [FreeSwitch ESL][30] application to export statistics to Datadog u

Heroku emits dyno metrics through logs. To convert these logs into metrics and send them to Datadog, use one of the following log drains. To send your Heroku logs to Datadog, see [Collect Heroku logs][34].

* [Heroku Datadog Log Drain][35] written in Nodejs by [Oz][36].
* [Heroku Datadog Log Drain][35] written in Node.js by [Oz][36].
* [Heroku Datadog Log Drain][37] written in Go by [Apiary][38].

To use the PHP tracer or profiler on Heroku, use the following buildpack.
Expand Down
2 changes: 1 addition & 1 deletion content/en/developers/dogstatsd/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ aliases:
further_reading:
- link: 'integrations/node'
tag: 'Documentation'
text: 'Enable DogStatsD for NodeJS through the NodeJS integration'
text: 'Enable DogStatsD for Node.js through the Node.js integration'
- link: 'developers/dogstatsd'
tag: 'Documentation'
text: 'Introduction to DogStatsD'
Expand Down
4 changes: 2 additions & 2 deletions content/en/integrations/guide/source-code-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ If you are using a host, you have two options: using Microsoft SourceLink or con
{{% sci-dd-git-env-variables %}}

{{% /tab %}}
{{% tab "NodeJS" %}}
{{% tab "Node.js" %}}

<div class="alert alert-info">The NodeJS client library version 3.21.0 or later is required.</div>
<div class="alert alert-info">The Node.js client library version 3.21.0 or later is required.</div>

#### Containers

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ See the full list of [Log Management Default Standard Attributes][9], which is s
| [Network/communications][10] | These attributes are related to the data used in network communication. All fields and metrics are prefixed by `network`. |
| [Geolocation][11] | These attributes are related to the geolocation of IP addresses used in network communication. All fields are prefixed by `network.client.geoip` or `network.destination.geoip`. |
| [HTTP Requests][12] | These attributes are related to data commonly used in HTTP requests and accesses. All attributes are prefixed by `http`. Typical integrations relying on these attributes include [Apache][4], Rails, [AWS CloudFront][13], web applications servers, and so forth. URL details attributes are prefixed by `http.url_details`. These attributes provide details about the parsed parts of the HTTP URL. They are generated by the [URL parser][14]. |
| [Source code][15] | These attributes are related to data used when a log or an error is generated using a logger in a custom application. All attributes are prefixed either by `logger` or `error`. Typical integrations relying on these attributes are Java, NodeJs, .NET, Golang, Python, and so on. |
| [Source code][15] | These attributes are related to data used when a log or an error is generated using a logger in a custom application. All attributes are prefixed either by `logger` or `error`. Typical integrations relying on these attributes are Java, Node.js, .NET, Golang, Python, and so on. |
| [Database][16] | Typical integrations relying on these attributes are [Cassandra][17], [MySQL][18], [RDS][19], [Elasticsearch][20], and so on. |
| [Performance][21] | These attributes are related to performance metrics. Datadog recommends [remapping][22] any durations within your logs on this attribute since they are displayed and used as a default [measure][1] for [trace search][23]. |
| [User related attributes][24] | All attributes and measures are prefixed by `usr`. |
Expand Down
5 changes: 4 additions & 1 deletion content/en/quality_gates/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ further_reading:
- link: "/account_management/audit_trail/"
tag: "Documentation"
text: "Learn about Audit Trail"
- link: "https://www.datadoghq.com/blog/datadog-flaky-tests/"
tag: "Blog"
text: "Flaky tests: their hidden costs and how to address flaky behavior"
---

{{< site-region region="gov" >}}
Expand Down Expand Up @@ -145,4 +148,4 @@ For more information, see the [Audit Trail documentation][4].
[9]: /tests/
[10]: /continuous_integration/
[11]: /code_analysis/static_analysis
[12]: /code_analysis/software_composition_analysis
[12]: /code_analysis/software_composition_analysis
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ code_lang_weight: 50

The following application security capabilities are supported in the Node.js library, for the specified tracer version:

| Application Security capability | Minimum NodeJS tracer version |
| Application Security capability | Minimum Node.js tracer version |
|----------------------------------------|----------------------------------------------------|
| Threat Detection | 4.0.0 |
| Threat Protection | 4.0.0 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ To get full instrumentation, ensure you are calling `datadog-init` as the first
### Get started

{{< tabs >}}
{{% tab "NodeJS" %}}
{{% tab "Node.js" %}}
Add the following instructions and arguments to your Dockerfile.

```dockerfile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ code_lang_weight: 50

The following application security capabilities are supported in the Node.js library, for the specified tracer version:

| Application Security capability | Minimum NodeJS tracer version |
| Application Security capability | Minimum Node.js tracer version |
|----------------------------------------|----------------------------------------------------|
| Threat Detection | 4.0.0 |
| Threat Protection | 4.0.0 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ The following examples show how to track login events or custom events (using si

{{< /programming-lang >}}
{{< programming-lang lang="nodejs" >}}
Starting in dd-trace-js v3.13.1, you can use the NodeJS tracer's API to track user events.
Starting in dd-trace-js v3.13.1, you can use the Node.js tracer's API to track user events.

The following examples show how to track login events or custom events (using signup as an example).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ code_lang_weight: 50

The following application security capabilities are supported in the Node.js library, for the specified tracer version:

| Application Security capability | Minimum NodeJS tracer version |
| Application Security capability | Minimum Node.js tracer version |
|----------------------------------------|----------------------------------------------------|
| Threat Detection | 4.0.0 |
| Threat Protection | 4.0.0 |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Enabling ASM for NodeJs
title: Enabling ASM for Node.js
code_lang: nodejs
type: multi-code-lang
code_lang_weight: 50
Expand Down Expand Up @@ -29,15 +29,15 @@ You can monitor application security for Node.js apps running in Docker, Kuberne
## Enabling threat detection
### Get started

1. **Update your Datadog Node.js library package** to at least version 5.0.0 (for Node 18+) or 4.0.0 (for Node 16+) or 3.10.0 (for NodeJS 14+), by running one of these commands:
1. **Update your Datadog Node.js library package** to at least version 5.0.0 (for Node 18+) or 4.0.0 (for Node 16+) or 3.10.0 (for Node.js 14+), by running one of these commands:
```shell
npm install dd-trace@^5
npm install dd-trace@^4
npm install dd-trace@^3.10.0
```
Use this [migration guide][1] to assess any breaking changes if you upgraded your library.

Application Security Management is compatible with Express v4+ and NodeJS v14+. For additional information, see [Compatibility][2].
Application Security Management is compatible with Express v4+ and Node.js v14+. For additional information, see [Compatibility][2].

2. **Where you import and initialize the Node.js library for APM, also enable ASM.** This might be either in your code or with environment variables. If you initialized APM in code, add `{appsec: true}` to your init statement:
{{< tabs >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ See the Application Security product set up documentation to validate you you ar

### Ensure the communication of telemetry data

Ensure the `DD_INSTRUMENTATION_TELEMETRY_ENABLED` environment variable (`DD_TRACE_TELEMETRY_ENABLED` for NodeJS) is set to `true`, or the corresponding system property for your language is enabled. For example in Java: `-Ddd.instrumentation.telemetry.enabled=true`
Ensure the `DD_INSTRUMENTATION_TELEMETRY_ENABLED` environment variable (`DD_TRACE_TELEMETRY_ENABLED` for Node.js) is set to `true`, or the corresponding system property for your language is enabled. For example in Java: `-Ddd.instrumentation.telemetry.enabled=true`

## Disabling threat management and protection

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The following table summarizes the CSM features available relative to each deplo
| Kubernetes | {{< X >}} | {{< X >}} | {{< X >}} | {{< X >}} | | |
| Linux | {{< X >}} | {{< X >}} | {{< X >}} | {{< X >}} | | |
| Amazon ECS/EKS | {{< X >}} | {{< X >}} | {{< X >}} | {{< X >}} | | |
| Windows | {{< X >}} | | {{< X >}} | beta | | |
| Windows | {{< X >}} | | {{< X >}} | {{< X >}} | | |
| AWS Fargate ECS/EKS | {{< X >}} | | beta | | | |

The following table summarizes the scope of coverage available relative to each CSM feature.
Expand All @@ -28,7 +28,7 @@ The following table summarizes the scope of coverage available relative to each
| Kubernetes Cluster | {{< X >}} | {{< X >}} | | | |
| Docker Host | {{< X >}} | | | | |
| Linux Host | {{< X >}} | {{< X >}} | {{< X >}} | | {{< X >}} |
| Windows Host | | {{< X >}} | beta | | |
| Windows Host | | {{< X >}} | {{< X >}} | | |
| Docker Container | | {{< X >}} | | | |
| Container Image | | | {{< X >}} | | {{< X >}} |
| IAM in AWS Account | | | | {{< X >}} | |
Expand Down
Loading

0 comments on commit 8b3705e

Please sign in to comment.