openstack/openstack-ansible
Code Issues Proposed changes

Merge pull request #518 from mattt416/issue_430

Browse Source 
Create alarms for discovered devices
This commit is contained in:
Darren Birkett 2014-11-14 09:49:15 +00:00
commit 5d8f0db98b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/rpc_deploy/user_variables.yml
View File

@ -118,6 +118,8 @@ maas_monitoring_zones:
# This will be appended to the inventory_name of a host for MaaS purposes. # This will be appended to the inventory_name of a host for MaaS purposes.
# The inventory name + maas_fqdn_extension must match the entity name in MaaS # The inventory name + maas_fqdn_extension must match the entity name in MaaS
# maas_fqdn_extension: .example.com # maas_fqdn_extension: .example.com
# Set the following to skip creating alarms for this device
#maas_excluded_devices: ['xvde']
## Neutron Options ## Neutron Options
neutron_container_mysql_password: neutron_container_mysql_password:

8
rpc_deployment/playbooks/monitoring/maas_local.yml
View File

@ -338,14 +338,14 @@
- hosts: hosts - hosts: hosts
vars: vars:
devices: "[{% for device in ansible_devices.keys()%}{% if device not in maas_excluded_devices|default([]) %}'{{ device }}',{% endif %}{% endfor %}]"
check_name: disk_utilisation check_name: disk_utilisation
check_details: file={{ check_name }}.py check_details: file={{ check_name }}.py
check_period: "{{ maas_check_period }}" check_period: "{{ maas_check_period }}"
check_timeout: "{{ maas_check_timeout }}" check_timeout: "{{ maas_check_timeout }}"
alarms: # TODO (mattt): refactor this code so we can properly create dynamic alarms
- { 'name': 'percentage_disk_utilisation_sda', 'criteria': ':set consecutiveCount={{ maas_alarm_local_consecutive_count }} if (metric["disk_utilisation_sda"] >= 90.0) { return new AlarmStatus(WARNING, "Disk utilisation for sda >= 90%"); }' } # without using jinja
- { 'name': 'percentage_disk_utilisation_sdb', 'criteria': ':set consecutiveCount={{ maas_alarm_local_consecutive_count }} if (metric["disk_utilisation_sdb"] >= 90.0) { return new AlarmStatus(WARNING, "Disk utilisation for sdb >= 90%"); }' } alarms: "[{% for device in devices %}{ 'name': 'percentage_disk_utilisation_{{ device }}', 'criteria': ':set consecutiveCount={{ maas_alarm_local_consecutive_count }} if (metric[\"disk_utilisation_{{ device }}\"] >= 90.0) { return new AlarmStatus(WARNING, \"Disk utilisation for {{ device }} >= 90%\"); }' },{% endfor %}]"
- { 'name': 'percentage_disk_utilisation_sdc', 'criteria': ':set consecutiveCount={{ maas_alarm_local_consecutive_count }} if (metric["disk_utilisation_sdc"] >= 90.0) { return new AlarmStatus(WARNING, "Disk utilisation for sdc >= 90%"); }' }
user: root user: root
roles: roles:
- maas_local - maas_local