Enable logging.conf & fluentd for ceilometer
This change introduce ability to use log_config_append parameter with
new FluentdHandler to send logs directly to Fluentd.
To save per binary log streams as it is in the default logging states generates
separate logging.conf files per service and use /etc/default/<service name>
to pass dedicated logging.conf to every service.
Change-Id: I65d2cc736e4475be0e23c02c234f4b3388900e7a
Related-Prod: PROD-16324
diff --git a/metadata/service/agent/cluster.yml b/metadata/service/agent/cluster.yml
index 1e56978..91cf7d9 100644
--- a/metadata/service/agent/cluster.yml
+++ b/metadata/service/agent/cluster.yml
@@ -5,6 +5,8 @@
parameters:
_param:
keystone_ceilometer_endpoint_type: internalURL
+ openstack_log_appender: false
+ openstack_fluentd_handler_enabled: false
ceilometer:
agent:
enabled: true
@@ -20,6 +22,13 @@
user: ceilometer
password: ${_param:keystone_ceilometer_password}
endpoint_type: ${_param:keystone_ceilometer_endpoint_type}
+ logging:
+ log_appender: ${_param:openstack_log_appender}
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: ${_param:openstack_fluentd_handler_enabled}
message_queue:
engine: rabbitmq
host: ${_param:cluster_vip_address}
diff --git a/metadata/service/agent/single.yml b/metadata/service/agent/single.yml
index dfffecf..23ee9ee 100644
--- a/metadata/service/agent/single.yml
+++ b/metadata/service/agent/single.yml
@@ -5,6 +5,8 @@
parameters:
_param:
keystone_ceilometer_endpoint_type: internalURL
+ openstack_log_appender: false
+ openstack_fluentd_handler_enabled: false
ceilometer:
agent:
enabled: true
@@ -20,6 +22,13 @@
user: ceilometer
password: ${_param:keystone_ceilometer_password}
endpoint_type: ${_param:keystone_ceilometer_endpoint_type}
+ logging:
+ log_appender: ${_param:openstack_log_appender}
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: ${_param:openstack_fluentd_handler_enabled}
message_queue:
engine: rabbitmq
host: ${_param:cluster_vip_address}
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index eaedfa1..5b190a8 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -5,6 +5,8 @@
parameters:
_param:
keystone_ceilometer_endpoint_type: internalURL
+ openstack_log_appender: false
+ openstack_fluentd_handler_enabled: false
ceilometer:
server:
enabled: true
@@ -25,6 +27,13 @@
user: ceilometer
password: ${_param:keystone_ceilometer_password}
endpoint_type: ${_param:keystone_ceilometer_endpoint_type}
+ logging:
+ log_appender: ${_param:openstack_log_appender}
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: ${_param:openstack_fluentd_handler_enabled}
message_queue:
engine: rabbitmq
host: ${_param:cluster_vip_address}
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index f150a61..d246599 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -5,6 +5,8 @@
parameters:
_param:
keystone_ceilometer_endpoint_type: internalURL
+ openstack_log_appender: false
+ openstack_fluentd_handler_enabled: false
ceilometer:
server:
enabled: true
@@ -24,6 +26,13 @@
user: ceilometer
password: ${_param:keystone_ceilometer_password}
endpoint_type: ${_param:keystone_ceilometer_endpoint_type}
+ logging:
+ log_appender: ${_param:openstack_log_appender}
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: ${_param:openstack_fluentd_handler_enabled}
message_queue:
engine: rabbitmq
host: ${_param:single_address}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 24f09b4..d423400 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -3,6 +3,8 @@
_support:
collectd:
enabled: true
+ fluentd:
+ enabled: true
heka:
enabled: true
sensu: