Merge pull request #668 from kwoodson/quick2

Adding zabbix template to config management

3 files changed, 441 insertions, 0 deletions

diff --git a/roles/lib_zabbix/library/zbx_trigger.py b/roles/lib_zabbix/library/zbx_trigger.py
index 21d0fcfd2..ab7731faa 100644
--- a/roles/lib_zabbix/library/zbx_trigger.py
+++ b/roles/lib_zabbix/library/zbx_trigger.py
@@ -86,6 +86,24 @@ def get_trigger_status(inc_status):
 
     return r_status
 
+def get_template_id(zapi, template_name):
+    '''
+    get related templates
+    '''
+    template_ids = []
+    app_ids = {}
+    # Fetch templates by name
+    content = zapi.get_content('template',
+                               'get',
+                               {'search': {'host': template_name},
+                                'selectApplications': ['applicationid', 'name']})
+    if content.has_key('result'):
+        template_ids.append(content['result'][0]['templateid'])
+        for app in content['result'][0]['applications']:
+            app_ids[app['name']] = app['applicationid']
+
+    return template_ids, app_ids
+
 def main():
     '''
     Create a trigger in zabbix
@@ -117,6 +135,7 @@ def main():
             url=dict(default=None, type='str'),
             status=dict(default=None, type='str'),
             state=dict(default='present', type='str'),
+            template_name=dict(default=None, type='str'),
         ),
         #supports_check_mode=True
     )
@@ -132,11 +151,16 @@ def main():
     state = module.params['state']
     tname = module.params['name']
 
+    templateid = None
+    if module.params['template_name']:
+        templateid, _ = get_template_id(zapi, module.params['template_name'])
+
     content = zapi.get_content(zbx_class_name,
                                'get',
                                {'filter': {'description': tname},
                                 'expandExpression': True,
                                 'selectDependencies': 'triggerid',
+                                'templateids': templateid,
                                })
 
     # Get
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index 28e900255..e083296c0 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -13,6 +13,7 @@
 - include_vars: template_openshift_master.yml
 - include_vars: template_openshift_node.yml
 - include_vars: template_ops_tools.yml
+- include_vars: template_app_zabbix_server.yml
 
 - name: Include Template Heartbeat
   include: ../../lib_zabbix/tasks/create_template.yml
@@ -61,3 +62,11 @@
     server: "{{ ozb_server }}"
     user: "{{ ozb_user }}"
     password: "{{ ozb_password }}"
+
+- name: Include Template App Zabbix Server
+  include: ../../lib_zabbix/tasks/create_template.yml
+  vars:
+    template: "{{ g_template_app_zabbix_server }}"
+    server: "{{ ozb_server }}"
+    user: "{{ ozb_user }}"
+    password: "{{ ozb_password }}"
diff --git a/roles/os_zabbix/vars/template_app_zabbix_server.yml b/roles/os_zabbix/vars/template_app_zabbix_server.yml
new file mode 100644
index 000000000..dace2aa29
--- /dev/null
+++ b/roles/os_zabbix/vars/template_app_zabbix_server.yml
@@ -0,0 +1,408 @@
+---
+g_template_app_zabbix_server:
+   name: Template App Zabbix Server
+   zitems:
+   - key: housekeeper_creates
+     applications:
+     - Zabbix server
+     description: A simple count of the number of partition creates output by the housekeeper script.
+     units: ''
+     value_type: int
+     zabbix_type: '2'
+
+   - key: housekeeper_drops
+     applications:
+     - Zabbix server
+     description: A simple count of the number of partition drops output by the housekeeper script.
+     units: ''
+     value_type: int
+     zabbix_type: '2'
+
+   - key: housekeeper_errors
+     applications:
+     - Zabbix server
+     description: A simple count of the number of errors output by the housekeeper script.
+     units: ''
+     value_type: int
+     zabbix_type: '2'
+
+   - key: housekeeper_total
+     applications:
+     - Zabbix server
+     description: A simple count of the total number of lines output by the housekeeper
+       script.
+     units: ''
+     value_type: int
+     zabbix_type: '2'
+
+   - key: zabbix[process,alerter,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,configuration syncer,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,db watchdog,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,discoverer,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,escalator,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,history syncer,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,housekeeper,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,http poller,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,icmp pinger,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,ipmi poller,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,java poller,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,node watcher,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,poller,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,proxy poller,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,self-monitoring,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,snmp trapper,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,timer,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,trapper,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[process,unreachable poller,avg,busy]
+     applications:
+     - Zabbix server
+     description: ''
+     units: '%'
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[queue,10m]
+     applications:
+     - Zabbix server
+     description: ''
+     units: ''
+     value_type: int
+     zabbix_type: '5'
+
+   - key: zabbix[queue]
+     applications:
+     - Zabbix server
+     description: ''
+     units: ''
+     value_type: int
+     zabbix_type: '5'
+
+   - key: zabbix[rcache,buffer,pfree]
+     applications:
+     - Zabbix server
+     description: ''
+     units: ''
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[wcache,history,pfree]
+     applications:
+     - Zabbix server
+     description: ''
+     units: ''
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[wcache,text,pfree]
+     applications:
+     - Zabbix server
+     description: ''
+     units: ''
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[wcache,trend,pfree]
+     applications:
+     - Zabbix server
+     description: ''
+     units: ''
+     value_type: float
+     zabbix_type: '5'
+
+   - key: zabbix[wcache,values]
+     applications:
+     - Zabbix server
+     description: ''
+     units: ''
+     value_type: float
+     zabbix_type: '5'
+   ztriggers:
+   - description: "There has been unexpected output while running the housekeeping script\
+       \ on the Zabbix. There are only three kinds of lines we expect to see in the output,\
+       \ and we've gotten something enw.\r\n\r\nCheck the script's output in /var/lib/zabbix/state\
+       \ for more details."
+     expression: '{Template App Zabbix Server:housekeeper_errors.last(0)}+{Template App Zabbix Server:housekeeper_creates.last(0)}+{Template App Zabbix Server:housekeeper_drops.last(0)}<>{Template App Zabbix Server:housekeeper_total.last(0)}'
+     name: Unexpected output in Zabbix DB Housekeeping
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_DB_Housekeeping.asciidoc
+
+   - description: An error has occurred during running the housekeeping script on the Zabbix. Check the script's output in /var/lib/zabbix/state for more details.
+     expression: '{Template App Zabbix Server:housekeeper_errors.last(0)}>0'
+     name: Errors during Zabbix DB Housekeeping
+     priority: high
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,alerter,avg,busy].min(600)}>75'
+     name: Zabbix alerter processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,configuration syncer,avg,busy].min(600)}>75'
+     name: Zabbix configuration syncer processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,db watchdog,avg,busy].min(600)}>75'
+     name: Zabbix db watchdog processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,discoverer,avg,busy].min(600)}>75'
+     name: Zabbix discoverer processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,escalator,avg,busy].min(600)}>75'
+     name: Zabbix escalator processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,history syncer,avg,busy].min(600)}>75'
+     name: Zabbix history syncer processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,housekeeper,avg,busy].min(1800)}>75'
+     name: Zabbix housekeeper processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,http poller,avg,busy].min(600)}>75'
+     name: Zabbix http poller processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,icmp pinger,avg,busy].min(600)}>75'
+     name: Zabbix icmp pinger processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,ipmi poller,avg,busy].min(600)}>75'
+     name: Zabbix ipmi poller processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,java poller,avg,busy].min(600)}>75'
+     name: Zabbix java poller processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,node watcher,avg,busy].min(600)}>75'
+     name: Zabbix node watcher processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,poller,avg,busy].min(600)}>75'
+     name: Zabbix poller processes more than 75% busy
+     priority: high
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,proxy poller,avg,busy].min(600)}>75'
+     name: Zabbix proxy poller processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,self-monitoring,avg,busy].min(600)}>75'
+     name: Zabbix self-monitoring processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,snmp trapper,avg,busy].min(600)}>75'
+     name: Zabbix snmp trapper processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: Timer processes usually are busy because they have to process time
+       based trigger functions
+     expression: '{Template App Zabbix Server:zabbix[process,timer,avg,busy].min(600)}>75'
+     name: Zabbix timer processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,trapper,avg,busy].min(600)}>75'
+     name: Zabbix trapper processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[process,unreachable poller,avg,busy].min(600)}>75'
+     name: Zabbix unreachable poller processes more than 75% busy
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/Zabbix_state_check.asciidoc
+
+   - description: "This alert generally indicates a performance problem or a problem\
+       \ with the zabbix-server or proxy.\r\n\r\nThe first place to check for issues\
+       \ is Administration > Queue. Be sure to check the general view and the per-proxy\
+       \ view."
+     expression: '{Template App Zabbix Server:zabbix[queue,10m].min(600)}>1000'
+     name: More than 1000 items having missing data for more than 10 minutes
+     priority: high
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/data_lost_overview_plugin.asciidoc
+
+   - description: Consider increasing CacheSize in the zabbix_server.conf configuration
+       file
+     expression: '{Template App Zabbix Server:zabbix[rcache,buffer,pfree].min(600)}<5'
+     name: Less than 5% free in the configuration cache
+     priority: info
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/check_cache.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[wcache,history,pfree].min(600)}<25'
+     name: Less than 25% free in the history cache
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/check_cache.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[wcache,text,pfree].min(600)}<25'
+     name: Less than 25% free in the text history cache
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/check_cache.asciidoc
+
+   - description: ''
+     expression: '{Template App Zabbix Server:zabbix[wcache,trend,pfree].min(600)}<25'
+     name: Less than 25% free in the trends cache
+     priority: avg
+     url: https://github.com/openshift/ops-sop/blob/master/Alerts/check_cache.asciidoc