X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fcollectd.yaml;h=e6741156d0343ceb7008135d3aafcd17e0c4771b;hb=368b3eadda577f9914d181893df2df96367e8fad;hp=7354898b14f1049e74500015ab599dd00e6b6d3f;hpb=d68a938d14f6eb9d143cd9abee9ff5e2d16ae6dd;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 7354898b..e6741156 100644
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-collectd:latest'
     type: string
+  DockerCollectdConfigImage:
+    description: The container image to use for the collectd config_volume
+    default: 'centos-binary-collectd:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -55,7 +59,11 @@ outputs:
     description: Role data for the collectd role.
     value:
       service_name: {get_attr: [CollectdBase, role_data, service_name]}
-      config_settings: {get_attr: [CollectdBase, role_data, config_settings]}
+      config_settings:
+        map_merge:
+          - get_attr: [CollectdBase, role_data, config_settings]
+          - tripleo::profile::base::metrics::collectd::enable_file_logging: true
+            collectd::plugin::logfile::log_file: /var/log/collectd/collectd.log
       step_config: &step_config
         get_attr: [CollectdBase, role_data, step_config]
       service_config_settings: {get_attr: [CollectdBase, role_data, service_config_settings]}
@@ -64,17 +72,24 @@ outputs:
         config_volume: collectd
         puppet_tags:  collectd_client_config
         step_config: *step_config
-        config_image: &collectd_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerCollectdConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/collectd.json:
           command: /usr/sbin/collectd -f
+          permissions:
+            - path: /var/log/collectd
+              owner: collectd:collectd
+              recurse: true
       docker_config:
         step_3:
           collectd:
-            image: *collectd_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
             net: host
             privileged: true
             restart: always
@@ -84,11 +99,17 @@ outputs:
                 -
                   - /var/run/docker.sock:/var/run/docker.sock:rw
                   - /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/collectd/etc/collectd/:/etc/collectd/:ro
+                  - /var/lib/config-data/collectd/etc/collectd.conf:/etc/collectd.conf:ro
+                  - /var/lib/config-data/collectd/etc/collectd.d:/etc/collectd.d:ro
+                  - /var/log/containers/collectd:/var/log/collectd:rw
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/collectd
+            state: directory
       upgrade_tasks:
         - name: Stop and disable collectd service
           tags: step2
           service: name=collectd.service state=stopped enabled=no
-