Skip to content

Commit e7d6c25

Browse files
Merge master into datadog-api-spec/test/jmallma/event-intake-v2
2 parents 92baa17 + eba2406 commit e7d6c25

File tree

11 files changed

+65
-27
lines changed

11 files changed

+65
-27
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-11-15 19:35:10.102953",
8-
"spec_repo_commit": "ad80112e"
7+
"regenerated": "2024-11-19 18:07:22.354004",
8+
"spec_repo_commit": "f858f395"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-11-15 19:35:10.121640",
13-
"spec_repo_commit": "ad80112e"
12+
"regenerated": "2024-11-19 18:07:22.372908",
13+
"spec_repo_commit": "f858f395"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36442,7 +36442,8 @@ tags:
3644236442
name: Logs
3644336443
- description: 'Manage configuration of [log indexes](https://docs.datadoghq.com/logs/indexes/).
3644436444

36445-
You need an API and application key with Admin rights to interact with this endpoint.'
36445+
You need an API and non-scoped application key with Admin rights to interact with
36446+
these endpoints.'
3644636447
externalDocs:
3644736448
description: Find out more at
3644836449
url: https://docs.datadoghq.com/logs/indexes/
@@ -36454,11 +36455,12 @@ tags:
3645436455
about processors can be found in the\n [processors documentation](https://docs.datadoghq.com/logs/log_configuration/processors/?tab=api#lookup-processor).\n\n-
3645536456
For more information about Pipelines, see the\n [pipeline documentation](https://docs.datadoghq.com/logs/log_configuration/pipelines).\n\n**Notes:**\n\nThese
3645636457
endpoints are only available for admin users.\nMake sure to use an application
36457-
key created by an admin.\n\n**Grok parsing rules may effect JSON output and require\nreturned
36458-
data to be configured before using in a request.**\nFor example, if you are using
36459-
the data returned from a\nrequest for another request body, and have a parsing
36460-
rule\nthat uses a regex pattern like `\\s` for spaces, you will\nneed to configure
36461-
all escaped spaces as `%{space}` to use\nin the body data."
36458+
key created by an admin with no applied scopes.\n\n**Grok parsing rules may effect
36459+
JSON output and require\nreturned data to be configured before using in a request.**\nFor
36460+
example, if you are using the data returned from a\nrequest for another request
36461+
body, and have a parsing rule\nthat uses a regex pattern like `\\s` for spaces,
36462+
you will\nneed to configure all escaped spaces as `%{space}` to use\nin the body
36463+
data."
3646236464
externalDocs:
3646336465
description: Find out more at
3646436466
url: https://docs.datadoghq.com/logs/log_configuration

.generator/schemas/v2/openapi.yaml

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27189,6 +27189,7 @@ components:
2718927189
security_monitoring_rules_read: Read Detection Rules.
2719027190
security_monitoring_rules_write: Create and edit Detection Rules.
2719127191
security_monitoring_signals_read: View Security Signals.
27192+
security_monitoring_signals_write: Edit Security Signals.
2719227193
security_monitoring_suppressions_read: Read Rule Suppressions.
2719327194
security_monitoring_suppressions_write: Write Rule Suppressions.
2719427195
security_pipelines_read: View Security Pipelines.
@@ -40801,11 +40802,16 @@ paths:
4080140802
security:
4080240803
- apiKeyAuth: []
4080340804
appKeyAuth: []
40804-
- AuthZ: []
40805+
- AuthZ:
40806+
- security_monitoring_rules_write
4080540807
summary: Run a historical job
4080640808
tags:
4080740809
- Security Monitoring
4080840810
x-codegen-request-body-name: body
40811+
x-permission:
40812+
operator: OR
40813+
permissions:
40814+
- security_monitoring_rules_write
4080940815
x-unstable: '**Note**: This endpoint is in beta and may be subject to changes.
4081040816

4081140817
Please check the documentation regularly for updates.'
@@ -40835,11 +40841,16 @@ paths:
4083540841
security:
4083640842
- apiKeyAuth: []
4083740843
appKeyAuth: []
40838-
- AuthZ: []
40844+
- AuthZ:
40845+
- security_monitoring_signals_write
4083940846
summary: Convert a job result to a signal
4084040847
tags:
4084140848
- Security Monitoring
4084240849
x-codegen-request-body-name: body
40850+
x-permission:
40851+
operator: OR
40852+
permissions:
40853+
- security_monitoring_signals_write
4084340854
x-unstable: '**Note**: This endpoint is in beta and may be subject to changes.
4084440855

4084540856
Please check the documentation regularly for updates.'
@@ -40897,10 +40908,15 @@ paths:
4089740908
security:
4089840909
- apiKeyAuth: []
4089940910
appKeyAuth: []
40900-
- AuthZ: []
40911+
- AuthZ:
40912+
- security_monitoring_rules_read
4090140913
summary: Get a job's details
4090240914
tags:
4090340915
- Security Monitoring
40916+
x-permission:
40917+
operator: OR
40918+
permissions:
40919+
- security_monitoring_rules_read
4090440920
x-unstable: '**Note**: This endpoint is in beta and may be subject to changes.
4090540921

4090640922
Please check the documentation regularly for updates.'
@@ -40928,10 +40944,15 @@ paths:
4092840944
security:
4092940945
- apiKeyAuth: []
4093040946
appKeyAuth: []
40931-
- AuthZ: []
40947+
- AuthZ:
40948+
- security_monitoring_rules_write
4093240949
summary: Cancel a historical job
4093340950
tags:
4093440951
- Security Monitoring
40952+
x-permission:
40953+
operator: OR
40954+
permissions:
40955+
- security_monitoring_rules_write
4093540956
x-unstable: '**Note**: This endpoint is in beta and may be subject to changes.
4093640957

4093740958
Please check the documentation regularly for updates.'
@@ -43809,7 +43830,11 @@ tags:
4380943830

4381043831
See the [Archives Page](https://app.datadoghq.com/logs/pipelines/archives)
4381143832

43812-
for a list of the archives currently configured in Datadog.'
43833+
for a list of the archives currently configured in Datadog.
43834+
43835+
43836+
You need an API and non-scoped application key with Admin rights to interact with
43837+
these endpoints.'
4381343838
externalDocs:
4381443839
description: Find out more at
4381543840
url: https://docs.datadoghq.com/logs/archives/
@@ -43828,8 +43853,11 @@ tags:
4382843853
description: Find out more at
4382943854
url: https://docs.datadoghq.com/logs/log_configuration/forwarding_custom_destinations/
4383043855
name: Logs Custom Destinations
43831-
- description: Manage configuration of [log-based metrics](https://app.datadoghq.com/logs/pipelines/generate-metrics)
43856+
- description: 'Manage configuration of [log-based metrics](https://app.datadoghq.com/logs/pipelines/generate-metrics)
4383243857
for your organization.
43858+
43859+
You need an API and non-scoped application key with Admin rights to interact with
43860+
these endpoints.'
4383343861
externalDocs:
4383443862
description: Find out more at
4383543863
url: https://docs.datadoghq.com/logs/logs_to_metrics/

src/datadogV1/api/api_logs_indexes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pub enum UpdateLogsIndexOrderError {
6363
}
6464

6565
/// Manage configuration of [log indexes](<https://docs.datadoghq.com/logs/indexes/>).
66-
/// You need an API and application key with Admin rights to interact with this endpoint.
66+
/// You need an API and non-scoped application key with Admin rights to interact with these endpoints.
6767
#[derive(Debug, Clone)]
6868
pub struct LogsIndexesAPI {
6969
config: datadog::Configuration,

src/datadogV1/api/api_logs_pipelines.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub enum UpdateLogsPipelineOrderError {
8686
/// **Notes:**
8787
///
8888
/// These endpoints are only available for admin users.
89-
/// Make sure to use an application key created by an admin.
89+
/// Make sure to use an application key created by an admin with no applied scopes.
9090
///
9191
/// **Grok parsing rules may effect JSON output and require
9292
/// returned data to be configured before using in a request.**

src/datadogV2/api/api_logs_archives.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ pub enum UpdateLogsArchiveOrderError {
9494
///
9595
/// See the [Archives Page](<https://app.datadoghq.com/logs/pipelines/archives>)
9696
/// for a list of the archives currently configured in Datadog.
97+
///
98+
/// You need an API and non-scoped application key with Admin rights to interact with these endpoints.
9799
#[derive(Debug, Clone)]
98100
pub struct LogsArchivesAPI {
99101
config: datadog::Configuration,

src/datadogV2/api/api_logs_metrics.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ pub enum UpdateLogsMetricError {
5151
}
5252

5353
/// Manage configuration of [log-based metrics](<https://app.datadoghq.com/logs/pipelines/generate-metrics>) for your organization.
54+
/// You need an API and non-scoped application key with Admin rights to interact with these endpoints.
5455
#[derive(Debug, Clone)]
5556
pub struct LogsMetricsAPI {
5657
config: datadog::Configuration,

tests/scenarios/features/v1/logs_indexes.feature

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
Feature: Logs Indexes
33
Manage configuration of [log
44
indexes](https://docs.datadoghq.com/logs/indexes/). You need an API and
5-
application key with Admin rights to interact with this endpoint.
5+
non-scoped application key with Admin rights to interact with these
6+
endpoints.
67

78
Background:
89
Given a valid "apiKeyAuth" key in the system

tests/scenarios/features/v1/logs_pipelines.feature

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ Feature: Logs Pipelines
1010
s/?tab=api#lookup-processor). - For more information about Pipelines, see
1111
the [pipeline documentation](https://docs.datadoghq.com/logs/log_configu
1212
ration/pipelines). **Notes:** These endpoints are only available for
13-
admin users. Make sure to use an application key created by an admin.
14-
**Grok parsing rules may effect JSON output and require returned data to
15-
be configured before using in a request.** For example, if you are using
16-
the data returned from a request for another request body, and have a
17-
parsing rule that uses a regex pattern like `\s` for spaces, you will need
18-
to configure all escaped spaces as `%{space}` to use in the body data.
13+
admin users. Make sure to use an application key created by an admin with
14+
no applied scopes. **Grok parsing rules may effect JSON output and
15+
require returned data to be configured before using in a request.** For
16+
example, if you are using the data returned from a request for another
17+
request body, and have a parsing rule that uses a regex pattern like `\s`
18+
for spaces, you will need to configure all escaped spaces as `%{space}` to
19+
use in the body data.
1920

2021
Background:
2122
Given a valid "apiKeyAuth" key in the system

tests/scenarios/features/v2/logs_archives.feature

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
Feature: Logs Archives
33
Archives forward all the logs ingested to a cloud storage system. See the
44
[Archives Page](https://app.datadoghq.com/logs/pipelines/archives) for a
5-
list of the archives currently configured in Datadog.
5+
list of the archives currently configured in Datadog. You need an API and
6+
non-scoped application key with Admin rights to interact with these
7+
endpoints.
68

79
Background:
810
Given a valid "apiKeyAuth" key in the system

0 commit comments

Comments
 (0)