Skip to content

Add metrics field in the RuleQuery #978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 20, 2022
Merged

Add metrics field in the RuleQuery #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af38cff
Regenerate client from commit a82be8f8 of spec repo
Jul 20, 2022
571483b
Merge branch 'master' into datadog-api-spec/generated/1777
api-clients-generation-pipeline[bot] Jul 20, 2022
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
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.2",
"regenerated": "2022-07-19 16:28:25.621288",
"spec_repo_commit": "448d6aae"
"regenerated": "2022-07-20 11:53:28.416228",
"spec_repo_commit": "a82be8f8"
},
"v2": {
"apigentools_version": "1.6.2",
"regenerated": "2022-07-19 16:28:25.640110",
"spec_repo_commit": "448d6aae"
"regenerated": "2022-07-20 11:53:28.429749",
"spec_repo_commit": "a82be8f8"
}
}
}
14 changes: 14 additions & 0 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6669,6 +6669,13 @@ components:

aggregations.'
type: string
metrics:
description: Group of target fields to aggregate over when using the new
value aggregations.
items:
description: Field.
type: string
type: array
name:
description: Name of the query.
type: string
Expand Down Expand Up @@ -6715,6 +6722,13 @@ components:

aggregations.'
type: string
metrics:
description: Group of target fields to aggregate over when using the new
value aggregations.
items:
description: Field.
type: string
type: array
name:
description: Name of the query.
type: string
Expand Down
1 change: 1 addition & 0 deletions examples/v2/security-monitoring/UpdateSecurityMonitoringRule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
aggregation: DatadogAPIClient::V2::SecurityMonitoringRuleQueryAggregation::COUNT,
distinct_fields: [],
group_by_fields: [],
metrics: [],
}),
],
tags: [],
Expand Down
6 changes: 3 additions & 3 deletions features/v2/security_monitoring.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,22 +298,22 @@ Feature: Security Monitoring
Scenario: Update an existing rule returns "Bad Request" response
Given new "UpdateSecurityMonitoringRule" request
And request contains "rule_id" parameter from "REPLACE.ME"
And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": []}], "tags": [], "version": 1}
And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": [], "metrics": []}], "tags": [], "version": 1}
When the request is sent
Then the response status is 400 Bad Request

@generated @skip @team:DataDog/k9-cloud-security-platform
Scenario: Update an existing rule returns "Not Found" response
Given new "UpdateSecurityMonitoringRule" request
And request contains "rule_id" parameter from "REPLACE.ME"
And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": []}], "tags": [], "version": 1}
And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": [], "metrics": []}], "tags": [], "version": 1}
When the request is sent
Then the response status is 404 Not Found

@generated @skip @team:DataDog/k9-cloud-security-platform
Scenario: Update an existing rule returns "OK" response
Given new "UpdateSecurityMonitoringRule" request
And request contains "rule_id" parameter from "REPLACE.ME"
And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": []}], "tags": [], "version": 1}
And body with value {"cases": [{"notifications": [], "status": "critical"}], "filters": [{"action": "require"}], "hasExtendedTitle": true, "options": {"decreaseCriticalityBasedOnEnv": false, "detectionMethod": "threshold", "evaluationWindow": 0, "hardcodedEvaluatorType": "log4shell", "impossibleTravelOptions": {"baselineUserLocations": true}, "keepAlive": 0, "maxSignalDuration": 0, "newValueOptions": {"forgetAfter": 1, "learningDuration": 0, "learningMethod": "duration", "learningThreshold": 0}}, "queries": [{"aggregation": "count", "distinctFields": [], "groupByFields": [], "metrics": []}], "tags": [], "version": 1}
When the request is sent
Then the response status is 200 OK
14 changes: 13 additions & 1 deletion lib/datadog_api_client/v2/models/security_monitoring_rule_query.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ class SecurityMonitoringRuleQuery
# aggregations.
attr_accessor :metric

# Group of target fields to aggregate over when using the new value aggregations.
attr_accessor :metrics

# Name of the query.
attr_accessor :name

Expand All @@ -52,6 +55,7 @@ def self.attribute_map
:'distinct_fields' => :'distinctFields',
:'group_by_fields' => :'groupByFields',
:'metric' => :'metric',
:'metrics' => :'metrics',
:'name' => :'name',
:'query' => :'query'
}
Expand All @@ -71,6 +75,7 @@ def self.openapi_types
:'distinct_fields' => :'Array<String>',
:'group_by_fields' => :'Array<String>',
:'metric' => :'String',
:'metrics' => :'Array<String>',
:'name' => :'String',
:'query' => :'String'
}
Expand Down Expand Up @@ -119,6 +124,12 @@ def initialize(attributes = {})
self.metric = attributes[:'metric']
end

if attributes.key?(:'metrics')
if (value = attributes[:'metrics']).is_a?(Array)
self.metrics = value
end
end

if attributes.key?(:'name')
self.name = attributes[:'name']
end
Expand All @@ -145,6 +156,7 @@ def ==(o)
distinct_fields == o.distinct_fields &&
group_by_fields == o.group_by_fields &&
metric == o.metric &&
metrics == o.metrics &&
name == o.name &&
query == o.query
end
Expand All @@ -160,7 +172,7 @@ def eql?(o)
# @return [Integer] Hash code
# @!visibility private
def hash
[aggregation, distinct_fields, group_by_fields, metric, name, query].hash
[aggregation, distinct_fields, group_by_fields, metric, metrics, name, query].hash
end
end
end
14 changes: 13 additions & 1 deletion lib/datadog_api_client/v2/models/security_monitoring_rule_query_create.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ class SecurityMonitoringRuleQueryCreate
# aggregations.
attr_accessor :metric

# Group of target fields to aggregate over when using the new value aggregations.
attr_accessor :metrics

# Name of the query.
attr_accessor :name

Expand All @@ -52,6 +55,7 @@ def self.attribute_map
:'distinct_fields' => :'distinctFields',
:'group_by_fields' => :'groupByFields',
:'metric' => :'metric',
:'metrics' => :'metrics',
:'name' => :'name',
:'query' => :'query'
}
Expand All @@ -71,6 +75,7 @@ def self.openapi_types
:'distinct_fields' => :'Array<String>',
:'group_by_fields' => :'Array<String>',
:'metric' => :'String',
:'metrics' => :'Array<String>',
:'name' => :'String',
:'query' => :'String'
}
Expand Down Expand Up @@ -119,6 +124,12 @@ def initialize(attributes = {})
self.metric = attributes[:'metric']
end

if attributes.key?(:'metrics')
if (value = attributes[:'metrics']).is_a?(Array)
self.metrics = value
end
end

if attributes.key?(:'name')
self.name = attributes[:'name']
end
Expand Down Expand Up @@ -156,6 +167,7 @@ def ==(o)
distinct_fields == o.distinct_fields &&
group_by_fields == o.group_by_fields &&
metric == o.metric &&
metrics == o.metrics &&
name == o.name &&
query == o.query
end
Expand All @@ -171,7 +183,7 @@ def eql?(o)
# @return [Integer] Hash code
# @!visibility private
def hash
[aggregation, distinct_fields, group_by_fields, metric, name, query].hash
[aggregation, distinct_fields, group_by_fields, metric, metrics, name, query].hash
end
end
end