Add missing default values
diff --git a/README.rst b/README.rst
index 3c9cc8c..8b71fdd 100644
--- a/README.rst
+++ b/README.rst
@@ -92,6 +92,8 @@
* ``aggregator_port: 5565``
* ``amqp_exchange: nova``
+* ``amqp_port: 5672``
+* ``amqp_vhost: ''``
* ``automatic_starting: true``
* ``elastisearch_port: 9200``
* ``enabled: false``
@@ -156,11 +158,13 @@
Default values:
+* ``automatic_starting: true``
* ``elastisearch_port: 9200``
* ``enabled: false``
* ``influxdb_port: 8086``
* ``influxdb_time_precision: ms``
* ``influxdb_timeout: 5000``
+* ``poolsize: 100``
* ``rabbit_port: 5672``
* ``rabbit_vhost: /openstack``
* ``rabbit_queue: metering.sample``
diff --git a/heka/map.jinja b/heka/map.jinja
index 908c5df..c5aca5d 100644
--- a/heka/map.jinja
+++ b/heka/map.jinja
@@ -38,6 +38,8 @@
{% set default_nagios_port = 8001 %}
{% set default_nagios_host_alarm_clusters = '00-clusters' %}
{% set default_automatic_starting = True %}
+{% set default_amqp_port = 5672 %}
+{% set default_amqp_vhost = '' %}
{% set default_rabbit_port = 5672 %}
{% set default_rabbit_vhost = '/openstack' %}
@@ -65,6 +67,9 @@
{% set remote_collector = salt['grains.filter_by']({
'default': {
+ 'amqp_port': default_amqp_port,
+ 'amqp_vhost': default_amqp_vhost,
+ 'elasticsearch_port': default_elasticsearch_port,
'influxdb_port': default_influxdb_port,
'influxdb_time_precision': default_influxdb_time_precision,
'influxdb_timeout': default_influxdb_timeout,
@@ -96,5 +101,7 @@
'rabbit_vhost': default_rabbit_vhost,
'rabbit_queue': default_ceilometer_rabbit_queue,
'resource_decoding': False,
+ 'poolsize': 100,
+ 'automatic_starting': default_automatic_starting,
}
}, merge=salt['pillar.get']('heka:ceilometer_collector')) %}
diff --git a/heka/meta/heka.yml b/heka/meta/heka.yml
index fcf3cf0..a017cb2 100644
--- a/heka/meta/heka.yml
+++ b/heka/meta/heka.yml
@@ -184,7 +184,7 @@
port: {{ remote_collector.amqp_port }}
user: {{ remote_collector.amqp_user }}
password: {{ remote_collector.amqp_password }}
- vhost: {{ remote_collector.get('amqp_vhost', '') }}
+ vhost: {{ remote_collector.amqp_vhost }}
exchange: {{ remote_collector.get('amqp_exchange', 'nova') }}
exchange_type: topic
exchange_durability: false
diff --git a/metadata/service/ceilometer_collector/single.yml b/metadata/service/ceilometer_collector/single.yml
index bfc6e75..eacb11d 100644
--- a/metadata/service/ceilometer_collector/single.yml
+++ b/metadata/service/ceilometer_collector/single.yml
@@ -3,6 +3,11 @@
classes:
- service.heka.support
parameters:
+ _param:
+ ceilometer_collector_poolsize: 100
heka:
ceilometer_collector:
+ automatic_starting: true
enabled: true
+ influxdb_time_precision: ms
+ poolsize: ${_param:ceilometer_collector_poolsize}