Skip to content
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

Add support for variables option #237

Merged
merged 21 commits into from
Jan 5, 2023
Merged

Add support for variables option #237

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f271ee9
datadog-monitors-monitor-handler: add basic support for Options.Varia…
niallyoung Dec 6, 2022
7718a13
update datadog-monitors-monitor.json schema
niallyoung Dec 6, 2022
7d81d29
reference MonitorVariables class, not basic field
niallyoung Dec 6, 2022
faa8df2
additional @dataclass for MonitorVariable*
niallyoung Dec 7, 2022
20c4156
test inputs: datadog-monitors-monitor-handler/inputs/inputs_3_*
niallyoung Dec 11, 2022
28826ba
bump datadog-monitors-monitor-handler/CHANGELOG.md
niallyoung Dec 11, 2022
e9654e7
fix up json field names
niallyoung Dec 12, 2022
1a682cb
cleanup schema and generate
skarimo Dec 19, 2022
b3fa760
undo test change
skarimo Dec 19, 2022
9603e85
bump common package
skarimo Dec 19, 2022
2c1f411
Merge branch 'master' into monitor_handler_options_variables
skarimo Dec 19, 2022
8380e55
handle model setting and request
skarimo Dec 21, 2022
2758a33
Revert "bump datadog-monitors-monitor-handler/CHANGELOG.md"
skarimo Dec 21, 2022
b57e5d5
fix tests
skarimo Dec 21, 2022
63f7765
undo version bump
skarimo Dec 21, 2022
2dfcefb
Fix update test case
skarimo Dec 21, 2022
8b736f0
bump common package version
skarimo Dec 21, 2022
5439b9f
apply code review suggestions
skarimo Dec 22, 2022
8bf30cf
bump common version and use helper for one of
skarimo Jan 5, 2023
cf7b61a
Merge branch 'master' into sherz/monitor-options-variables
skarimo Jan 5, 2023
497cd25
lint
skarimo Jan 5, 2023
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# IntelliJ
*/*.iml
*/.idea
**/*.idea/
*/out.java
*/out/
*/.settings
Expand All @@ -37,3 +38,5 @@ rpdk.log

