Merge pull request #878 from openshift/master

Master to prod

2 files changed, 50 insertions, 0 deletions

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
diff --git a/roles/os_zabbix/vars/template_os_linux.yml b/roles/os_zabbix/vars/template_os_linux.yml
index fbc20cd63..04665be62 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: "Bytes per second IN on 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: "Bytes per second OUT on 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'