Fix ceilometer not sending logs to heka

ceilometer is not sending logs to heka because no heka-ceilometer.toml is created.
Updated templates files.

Change-Id: I69f3d93377c6c51d22f37ed120800f7489f5a8a0
Closes-Bug: #1642665

ansible/roles/common/tasks/config.yml

@@ -27,6 +27,7 @@
   with_items:
     - { name: "aodh", enabled: "{{ enable_aodh }}" }
     - { name: "barbican", enabled: "{{ enable_barbican }}"}
+    - { name: "ceilometer", enabled: "{{ enable_ceilometer }}" }
     - { name: "elasticsearch", enabled: "{{ enable_elasticsearch }}" }
     - { name: "global", enabled: "yes" }
     - { name: "gnocchi", enabled: "{{ enable_gnocchi }}" }

ansible/roles/common/templates/heka-ceilometer.toml.j2

@@ -8,6 +8,6 @@ filename = "lua_decoders/os_ceilometer_apache_log.lua"
 type = "LogstreamerInput"
 decoder = "ceilometer_apache_log_decoder"
 log_directory = "/var/log/kolla"
-file_match = 'ceilometer/(?P<Service>ceilometer-api.*)\.log\.?(?P<Seq>\d*)$'
+file_match = 'ceilometer/(?P<Service>ceilometer-.*)\.log\.?(?P<Seq>\d*)$'
 priority = ["^Seq"]
 differentiator = ["Service"]

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|ceilometer|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|ceph|cinder|heat|murano|magnum|mistral|manila|searchlight|senlin|sahara)/(?P<Program>.*)\.log\.?(?P<Seq>\d*)$'
 priority = ["^Seq"]
 differentiator = ["Service", "_", "Program"]

ansible/roles/common/templates/heka.json.j2

@@ -43,6 +43,13 @@
             "perm": "0600",
             "optional": {{ (not enable_barbican | bool) | string | lower }}
         },
+        {
+            "source": "{{ container_config_directory }}/heka-ceilometer.toml",
+            "dest": "/etc/heka/heka-ceilometer.toml",
+            "owner": "heka",
+            "perm": "0600",
+            "optional": {{ (not enable_ceilometer | bool) | string | lower }}
+        },
         {
             "source": "{{ container_config_directory }}/heka-custom.toml",
             "dest": "/etc/heka/heka-custom.toml",