diff options
Diffstat (limited to 'ansible')
5 files changed, 19 insertions, 1 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index aefdfca6c..6124aa2b3 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -73,6 +73,7 @@ - { name: "ansible", enabled: "yes" } - { name: "aodh", enabled: "{{ enable_aodh }}" } - { name: "barbican", enabled: "{{ enable_barbican }}" } + - { name: "ceilometer", enabled: "{{ enable_ceilometer }}" } - { name: "cinder", enabled: "{{ enable_cinder }}" } - { name: "cloudkitty", enabled: "{{ enable_cloudkitty }}" } - { name: "elasticsearch", enabled: "{{ enable_elasticsearch }}" } diff --git a/ansible/roles/common/templates/cron-logrotate-ceilometer.conf.j2 b/ansible/roles/common/templates/cron-logrotate-ceilometer.conf.j2 new file mode 100644 index 000000000..5993500a5 --- /dev/null +++ b/ansible/roles/common/templates/cron-logrotate-ceilometer.conf.j2 @@ -0,0 +1,3 @@ +"/var/log/kolla/ceilometer/*.log" +{ +} diff --git a/ansible/roles/common/templates/cron.json.j2 b/ansible/roles/common/templates/cron.json.j2 index b9fc0d1df..8a338195e 100644 --- a/ansible/roles/common/templates/cron.json.j2 +++ b/ansible/roles/common/templates/cron.json.j2 @@ -3,6 +3,7 @@ ( 'ansible', 'yes' ), ( 'aodh', enable_aodh ), ( 'barbican', enable_barbican ), + ( 'ceilometer', enable_ceilometer ), ( 'cinder', enable_cinder ), ( 'cloudkitty', enable_cloudkitty ), ( 'elasticsearch', enable_elasticsearch ), diff --git a/ansible/roles/common/templates/heka-ceilometer.toml.j2 b/ansible/roles/common/templates/heka-ceilometer.toml.j2 new file mode 100644 index 000000000..cb2cb538e --- /dev/null +++ b/ansible/roles/common/templates/heka-ceilometer.toml.j2 @@ -0,0 +1,13 @@ +[ceilometer_apache_log_decoder] +type = "SandboxDecoder" +filename = "lua_decoders/os_ceilometer_apache_log.lua" + [ceilometer_apache_log_decoder.config] + apache_log_pattern = '%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"' + +[ceilometer_apache_logstreamer_input] +type = "LogstreamerInput" +decoder = "ceilometer_apache_log_decoder" +log_directory = "/var/log/kolla" +file_match = 'ceilometer/(?P<Service>ceilometer-api.*)\.log\.?(?P<Seq>\d*)$' +priority = ["^Seq"] +differentiator = ["Service"] diff --git a/ansible/roles/common/templates/heka-openstack.toml.j2 b/ansible/roles/common/templates/heka-openstack.toml.j2 index 1a2273380..ef6334dc1 100644 --- a/ansible/roles/common/templates/heka-openstack.toml.j2 +++ b/ansible/roles/common/templates/heka-openstack.toml.j2 @@ -6,6 +6,6 @@ filename = "lua_decoders/os_openstack_log.lua" type = "LogstreamerInput" decoder = "openstack_log_decoder" log_directory = "/var/log/kolla" -file_match = '(?P<Service>cloudkitty|nova|glance|keystone|neutron|ceph|cinder|heat|murano|magnum|mistral|manila|searchlight|senlin|sahara)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$' +file_match = '(?P<Service>cloudkitty|nova|glance|keystone|neutron|ceilometer|ceph|cinder|heat|murano|magnum|mistral|manila|searchlight|senlin|sahara)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$' priority = ["^Seq"] differentiator = ["Service", "_", "Program"] |