From ae06c06c4b3584e5891c806b690f5ac1fa283124 Mon Sep 17 00:00:00 2001 From: Matt Woodson Date: Fri, 6 Nov 2015 12:47:15 -0500 Subject: added network checks. also updated item prototype code to support more --- roles/os_zabbix/vars/template_os_linux.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'roles/os_zabbix/vars') diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml index fbc20cd63..2f1b85f30 100644 --- a/roles/os_zabbix/vars/template_os_linux.yml +++ b/roles/os_zabbix/vars/template_os_linux.yml @@ -199,6 +199,11 @@ g_template_os_linux: lifetime: 1 description: "Dynamically register disks on a node" + - name: disc.network + key: disc.network + lifetime: 1 + description: "Dynamically register network interfaces on a node" + zitemprototypes: - discoveryrule_key: disc.filesys name: "disc.filesys.full.{#OSO_FILESYS}" @@ -232,6 +237,26 @@ g_template_os_linux: applications: - Disk + - discoveryrule_key: disc.network + name: "Byte in for network interface {#OSO_NET_INTERFACE}" + key: "disc.network.in.bytes[{#OSO_NET_INTERFACE}]" + value_type: int + units: B + delta: 1 + description: "PCP network.interface.in.bytes metric. This is setup as a delta in Zabbix to measure the speed per second" + applications: + - Network + + - discoveryrule_key: disc.network + name: "Byte out for network interface {#OSO_NET_INTERFACE}" + key: "disc.network.out.bytes[{#OSO_NET_INTERFACE}]" + value_type: int + units: B + delta: 1 + description: "PCP network.interface.out.bytes metric. This is setup as a delta in Zabbix to measure the speed per second" + applications: + - Network + 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' -- cgit v1.2.3 From e224c56d78f7e7855de37dc17b45a34547e67860 Mon Sep 17 00:00:00 2001 From: Matt Woodson Date: Fri, 6 Nov 2015 15:13:11 -0500 Subject: cleaned up network checks --- roles/os_zabbix/vars/template_os_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/os_zabbix/vars') diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml index 2f1b85f30..958358516 100644 --- a/roles/os_zabbix/vars/template_os_linux.yml +++ b/roles/os_zabbix/vars/template_os_linux.yml @@ -238,7 +238,7 @@ g_template_os_linux: - Disk - discoveryrule_key: disc.network - name: "Byte in for network interface {#OSO_NET_INTERFACE}" + name: "Bytes per second on network interface {#OSO_NET_INTERFACE}" key: "disc.network.in.bytes[{#OSO_NET_INTERFACE}]" value_type: int units: B @@ -248,7 +248,7 @@ g_template_os_linux: - Network - discoveryrule_key: disc.network - name: "Byte out for network interface {#OSO_NET_INTERFACE}" + name: "Bytes per second on network interface {#OSO_NET_INTERFACE}" key: "disc.network.out.bytes[{#OSO_NET_INTERFACE}]" value_type: int units: B -- cgit v1.2.3 From c802664db4e7f8de0f750ce45c0a4cd8e2b4616d Mon Sep 17 00:00:00 2001 From: Matt Woodson Date: Fri, 6 Nov 2015 16:06:10 -0500 Subject: more cleanup of names --- roles/os_zabbix/vars/template_os_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/os_zabbix/vars') diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml index 958358516..04665be62 100644 --- a/roles/os_zabbix/vars/template_os_linux.yml +++ b/roles/os_zabbix/vars/template_os_linux.yml @@ -238,7 +238,7 @@ g_template_os_linux: - Disk - discoveryrule_key: disc.network - name: "Bytes per second on network interface {#OSO_NET_INTERFACE}" + name: "Bytes per second IN on network interface {#OSO_NET_INTERFACE}" key: "disc.network.in.bytes[{#OSO_NET_INTERFACE}]" value_type: int units: B @@ -248,7 +248,7 @@ g_template_os_linux: - Network - discoveryrule_key: disc.network - name: "Bytes per second on network interface {#OSO_NET_INTERFACE}" + name: "Bytes per second OUT on network interface {#OSO_NET_INTERFACE}" key: "disc.network.out.bytes[{#OSO_NET_INTERFACE}]" value_type: int units: B -- cgit v1.2.3 From 5561086ad55cac6605df515f09b04284890f0b2b Mon Sep 17 00:00:00 2001 From: Joel Diaz Date: Wed, 11 Nov 2015 15:28:43 -0500 Subject: Add zabbix pieces to hold AWS S3 bucket stats --- roles/os_zabbix/vars/template_aws.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 roles/os_zabbix/vars/template_aws.yml (limited to 'roles/os_zabbix/vars') diff --git a/roles/os_zabbix/vars/template_aws.yml b/roles/os_zabbix/vars/template_aws.yml new file mode 100644 index 000000000..0ed682128 --- /dev/null +++ b/roles/os_zabbix/vars/template_aws.yml @@ -0,0 +1,25 @@ +--- +g_template_aws: + name: Template AWS + zdiscoveryrules: + - name: disc.aws + key: disc.aws + lifetime: 1 + description: "Dynamically register AWS bucket info" + + zitemprototypes: + - discoveryrule_key: disc.aws + name: "S3 bucket size (GB) [{#S3_BUCKET}]" + key: "disc.aws.size[{#S3_BUCKET}]" + value_type: int + description: "Size of S3 bucket" + applications: + - AWS + + - discoveryrule_key: disc.aws + name: "S3 bucket object count [{#S3_BUCKET}]" + key: "disc.aws.objects[{#S3_BUCKET}]" + value_type: int + description: "Objects in S3 bucket" + applications: + - AWS -- cgit v1.2.3