openstack/monasca-agent
Code Issues Proposed changes

Include scale_group metadata for customer metrics

Browse Source 
To enable customer VMs to use auto-scaling feature of Heat, the customer
metrics must include the scale_group. This change enables the monasca
agent to include scale group dimension with customer metrics.

Change-Id: I058557e6987888ff38d1bc7d21a26aa738b242a6
This commit is contained in:
Anant Patil 2016-09-21 13:30:16 +05:30 committed by Anant Patil
parent e91434e2e4
commit ebab1484b4
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf.d/libvirt.yaml.example
View File

@ -25,6 +25,9 @@ init_config:
# scaling in Heat. # scaling in Heat.
metadata: metadata:
- scale_group - scale_group
# Include scale group dimension for customer metrics.
customer_metadata:
- scale_group
instances: instances:
# Instances are automatically detected through queries to the Nova API, # Instances are automatically detected through queries to the Nova API,
# and therefore do not need to be listed here, so this remains empty. # and therefore do not need to be listed here, so this remains empty.

2
docs/Libvirt.md
View File

@ -79,6 +79,8 @@ init_config:
nova_refresh: 14400 nova_refresh: 14400
metadata: metadata:
- scale_group - scale_group
customer_metadata:
- scale_group
vm_probation: 300 vm_probation: 300
ping_check: /opt/stack/venv/monasca_agent-20160224T213950Z/bin/ip netns exec NAMESPACE ping_check: /opt/stack/venv/monasca_agent-20160224T213950Z/bin/ip netns exec NAMESPACE
/bin/ping -n -c1 -w1 -q /bin/ping -n -c1 -w1 -q

3
monasca_setup/detection/plugins/libvirt.py
View File

@ -28,6 +28,8 @@ vm_probation = 60 * 5 # Five minutes
# By default 'scale_group' metadata is used here for supporting auto # By default 'scale_group' metadata is used here for supporting auto
# scaling in Heat. # scaling in Heat.
metadata = ['scale_group'] metadata = ['scale_group']
# Include scale group dimension for customer metrics.
customer_metadata = ['scale_group']
# List 'ping' commands (paths and parameters) in order of preference. # List 'ping' commands (paths and parameters) in order of preference.
# The plugin will use the first fuctional command. 127.0.0.1 will be appended. # The plugin will use the first fuctional command. 127.0.0.1 will be appended.
ping_options = [["/usr/bin/fping", "-n", "-c1", "-t250", "-q"], ping_options = [["/usr/bin/fping", "-n", "-c1", "-t250", "-q"],
@ -111,6 +113,7 @@ class Libvirt(Plugin):
'nova_refresh': nova_refresh, 'nova_refresh': nova_refresh,
'vm_probation': vm_probation, 'vm_probation': vm_probation,
'metadata': metadata, 'metadata': metadata,
'customer_metadata': customer_metadata,
'max_ping_concurrency': default_max_ping_concurrency, 'max_ping_concurrency': default_max_ping_concurrency,
'disk_collection_period': default_disk_collection_period, 'disk_collection_period': default_disk_collection_period,
'vnic_collection_period': default_vnic_collection_period} 'vnic_collection_period': default_vnic_collection_period}