ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

datadog_monitor: Add missing monitor types query alert, trace-analytics alert, rum alert (#1723) (#1733)

Browse source 
* Add missing Datadog monitor types
This commit adds the following monitor types: query alert, trace-analytics alert, rum alert

* changelog PR1723 datadog_monitor types

* datadog_monitor 1723 Apply suggestions from code review

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit f509f2c896)

Co-authored-by: Rick Sherman <rick@shermdog.com>
This commit is contained in:
patchback[bot] 2021-02-05 06:51:27 +00:00 committed by GitHub
parent c22199794d
commit f613983cb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/1723-datadog_monitor-add-missing-monitor-types.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- datadog_monitor - add missing monitor types ``query alert``, ``trace-analytics alert``, ``rum alert`` (https://github.com/ansible-collections/community.general/pull/1723).

9
plugins/modules/monitoring/datadog/datadog_monitor.py
View file

@ -49,7 +49,8 @@ options:
type: type:
description: description:
- The type of the monitor. - The type of the monitor.
choices: ['metric alert', 'service check', 'event alert', 'process alert', 'log alert'] - The types C(query alert), C(trace-analytics alert) and C(rum alert) were added in community.general 2.1.0.
choices: ['metric alert', 'service check', 'event alert', 'process alert', 'log alert', 'query alert', 'trace-analytics alert', 'rum alert']
type: str type: str
query: query:
description: description:
@ -208,7 +209,9 @@ def main():
api_host=dict(required=False), api_host=dict(required=False),
app_key=dict(required=True, no_log=True), app_key=dict(required=True, no_log=True),
state=dict(required=True, choices=['present', 'absent', 'mute', 'unmute']), state=dict(required=True, choices=['present', 'absent', 'mute', 'unmute']),
type=dict(required=False, choices=['metric alert', 'service check', 'event alert', 'process alert', 'log alert']), type=dict(required=False, choices=['metric alert', 'service check', 'event alert',
'process alert', 'log alert', 'query alert',
'trace-analytics alert', 'rum alert']),
name=dict(required=True), name=dict(required=True),
query=dict(required=False), query=dict(required=False),
notification_message=dict(required=False, no_log=True, default=None, aliases=['message'], notification_message=dict(required=False, no_log=True, default=None, aliases=['message'],
@ -348,7 +351,7 @@ def install_monitor(module):
if module.params['type'] == "service check": if module.params['type'] == "service check":
options["thresholds"] = module.params['thresholds'] or {'ok': 1, 'critical': 1, 'warning': 1} options["thresholds"] = module.params['thresholds'] or {'ok': 1, 'critical': 1, 'warning': 1}
if module.params['type'] in ["metric alert", "log alert"] and module.params['thresholds'] is not None: if module.params['type'] in ["metric alert", "log alert", "query alert", "trace-analytics alert", "rum alert"] and module.params['thresholds'] is not None:
options["thresholds"] = module.params['thresholds'] options["thresholds"] = module.params['thresholds']
monitor = _get_monitor(module) monitor = _get_monitor(module)