Merge pull request #48 from ganto/config-update

Minor rule configuration updates and enhancements

defaults/main.yml

@@ -486,6 +486,7 @@ checkmk_server__site_config_map: '{{ checkmk_server__site_cfg_contactgroups +
                                      checkmk_server__site_cfg_servicegroups +
                                      checkmk_server__site_cfg_datasource_programs +
                                      checkmk_server__site_cfg_netif_description +
+                                     checkmk_server__site_cfg_notification_defaults +
                                      checkmk_server__site_cfg_software_inventory }}'
 
 
@@ -512,7 +513,7 @@ checkmk_server__contact_defaults:
 checkmk_server__site_cfg_contactgroups:
   - name: 'define_contactgroups'
     value:
-      all: 'Everybody'
+      all: 'Everything'
 
 
 # .. envvar:: checkmk_server__site_cfg_rules
@@ -591,6 +592,20 @@ checkmk_server__site_cfg_software_inventory:
                     else "absent" }}'
 
 
+# .. envvar:: checkmk_server__site_cfg_notification_defaults
+#
+# Set fallback email address for rule based notifications. Must be set
+# including domain otherwise it won't be accepted by Check_MK.
+checkmk_server__site_cfg_notification_defaults:
+  - name: 'notification_fallback_email'
+    filename: 'global.mk'
+    template: 'key_value'
+    value: '{{ ansible_local.core.admin_public_email[0]
+               if ("core" in ansible_local) and
+                  ("admin_public_email" in ansible_local.core)
+               else "root@" + ansible_domain }}'
+
+
 # .. envvar:: checkmk_server__site_cfg_netif_description
 #
 # Set interface name instead of index for network interface check via

templates/macros/checkmk_config.j2

@@ -120,7 +120,7 @@
 
 {% macro tmpl_var__key_value(_name, _value) %}
 
-{{ _name }} = {{ _value }}
+{{ _name }} = {{ "'" + _value + "'" if (_value is string) else _value }}
 {% endmacro %}
 
 
@@ -305,11 +305,12 @@ if {{ _name }} == None:
 {%   set _rule = "'" + _value + "'" %}
 {% elif (_value is mapping) or (_value is sequence) %}
 {#
- #   Remove unicode hints for dictionary keys.
+ #   Remove unicode hints for dictionary keys and values.
  #   Substitute lists with tuples: ['foo', 'bar'] -> ('foo', 'bar')
  #   Fix nested lists: ({'foo': (bar)}) -> ('foo', ('bar'))
  #}
 {%   set _rule = _value | regex_replace("(, |{)u'", "\\1'") |
+                          regex_replace(": u'", ": '") |
                           replace("[", "(") | replace("]", ")") |
                           regex_replace("\({('[\w]+'):", "(\\1,") | replace(")})", "))") %}
 {% else %}

tests/reference.mk

@@ -85,3 +85,8 @@ checkgroup_parameters.setdefault('threads', [])
 checkgroup_parameters['threads'] = [
   ( (4000, 8000), ['physical', ], ALL_HOSTS, {'description': u'Physical servers need to handle a lot of threads'} ),
 ] + checkgroup_parameters['threads']
+
+
+custom_checks = [
+  ( {'service_description': u'Galera Cluster', 'command_line': '$USER1$/check_by_ssh -t 60 -E -H $HOSTADDRESS$ -C "sudo /usr/lib64/nagios/plugins/check_galera_cluster -c 1"'}, [], ['mysql01.example.com', 'mysql02.example.com'] ),
+]

tests/test_templates.yml

@@ -123,6 +123,16 @@
         value: [ 4000, 8000 ]
         tags: [ 'physical' ]
         description: 'Physical servers need to handle a lot of threads'
+      # custom_checks
+      - name: 'custom_checks'
+        filename: 'rules.mk'
+        template: 'rule'
+        value:
+          service_description: 'Galera Cluster'
+          command_line: '$USER1$/check_by_ssh -t 60 -E -H $HOSTADDRESS$ -C "sudo /usr/lib64/nagios/plugins/check_galera_cluster -c 1"'
+        hosts:
+          - 'mysql01.example.com'
+          - 'mysql02.example.com'
 
   tasks:
     - template:

vars/main.yml

@@ -37,6 +37,9 @@ checkmk_server__confd_variable_map:
   checkgroup_parameters:
     filename: 'rules.mk'
     template: 'rule_w_default'
+  custom_checks:
+    filename: 'rules.mk'
+    template: 'rule'
   datasource_programs:
     filename: 'rules.mk'
     template: 'rule'