diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_zabbix/library/zbx_trigger.py | 4 | ||||
| -rw-r--r-- | roles/lib_zabbix/tasks/create_template.yml | 36 | ||||
| -rw-r--r-- | roles/os_zabbix/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_docker.yml | 83 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_host.yml | 27 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_master.yml | 27 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_node.yml | 27 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_router.yml | 27 | 
8 files changed, 111 insertions, 129 deletions
| diff --git a/roles/lib_zabbix/library/zbx_trigger.py b/roles/lib_zabbix/library/zbx_trigger.py index 43f3d2677..c707a2f64 100644 --- a/roles/lib_zabbix/library/zbx_trigger.py +++ b/roles/lib_zabbix/library/zbx_trigger.py @@ -65,7 +65,7 @@ def get_deps(zapi, deps):      for desc in deps:          content = zapi.get_content('trigger',                                     'get', -                                   {'search': {'description': desc}, +                                   {'filter': {'description': desc},                                      'expandExpression': True,                                      'selectDependencies': 'triggerid',                                     }) @@ -119,7 +119,7 @@ def main():      content = zapi.get_content(zbx_class_name,                                 'get', -                               {'search': {'description': description}, +                               {'filter': {'description': description},                                  'expandExpression': True,                                  'selectDependencies': 'triggerid',                                 }) diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml index 022ca52f2..444fd0a14 100644 --- a/roles/lib_zabbix/tasks/create_template.yml +++ b/roles/lib_zabbix/tasks/create_template.yml @@ -16,18 +16,21 @@  - debug: var=lzbx_applications -- name: Create Application -  zbx_application: -    zbx_server: "{{ server }}" -    zbx_user: "{{ user }}" -    zbx_password: "{{ password }}" -    name: "{{ item }}" -    template_name: "{{ template.name }}" -  with_items: lzbx_applications -  register: created_application -  when: template.zitems is defined - -- debug: var=created_application +# +# twiest: This is commented out because it doesn't work correctly +# +#- name: Create Application +#  zbx_application: +#    zbx_server: "{{ server }}" +#    zbx_user: "{{ user }}" +#    zbx_password: "{{ password }}" +#    name: "{{ item }}" +#    template_name: "{{ template.name }}" +#  with_items: lzbx_applications +#  register: created_application +#  when: template.zitems is defined + +#- debug: var=created_application  - name: Create Items    zbx_item: @@ -38,24 +41,19 @@      name: "{{ item.name | default(item.key, true) }}"      value_type: "{{ item.value_type | default('int') }}"      template_name: "{{ template.name }}" -    applications: "{{ item.applications }}" +#    applications: "{{ item.applications }}"    with_items: template.zitems    register: created_items    when: template.zitems is defined -#- debug: var=ctp_created_items -  - name: Create Triggers    zbx_trigger:      zbx_server: "{{ server }}"      zbx_user: "{{ user }}"      zbx_password: "{{ password }}"      description: "{{ item.description }}" +    dependencies: "{{ item.dependencies | default([], true) }}"      expression: "{{ item.expression }}"      priority: "{{ item.priority }}"    with_items: template.ztriggers    when: template.ztriggers is defined - -#- debug: var=ctp_created_triggers - - diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml index 7111c778b..5d6e67606 100644 --- a/roles/os_zabbix/tasks/main.yml +++ b/roles/os_zabbix/tasks/main.yml @@ -11,6 +11,7 @@  - include_vars: template_heartbeat.yml  - include_vars: template_os_linux.yml +- include_vars: template_docker.yml  - name: Include Template Heartbeat    include: ../../lib_zabbix/tasks/create_template.yml @@ -28,3 +29,11 @@      user: "{{ ozb_user }}"      password: "{{ ozb_password }}" +- name: Include Template docker +  include: ../../lib_zabbix/tasks/create_template.yml +  vars: +    template: "{{ g_template_docker }}" +    server: "{{ ozb_server }}" +    user: "{{ ozb_user }}" +    password: "{{ ozb_password }}" + diff --git a/roles/os_zabbix/vars/template_docker.yml b/roles/os_zabbix/vars/template_docker.yml new file mode 100644 index 000000000..eab497269 --- /dev/null +++ b/roles/os_zabbix/vars/template_docker.yml @@ -0,0 +1,83 @@ +--- +g_template_docker: +  name: Template Docker +  zitems: +  - key: docker.ping +    applications: +    - Docker Daemon +    value_type: int + +  - key: docker.storage.is_loopback +    applications: +    - Docker Storage +    value_type: int + +  - key: docker.storage.data.space.total +    applications: +    - Docker Storage +    value_type: float + +  - key: docker.storage.data.space.used +    applications: +    - Docker Storage +    value_type: float + +  - key: docker.storage.data.space.available +    applications: +    - Docker Storage +    value_type: float + +  - key: docker.storage.data.space.percent_available +    applications: +    - Docker Storage +    value_type: float + +  - key: docker.storage.metadata.space.total +    applications: +    - Docker Storage +    value_type: float + +  - key: docker.storage.metadata.space.used +    applications: +    - Docker Storage +    value_type: float + +  - key: docker.storage.metadata.space.available +    applications: +    - Docker Storage +    value_type: float + +  - key: docker.storage.metadata.space.percent_available +    applications: +    - Docker Storage +    value_type: float +  ztriggers: +  - description: 'docker.ping failed on {HOST.NAME}' +    expression: '{Template Docker:docker.ping.max(#3)}<1' +    priority: high + +  - description: 'Docker storage is using LOOPBACK on {HOST.NAME}' +    expression: '{Template Docker:docker.storage.is_loopback.last()}<>0' +    priority: high + +  - description: 'Critically low docker storage data space on {HOST.NAME}' +    expression: '{Template Docker:docker.storage.data.space.percent_available.max(#3)}<5 or {Template Docker:docker.storage.data.space.available.max(#3)}<5' # < 5% or < 5GB +    priority: high + +  - description: 'Critically low docker storage metadata space on {HOST.NAME}' +    expression: '{Template Docker:docker.storage.metadata.space.percent_available.max(#3)}<5 or {Template Docker:docker.storage.metadata.space.available.max(#3)}<0.1' # < 5% or < 100MB +    priority: high + +  # Put triggers that depend on other triggers here (deps must be created first) +  - description: 'Low docker storage data space on {HOST.NAME}' +    expression: '{Template Docker:docker.storage.data.space.percent_available.max(#3)}<10 or {Template Docker:docker.storage.data.space.available.max(#3)}<10' # < 10% or < 10GB +    dependencies: +    - 'Critically low docker storage data space on {HOST.NAME}' +    priority: average + +  - description: 'Low docker storage metadata space on {HOST.NAME}' +    expression: '{Template Docker:docker.storage.metadata.space.percent_available.max(#3)}<10 or {Template Docker:docker.storage.metadata.space.available.max(#3)}<0.2' # < 10% or < 200MB +    dependencies: +    - 'Critically low docker storage metadata space on {HOST.NAME}' +    priority: average + diff --git a/roles/os_zabbix/vars/template_host.yml b/roles/os_zabbix/vars/template_host.yml deleted file mode 100644 index e7cc667cb..000000000 --- a/roles/os_zabbix/vars/template_host.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -g_template_host: -  params: -    name: Template Host -    host: Template Host -    groups: -    - groupid: 1 # FIXME (not real) -    output: extend -    search: -      name: Template Host -  zitems: -  - name: Host Ping -    hostid:  -    key_: host.ping -    type: 2 -    value_type: 0 -    output: extend -    search: -      key_: host.ping -  ztriggers: -  - description: 'Host ping has failed on {HOST.NAME}' -    expression: '{Template Host:host.ping.last()}<>0' -    priority: 3 -    searchWildcardsEnabled: True -    search: -      description: 'Host ping has failed on*' -    expandExpression: True diff --git a/roles/os_zabbix/vars/template_master.yml b/roles/os_zabbix/vars/template_master.yml deleted file mode 100644 index 5f9b41a4f..000000000 --- a/roles/os_zabbix/vars/template_master.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -g_template_master: -  params: -    name: Template Master -    host: Template Master -    groups: -    - groupid: 1 # FIXME (not real) -    output: extend -    search: -      name: Template Master -  zitems: -  - name: Master Etcd Ping -    hostid:  -    key_: master.etcd.ping -    type: 2 -    value_type: 0 -    output: extend -    search: -      key_: master.etcd.ping -  ztriggers: -  - description: 'Master Etcd ping has failed on {HOST.NAME}' -    expression: '{Template Master:master.etcd.ping.last()}<>0' -    priority: 3 -    searchWildcardsEnabled: True -    search: -      description: 'Master Etcd ping has failed on*' -    expandExpression: True diff --git a/roles/os_zabbix/vars/template_node.yml b/roles/os_zabbix/vars/template_node.yml deleted file mode 100644 index 98c343a24..000000000 --- a/roles/os_zabbix/vars/template_node.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -g_template_node: -  params: -    name: Template Node -    host: Template Node -    groups: -    - groupid: 1 # FIXME (not real) -    output: extend -    search: -      name: Template Node -  zitems: -  - name: Kubelet Ping -    hostid:  -    key_: kubelet.ping -    type: 2 -    value_type: 0 -    output: extend -    search: -      key_: kubelet.ping -  ztriggers: -  - description: 'Kubelet ping has failed on {HOST.NAME}' -    expression: '{Template Node:kubelet.ping.last()}<>0' -    priority: 3 -    searchWildcardsEnabled: True -    search: -      description: 'Kubelet ping has failed on*' -    expandExpression: True diff --git a/roles/os_zabbix/vars/template_router.yml b/roles/os_zabbix/vars/template_router.yml deleted file mode 100644 index 4dae7da1e..000000000 --- a/roles/os_zabbix/vars/template_router.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -g_template_router: -  params: -    name: Template Router -    host: Template Router -    groups: -    - groupid: 1 # FIXME (not real) -    output: extend -    search: -      name: Template Router -  zitems: -  - name: Router Backends down -    hostid:  -    key_: router.backends.down -    type: 2 -    value_type: 0 -    output: extend -    search: -      key_: router.backends.down -  ztriggers: -  - description: 'Number of router backends down on {HOST.NAME}' -    expression: '{Template Router:router.backends.down.last()}<>0' -    priority: 3 -    searchWildcardsEnabled: True -    search: -      description: 'Number of router backends down on {HOST.NAME}' -    expandExpression: True | 
