Clean up UI

Change-Id: Ic51218b95ff79c6892e9755d852afb7151d62842
This commit is contained in:
Nadya Shakhat 2016-09-29 18:51:59 +03:00
parent 0b2b24f771
commit b42cc8c9bf
2 changed files with 12 additions and 18 deletions

View File

@ -111,7 +111,7 @@ $amqp_url = "amqp://${rabbit_user}:${rabbit_password}@${amqp_host}:${amqp
# metadata_fields definition
$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 ',
'host display_name instance_id instance_type status state user_metadata.stack'])
'host display_name instance_id instance_type status state user_metadata.stack'])
$metadata_fields_plugin = $plugin_data['metadata_fields']
# Kafka

View File

@ -11,7 +11,7 @@ attributes:
advanced_settings:
label: "Advanced settings"
value: false
description: "Ceilometer Event API and Resource API are disabled if not set"
description: "Enable Ceilometer Event API and Resource API"
weight: 10
type: checkbox
restrictions:
@ -61,15 +61,14 @@ attributes:
values:
- data: "local"
label: "Use local Elasticsearch"
description: "The ElasticSearch installed via The StackLight Elasticsearch-Kibana plugin will be used if set"
description: "If selected, Elasticsearch installed via the StackLight Elasticsearch-Kibana plugin will be used"
restrictions:
- condition: "(settings:elasticsearch_kibana == null) or (settings:elasticsearch_kibana.metadata.enabled != true)"
action: disable
strict: false
message: "The StackLight Elasticsearch-Kibana plugin must be installed and enabled. Or use Elasticsearch in 'external' mode"
- data: "remote"
label: "Use External Elasticsearch"
description: "'external' ElasticSearch will be used if set"
label: 'Use external Elasticsearch'
restrictions:
- condition: "settings:telemetry.advanced_settings.value == false"
action: hide
@ -78,8 +77,7 @@ attributes:
elastic_search_ip:
value: ''
label: 'External ElasticSearch IP or DNS name'
description: "In case you want to use an external Elasticsearch please specify an IP or a DNS name here"
label: 'External Elasticsearch IP or DNS name'
weight: 30
type: "text"
regex:
@ -97,7 +95,6 @@ attributes:
elastic_search_port:
value: '9200'
label: 'External Elasticsearch port'
description: "In case you want to use an external Elasticsearch please specify a port number. Default is 9200"
weight: 40
type: "text"
regex:
@ -119,20 +116,18 @@ attributes:
values:
- data: 'local'
label: "Use local InfluxDB"
description: "The InfluxDB installed via The StackLight InfluxDB-Grafana plugin will be used if set"
description: "If selected, InfluxDB installed via The StackLight InfluxDB-Grafana plugin will be used"
restrictions:
- condition: "(settings:influxdb_grafana == null) or (settings:influxdb_grafana.metadata.enabled != true)"
action: disable
strict: false
message: "The StackLight InfluxDB-Grafana plugin must be installed and enabled. Or use InfluxDB 'External' option below"
- data: 'remote'
label: "Use External InfluxDB"
description: "'external' InfluxDB will be used if set"
label: "Use external InfluxDB"
influxdb_address:
value: ''
label: 'External InfluxDB'
description: "In case you want to use a remote InfluxDB please spesify an IP or a DNS name here"
weight: 51
type: "text"
regex:
@ -145,7 +140,6 @@ attributes:
influxdb_port:
value: '8086'
label: 'External InfluxDB port'
description: "In case you want to use a remote InfluxDB please spesify a port number. DEFAULT is 8086"
weight: 52
type: "text"
regex:
@ -157,7 +151,7 @@ attributes:
influxdb_database:
value: 'ceilometer'
label: 'InfluxDB database name'
label: 'Extenal database name'
description: ''
weight: 53
type: "text"
@ -171,7 +165,7 @@ attributes:
influxdb_user:
value: ''
label: 'External InfluxDB user'
description: "The username to access external InfluxDB"
description: "Username for external InfluxDB"
weight: 54
type: "text"
regex:
@ -184,7 +178,7 @@ attributes:
influxdb_password:
value: ''
label: 'External InfluxDB password'
description: "The password to access external InfluxDB"
description: "Password for external InfluxDB"
weight: 55
type: "password"
regex:
@ -202,7 +196,7 @@ attributes:
values:
- data: 'yes'
label: "yes"
description: "Extra Metadata can be added if set"
description: "If selected, extra Metadata can be added"
- data: 'no'
label: "no"
description: "Default values for 'metadata' will be used if set"
@ -210,7 +204,7 @@ attributes:
metadata_fields:
value: ''
label: 'Extra Metadata'
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'
description: 'Specify the required metadata to be kept along with Ceilometer samples. This field is important if you are going to perform metadata-based Ceilometer queries.'
weight: 61
type: "text"
restrictions: