x
/
fuel-plugin-openstack-telemetry
Code Issues Proposed changes

Merge "'Extra Metadata' instead of metadata_fields in UI. ability to add to defaults for metadata_fields."

This commit is contained in:
Jenkins 2016-09-26 13:06:32 +00:00 committed by Gerrit Code Review
parent a874aef9dd d2b23f3178
commit 6634247fb9
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployment_scripts/puppet/manifests/hiera.pp
View File

@ -111,9 +111,19 @@ $rabbit_password = $rabbit_info['password']
$rabbit_user = $rabbit_info['user'] $rabbit_user = $rabbit_info['user']
$amqp_url = "amqp://${rabbit_user}:${rabbit_password}@${amqp_host}:${amqp_port}/" $amqp_url = "amqp://${rabbit_user}:${rabbit_password}@${amqp_host}:${amqp_port}/"
$metadata_fields = join(['status deleted container_format min_ram updated_at ', # metadata_fields defitition
$metadata_fields_default = join(['status deleted container_format min_ram updated_at ',
'min_disk is_public size checksum created_at disk_format protected instance_host ', 'min_disk is_public size checksum created_at disk_format protected instance_host ',
'host display_name instance_id instance_type status state']) 'host display_name instance_id instance_type status state user_metadata.stack'])
$metadata_fields_plugin = $plugin_data['metadata_fields']
if ( $metadata_fields_plugin != '') {
$metadata_fields = concat([$plugin_data['metadata_fields']], " ",${metadata_fields_default}")
}
else {
$metadata_fields = $metadata_fields_default
}
# Kafka # Kafka
$kafka_port = 9092 $kafka_port = 9092

17
environment_config.yaml
View File

@ -191,24 +191,21 @@ attributes:
metadata_ceilo: metadata_ceilo:
type: "radio" type: "radio"
value: 'yes' value: 'no'
weight: 60 weight: 60
label: 'Metadata for Ceilometer samples' label: 'Extra Metadata for Ceilometer samples'
values: values:
- data: 'yes' - data: 'yes'
label: "yes" label: "yes"
description: "" description: "Extra Metadata can be added if set"
- data: 'no' - data: 'no'
label: "no" label: "no"
description: "" description: "Default values for 'metadata' will be used if set"
metadata_fields: metadata_fields:
value: 'status deleted container_format min_ram updated_at value: ''
min_disk is_public size checksum created_at disk_format label: 'Extra Metadata'
protected instance_host host display_name instance_id description: 'Please use SPACE as a separator; Please specify extra metadata you want to be kept along with Ceilometer samples. This field is very important if you are going to do metadata-based Ceilometer queries'
instance_type status state'
label: 'metadata_fields'
description: 'Please specify all needed metadata you want to be kept along with Ceilometer samples. This field is very important if you are going to do metadata-based Ceilometer queries'
weight: 61 weight: 61
type: "text" type: "text"
restrictions: restrictions: