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
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.4.1.dev2",
"regenerated": "2021-02-26 15:41:59.279139",
"spec_repo_commit": "ac9282d"
"regenerated": "2021-03-01 15:46:23.184303",
"spec_repo_commit": "46cbd6f"
},
"v2": {
"apigentools_version": "1.4.1.dev2",
"regenerated": "2021-02-26 15:42:12.606507",
"spec_repo_commit": "ac9282d"
"regenerated": "2021-03-01 15:46:36.358596",
"spec_repo_commit": "46cbd6f"
}
}
}
12 changes: 7 additions & 5 deletions data/v1/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4361,6 +4361,10 @@ components:
format: int64
nullable: true
type: integer
groupby_simple_monitor:
description: Whether the log alert monitor triggers a single alert or multiple
alerts when any group breaches a threshold.
type: boolean
include_tags:
default: true
description: 'A Boolean indicating whether notifications from this monitor
Expand Down Expand Up @@ -18465,11 +18469,9 @@ tags:
\ be graphed on Datadog\u2019s dashboards\n- Query metrics from any time period\n\
- Modify tag configurations for metrics\n\n**Note**: A graph can only contain\
\ a set number of points\nand as the timeframe over which a metric is viewed increases,\n\
aggregation between points occurs to stay below that set number.\n\nDatadog has\
\ a soft limit of 100 timeseries per host\nwhere a timeseries is defined as a\
\ unique combination of metric name and tag.\n\nThe Post, Patch, and Delete `manage_tags`\
\ API methods can only be performed by\na user who has the `Manage Tags for Metrics`\
\ permission."
aggregation between points occurs to stay below that set number.\n\nThe Post,\
\ Patch, and Delete `manage_tags` API methods can only be performed by\na user\
\ who has the `Manage Tags for Metrics` permission."
name: Metrics
- description: '[Monitors](https://docs.datadoghq.com/monitors) allow you to watch
a metric or check that you care about,
Expand Down
8 changes: 3 additions & 5 deletions data/v2/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8045,11 +8045,9 @@ tags:
\ be graphed on Datadog\u2019s dashboards\n- Query metrics from any time period\n\
- Modify tag configurations for metrics\n\n**Note**: A graph can only contain\
\ a set number of points\nand as the timeframe over which a metric is viewed increases,\n\
aggregation between points occurs to stay below that set number.\n\nDatadog has\
\ a soft limit of 100 timeseries per host\nwhere a timeseries is defined as a\
\ unique combination of metric name and tag.\n\nThe Post, Patch, and Delete `manage_tags`\
\ API methods can only be performed by\na user who has the `Manage Tags for Metrics`\
\ permission."
aggregation between points occurs to stay below that set number.\n\nThe Post,\
\ Patch, and Delete `manage_tags` API methods can only be performed by\na user\
\ who has the `Manage Tags for Metrics` permission."
name: Metrics
- description: The processes API allows you to query processes data for your organization.
name: Processes
Expand Down
2 changes: 2 additions & 0 deletions docs/v1/MonitorOptions.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
| **enable_logs_sample** | **Boolean** | Whether or not to send a log sample when the log monitor triggers. | [optional] |
| **escalation_message** | **String** | A message to include with a re-notification. Supports the `@username` notification we allow elsewhere. Not applicable if `renotify_interval` is `None`. | [optional][default to 'none'] |
| **evaluation_delay** | **Integer** | Time (in seconds) to delay evaluation, as a non-negative integer. For example, if the value is set to `300` (5min), the timeframe is set to `last_5m` and the time is 7:00, the monitor evaluates data from 6:50 to 6:55. This is useful for AWS CloudWatch and other backfilled metrics to ensure the monitor always has data during evaluation. | [optional] |
| **groupby_simple_monitor** | **Boolean** | Whether the log alert monitor triggers a single alert or multiple alerts when any group breaches a threshold. | [optional] |
| **include_tags** | **Boolean** | A Boolean indicating whether notifications from this monitor automatically inserts its triggering tags into the title. **Examples** - If `True`, `[Triggered on {host:h1}] Monitor Title` - If `False`, `[Triggered] Monitor Title` | [optional][default to true] |
| **locked** | **Boolean** | Whether or not the monitor is locked (only editable by creator and admins). | [optional] |
| **min_failure_duration** | **Integer** | How long the test should be in failure before alerting (integer, number of seconds, max 7200). | [optional][default to 0] |
Expand Down Expand Up @@ -36,6 +37,7 @@ instance = DatadogAPIClient::V1::MonitorOptions.new(
enable_logs_sample: null,
escalation_message: null,
evaluation_delay: null,
groupby_simple_monitor: null,
include_tags: null,
locked: null,
min_failure_duration: null,
Expand Down
6 changes: 2 additions & 4 deletions features/v1/metrics.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ Feature: Metrics
Modify tag configurations for metrics **Note**: A graph can only contain
a set number of points and as the timeframe over which a metric is viewed
increases, aggregation between points occurs to stay below that set
number. Datadog has a soft limit of 100 timeseries per host where a
timeseries is defined as a unique combination of metric name and tag. The
Post, Patch, and Delete `manage_tags` API methods can only be performed by
a user who has the `Manage Tags for Metrics` permission.
number. The Post, Patch, and Delete `manage_tags` API methods can only be
performed by a user who has the `Manage Tags for Metrics` permission.

Background:
Given a valid "apiKeyAuth" key in the system
Expand Down
6 changes: 2 additions & 4 deletions features/v2/metrics.feature
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ Feature: Metrics
Modify tag configurations for metrics **Note**: A graph can only contain
a set number of points and as the timeframe over which a metric is viewed
increases, aggregation between points occurs to stay below that set
number. Datadog has a soft limit of 100 timeseries per host where a
timeseries is defined as a unique combination of metric name and tag. The
Post, Patch, and Delete `manage_tags` API methods can only be performed by
a user who has the `Manage Tags for Metrics` permission.
number. The Post, Patch, and Delete `manage_tags` API methods can only be
performed by a user who has the `Manage Tags for Metrics` permission.

Background:
Given a valid "apiKeyAuth" key in the system
Expand Down
12 changes: 11 additions & 1 deletion lib/datadog_api_client/v1/models/monitor_options.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class MonitorOptions
# Time (in seconds) to delay evaluation, as a non-negative integer. For example, if the value is set to `300` (5min), the timeframe is set to `last_5m` and the time is 7:00, the monitor evaluates data from 6:50 to 6:55. This is useful for AWS CloudWatch and other backfilled metrics to ensure the monitor always has data during evaluation.
attr_accessor :evaluation_delay

# Whether the log alert monitor triggers a single alert or multiple alerts when any group breaches a threshold.
attr_accessor :groupby_simple_monitor

# A Boolean indicating whether notifications from this monitor automatically inserts its triggering tags into the title. **Examples** - If `True`, `[Triggered on {host:h1}] Monitor Title` - If `False`, `[Triggered] Monitor Title`
attr_accessor :include_tags

Expand Down Expand Up @@ -84,6 +87,7 @@ def self.attribute_map
:'enable_logs_sample' => :'enable_logs_sample',
:'escalation_message' => :'escalation_message',
:'evaluation_delay' => :'evaluation_delay',
:'groupby_simple_monitor' => :'groupby_simple_monitor',
:'include_tags' => :'include_tags',
:'locked' => :'locked',
:'min_failure_duration' => :'min_failure_duration',
Expand Down Expand Up @@ -115,6 +119,7 @@ def self.openapi_types
:'enable_logs_sample' => :'Boolean',
:'escalation_message' => :'String',
:'evaluation_delay' => :'Integer',
:'groupby_simple_monitor' => :'Boolean',
:'include_tags' => :'Boolean',
:'locked' => :'Boolean',
:'min_failure_duration' => :'Integer',
Expand Down Expand Up @@ -186,6 +191,10 @@ def initialize(attributes = {})
self.evaluation_delay = attributes[:'evaluation_delay']
end

if attributes.key?(:'groupby_simple_monitor')
self.groupby_simple_monitor = attributes[:'groupby_simple_monitor']
end

if attributes.key?(:'include_tags')
self.include_tags = attributes[:'include_tags']
else
Expand Down Expand Up @@ -308,6 +317,7 @@ def ==(o)
enable_logs_sample == o.enable_logs_sample &&
escalation_message == o.escalation_message &&
evaluation_delay == o.evaluation_delay &&
groupby_simple_monitor == o.groupby_simple_monitor &&
include_tags == o.include_tags &&
locked == o.locked &&
min_failure_duration == o.min_failure_duration &&
Expand All @@ -334,7 +344,7 @@ def eql?(o)
# Calculates hash code according to all attributes.
# @return [Integer] Hash code
def hash
[aggregation, device_ids, enable_logs_sample, escalation_message, evaluation_delay, include_tags, locked, min_failure_duration, min_location_failed, new_host_delay, no_data_timeframe, notify_audit, notify_no_data, renotify_interval, require_full_window, silenced, synthetics_check_id, threshold_windows, thresholds, timeout_h].hash
[aggregation, device_ids, enable_logs_sample, escalation_message, evaluation_delay, groupby_simple_monitor, include_tags, locked, min_failure_duration, min_location_failed, new_host_delay, no_data_timeframe, notify_audit, notify_no_data, renotify_interval, require_full_window, silenced, synthetics_check_id, threshold_windows, thresholds, timeout_h].hash
end

# Builds the object from hash
Expand Down