diff options
| author | Joel Diaz <jdiaz@redhat.com> | 2015-11-11 15:34:15 -0500 |
|---|---|---|
| committer | Joel Diaz <jdiaz@redhat.com> | 2015-11-11 15:34:15 -0500 |
| commit | 08c36a6bdbd5fe8a4ea8adf3b9c93853820c4d7f (patch) | |
| tree | f9565a41816ad1fe9f060d765a196f1bd7fb3787 | |
| parent | 4c6ef6236555af4f6c8d6b49a64f6134f11af73e (diff) | |
| parent | 5561086ad55cac6605df515f09b04284890f0b2b (diff) | |
| download | openshift-08c36a6bdbd5fe8a4ea8adf3b9c93853820c4d7f.tar.gz openshift-08c36a6bdbd5fe8a4ea8adf3b9c93853820c4d7f.tar.bz2 openshift-08c36a6bdbd5fe8a4ea8adf3b9c93853820c4d7f.tar.xz openshift-08c36a6bdbd5fe8a4ea8adf3b9c93853820c4d7f.zip | |
Merge pull request #874 from joelddiaz/s3-sla
Add zabbix pieces to hold AWS S3 bucket stats
| -rw-r--r-- | roles/os_zabbix/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/os_zabbix/vars/template_aws.yml | 25 |
2 files changed, 34 insertions, 0 deletions
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml index 82bf78b57..59c89bb02 100644 --- a/roles/os_zabbix/tasks/main.yml +++ b/roles/os_zabbix/tasks/main.yml @@ -16,6 +16,7 @@ - include_vars: template_app_zabbix_server.yml - include_vars: template_app_zabbix_agent.yml - include_vars: template_performance_copilot.yml +- include_vars: template_aws.yml - name: Include Template Heartbeat include: ../../lib_zabbix/tasks/create_template.yml @@ -88,3 +89,11 @@ server: "{{ ozb_server }}" user: "{{ ozb_user }}" password: "{{ ozb_password }}" + +- name: Include Template AWS + include: ../../lib_zabbix/tasks/create_template.yml + vars: + template: "{{ g_template_aws }}" + server: "{{ ozb_server }}" + user: "{{ ozb_user }}" + password: "{{ ozb_password }}" 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 |