diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-04 15:05:06 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-04 15:05:06 -0400 |
| commit | 153c57d6bda48276bc1f8be520145780fa119941 (patch) | |
| tree | 7bcd0ddd715a688e9695bd65c642a89e1cda2687 /roles/os_zabbix | |
| parent | 215a7aacc2fc3df19a64a2a57910516533665423 (diff) | |
| parent | 896b9c63292a50dce8e7aa00a889dfd52a3a8474 (diff) | |
| download | openshift-153c57d6bda48276bc1f8be520145780fa119941.tar.gz openshift-153c57d6bda48276bc1f8be520145780fa119941.tar.bz2 openshift-153c57d6bda48276bc1f8be520145780fa119941.tar.xz openshift-153c57d6bda48276bc1f8be520145780fa119941.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade
Diffstat (limited to 'roles/os_zabbix')
| -rw-r--r-- | roles/os_zabbix/vars/template_os_linux.yml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml index aeeec4b8d..fbc20cd63 100644 --- a/roles/os_zabbix/vars/template_os_linux.yml +++ b/roles/os_zabbix/vars/template_os_linux.yml @@ -194,6 +194,11 @@ g_template_os_linux: lifetime: 1 description: "Dynamically register the filesystems" + - name: disc.disk + key: disc.disk + lifetime: 1 + description: "Dynamically register disks on a node" + zitemprototypes: - discoveryrule_key: disc.filesys name: "disc.filesys.full.{#OSO_FILESYS}" @@ -211,6 +216,22 @@ g_template_os_linux: applications: - Disk + - discoveryrule_key: disc.disk + name: "TPS (IOPS) for disk {#OSO_DISK}" + key: "disc.disk.tps[{#OSO_DISK}]" + value_type: int + description: "PCP disk.dev.totals metric measured over a period of time. This shows how many disk transactions per second the disk is using" + applications: + - Disk + + - discoveryrule_key: disc.disk + name: "Percent Utilized for disk {#OSO_DISK}" + key: "disc.disk.putil[{#OSO_DISK}]" + value_type: float + description: "PCP disk.dev.avactive metric measured over a period of time. This is the '%util' in the iostat command" + applications: + - Disk + ztriggerprototypes: - name: 'Filesystem: {#OSO_FILESYS} has less than 15% free disk space on {HOST.NAME}' expression: '{Template OS Linux:disc.filesys.full[{#OSO_FILESYS}].last()}>85' |