# SAM test files
*/sam-tests/*

**/*.egg-info/
159 changes: 159 additions & 0 deletions datadog-monitors-monitor-handler/datadog-monitors-monitor-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,168 @@
"description": "Time (in seconds) to skip evaluations for new groups. For example, this option can be used to skip evaluations for new hosts while they initialize. Must be a non negative integer.",
"type": "integer",
"minimum": 0
},
"Variables": {
"description": "List of requests that can be used in the monitor query.",
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/definitions/MonitorFormulaAndFunctionEventQueryDefinition"
}
]
}
}
}
},
"MonitorFormulaAndFunctionEventQueryDefinition": {
"description": "A formula and functions events query.",
"type": "object",
"additionalProperties": false,
"properties": {
"DataSource": {
"description": "Threshold value for triggering an alert.",
"$ref": "#/definitions/MonitorFormulaAndFunctionEventsDataSource"
},
"Search": {
"description": "Search options.",
"type": "object",
"additionalProperties": false,
"properties": {
"Query": {
"description": "The monitor query.",
"type": "string"
}
},
"required": [
"Query"
]
},
"Indexes": {
"description": "An array of index names to query in the stream. Omit or use `[]` to query all indexes at once.",
"type": "array",
"insertionOrder": false,
"items": {
"type": "string"
}
},
"Compute": {
"description": "Compute options.",
"type": "object",
"additionalProperties": false,
"properties": {
"Aggregation": {
"$ref": "#/definitions/MonitorFormulaAndFunctionEventAggregation"
},
"Interval": {
"description": "A time interval in milliseconds.",
"type": "integer",
"minimum": 0
},
"Metric": {
"description": "Measurable attribute to compute.",
"type": "string"
}
},
"required": [
"Aggregation"
]
},
"GroupBy": {
"description": "Group by options.",
"type": "array",
"items": {
"$ref": "#/definitions/MonitorFormulaAndFunctionEventQueryGroupBy"
}
},
"Name": {
"description": "Name of the monitor",
"type": "string"
}
},
"required": [
"Compute",
"DataSource",
"GroupBy",
"Name",
"Search"
skarimo marked this conversation as resolved.
Show resolved Hide resolved
]
},
"MonitorFormulaAndFunctionEventsDataSource": {
"description": "Data source for event platform-based queries.",
"type": "string",
"enum": [
"rum",
"ci_pipelines",
"ci_tests",
"audit",
"events",
"logs",
"spans"
]
},
"MonitorFormulaAndFunctionEventAggregation": {
"description": "Data source for event platform-based queries.",
"type": "string",
"enum": [
"count",
"cardinality",
"median",
"pc75",
"pc90",
"pc95",
"pc98",
"pc99",
"sum",
"min",
"max",
"avg"
]
},
"MonitorFormulaAndFunctionEventQueryGroupBy": {
"description": "Credentials for the Datadog API",
"properties": {
"Facet": {
"description": "Event facet.",
"type": "string"
},
"Limit": {
"description": "Event facet.",
"type": "integer"
},
"Sort": {
"description": "Options for sorting group by results.",
"type": "object",
"additionalProperties": false,
"properties": {
"Aggregation": {
"$ref": "#/definitions/MonitorFormulaAndFunctionEventAggregation"
},
"Metric": {
"description": "Options for sorting group by results.",
"type": "string"
},
"Order": {
"description": "Direction of sort.",
"type": "string",
"enum": [
"asc",
"desc"
]
}
},
"required": [
"Aggregation"
]
}
},
"required": [
"Facet",
"Sort"
],
"type": "object",
"additionalProperties": false
},
"DatadogCredentials": {
"description": "Credentials for the Datadog API",
"properties": {
Expand Down
150 changes: 150 additions & 0 deletions datadog-monitors-monitor-handler/datadog-monitors-monitor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,159 @@
"description": "Time (in seconds) to skip evaluations for new groups. For example, this option can be used to skip evaluations for new hosts while they initialize. Must be a non negative integer.",
"type": "integer",
"minimum": 0
},
"Variables": {
"description": "List of requests that can be used in the monitor query.",
"type": "array",
"items": {
"oneOf": [
{"$ref": "#/definitions/MonitorFormulaAndFunctionEventQueryDefinition"}
]
}
}
}
},
"MonitorFormulaAndFunctionEventQueryDefinition": {
"description": "A formula and functions events query.",
"type": "object",
"additionalProperties": false,
"properties": {
"DataSource": {
"description": "Threshold value for triggering an alert.",
"$ref": "#/definitions/MonitorFormulaAndFunctionEventsDataSource"
},
"Search": {
"description": "Search options.",
"type": "object",
"additionalProperties": false,
"properties": {
"Query": {
"description": "The monitor query.",
"type": "string"
}
},
"required": [
"Query"
]
},
"Indexes": {
"description": "An array of index names to query in the stream. Omit or use `[]` to query all indexes at once.",
"type": "array",
"insertionOrder": false,
"items": {
"type": "string"
}
},
"Compute": {
"description": "Compute options.",
"type": "object",
"additionalProperties": false,
"properties": {
"Aggregation": {"$ref": "#/definitions/MonitorFormulaAndFunctionEventAggregation"},
"Interval": {
"description": "A time interval in milliseconds.",
"type": "integer",
"minimum": 0
},
"Metric": {
"description": "Measurable attribute to compute.",
"type": "string"
}
},
"required": [
"Aggregation"
]
},
"GroupBy": {
"description": "Group by options.",
"type": "array",
"items": {"$ref": "#/definitions/MonitorFormulaAndFunctionEventQueryGroupBy"}
},
"Name": {
"description": "Name of the monitor",
"type": "string"
}
},
"required": [
"Compute",
"DataSource",
"GroupBy",
"Name",
"Search" ]
},
"MonitorFormulaAndFunctionEventsDataSource": {
"description": "Data source for event platform-based queries.",
"type": "string",
"enum": [
"rum",
"ci_pipelines",
"ci_tests",
"audit",
"events",
"logs",
"spans"
]
},
"MonitorFormulaAndFunctionEventAggregation": {
"description": "Data source for event platform-based queries.",
"type": "string",
"enum": [
"count",
"cardinality",
"median",
"pc75",
"pc90",
"pc95",
"pc98",
"pc99",
"sum",
"min",
"max",
"avg"
]
},
"MonitorFormulaAndFunctionEventQueryGroupBy": {
"description": "Credentials for the Datadog API",
"properties": {
"Facet": {
"description": "Event facet.",
"type": "string"
},
"Limit": {
"description": "Event facet.",
"type": "integer"
},
"Sort": {
"description": "Options for sorting group by results.",
"type": "object",
"additionalProperties": false,
"properties": {
"Aggregation": {"$ref": "#/definitions/MonitorFormulaAndFunctionEventAggregation"},
"Metric": {
"description": "Options for sorting group by results.",
"type": "string"
},
"Order": {
"description": "Direction of sort.",
"type": "string",
"enum": [
"asc",
"desc"
]
}
},
"required": [
"Aggregation"
]
}
},
"required": [
"Facet",
"Sort"
],
"type": "object",
"additionalProperties": false
},
"DatadogCredentials": {
"description": "Credentials for the Datadog API",
"properties": {
Expand Down
Loading