add new options to notification and notification template (#110)

* add new options to notification and notification template

* add aliases to new options in notification and notification template

Author: rndmh3ro

examples/icinga_notification.yml

@@ -22,3 +22,6 @@
     disabled: false
     vars:
       foo: bar
+    time_period: "24/7"
+    times_begin: 20
+    times_end: 120

examples/icinga_notification_template.yml

@@ -15,3 +15,7 @@
       - Recovery
     times_begin: 20
     times_end: 120
+    time_period: "24/7"
+    notification_command: "mail-host-notification"
+    users:
+      - "rb"

plugins/modules/icinga_notification.py

@@ -96,6 +96,24 @@
       - Custom properties of the notification.
     type: "dict"
     version_added: "1.9.0"
+  time_period:
+    description:
+      - The name of a time period which determines when this notification should be triggered.
+    type: "str"
+    aliases: ['period']
+    version_added: "1.15.0"
+  times_begin:
+    description:
+      - First notification delay.
+      - Delay unless the first notification should be sent.
+    type: "int"
+    version_added: "1.15.0"
+  times_end:
+    description:
+      - Last notification.
+      - When the last notification should be sent.
+    type: "int"
+    version_added: "1.15.0"
 """
 
 EXAMPLES = """
@@ -122,6 +140,9 @@
     disabled: false
     vars:
       foo: bar
+    time_period: "24/7"
+    times_begin: 20
+    times_end: 120
 """
 
 RETURN = r""" # """
@@ -156,6 +177,9 @@ def main():
         users=dict(type="list", elements="str", required=False),
         types=dict(type="list", elements="str", required=False),
         vars=dict(type="dict", default={}, required=False),
+        time_period=dict(required=False, aliases=["period"]),
+        times_begin=dict(type="int", required=False),
+        times_end=dict(type="int", required=False),
     )
 
     # When deleting objects, only the name is necessary, so we cannot use
@@ -182,6 +206,9 @@ def main():
         "users": module.params["users"],
         "types": module.params["types"],
         "vars": module.params["vars"],
+        "period": module.params["time_period"],
+        "times_begin": module.params["times_begin"],
+        "times_end": module.params["times_end"],
     }
 
     icinga_object = Icinga2APIObject(

plugins/modules/icinga_notification_template.py

@@ -76,6 +76,24 @@
     description:
       - Set the zone.
     type: str
+  time_period:
+    description:
+      - The name of a time period which determines when this notification should be triggered.
+    type: "str"
+    aliases: ['period']
+    version_added: "1.15.0"
+  notification_command:
+    description:
+      - Check command definition
+    type: "str"
+    aliases: ['command']
+    version_added: "1.15.0"
+  users:
+    description:
+      - Users that should be notified by this notification
+    type: "list"
+    elements: str
+    version_added: "1.15.0"
 """
 
 EXAMPLES = """
@@ -95,6 +113,10 @@
       - Recovery
     times_begin: 20
     times_end: 120
+    time_period: "24/7"
+    notification_command: "mail-host-notification"
+    users:
+      - "rb"
 """
 
 RETURN = r""" # """
@@ -124,6 +146,9 @@ def main():
         times_end=dict(type="int", required=False),
         types=dict(type="list", elements="str", required=False),
         zone=dict(required=False, default=None),
+        time_period=dict(required=False, aliases=["period"]),
+        notification_command=dict(required=False, aliases=["command"]),
+        users=dict(type="list", elements="str", required=False),
     )
 
     # Define the main module
@@ -141,6 +166,9 @@ def main():
         "times_end": module.params["times_end"],
         "types": module.params["types"],
         "zone": module.params["zone"],
+        "period": module.params["time_period"],
+        "command": module.params["notification_command"],
+        "users": module.params["users"],
     }
 
     icinga_object = Icinga2APIObject(

tests/integration/targets/icinga/roles/icinga/tasks/absent_icinga_notification.yml

@@ -20,3 +20,6 @@
     disabled: false
     vars:
       foo: bar
+    time_period: "24/7"
+    times_begin: 20
+    times_end: 120

tests/integration/targets/icinga/roles/icinga/tasks/absent_icinga_notification_template.yml

@@ -15,3 +15,7 @@
       - Recovery
     times_begin: 20
     times_end: 120
+    time_period: "24/7"
+    notification_command: "mail-host-notification"
+    users:
+      - "rb"

tests/integration/targets/icinga/roles/icinga/tasks/icinga_notification.yml

@@ -22,3 +22,6 @@
     disabled: false
     vars:
       foo: bar
+    time_period: "24/7"
+    times_begin: 20
+    times_end: 120

tests/integration/targets/icinga/roles/icinga/tasks/icinga_notification_template.yml

@@ -15,3 +15,7 @@
       - Recovery
     times_begin: 20
     times_end: 120
+    time_period: "24/7"
+    notification_command: "mail-host-notification"
+    users:
+      - "rb"

tests/integration/targets/icinga/roles/icinga/tasks/wrong_host_icinga_notification.yml

@@ -22,6 +22,9 @@
     disabled: false
     vars:
       foo: bar
+    time_period: "24/7"
+    times_begin: 20
+    times_end: 120
   ignore_errors: true
   register: result
 - assert:

tests/integration/targets/icinga/roles/icinga/tasks/wrong_host_icinga_notification_template.yml

@@ -15,6 +15,10 @@
       - Recovery
     times_begin: 20
     times_end: 120
+    time_period: "24/7"
+    notification_command: "mail-host-notification"
+    users:
+      - "rb"
   ignore_errors: true
   register: result
 - assert: