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

diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 7354898b..3c0ba09b 100644
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -4,19 +4,21 @@ description: >
   Containerized collectd service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerCollectdImage:
     description: image
-    default: 'centos-binary-collectd:latest'
+    type: string
+  DockerCollectdConfigImage:
+    description: The container image to use for the collectd config_volume
     type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -45,6 +47,7 @@ resources:
     type: ../../puppet/services/metrics/collectd.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -55,7 +58,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,31 +71,43 @@ outputs:
         config_volume: collectd
         puppet_tags:  collectd_client_config
         step_config: *step_config
-        config_image: &collectd_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
+        config_image: {get_param: DockerCollectdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/collectd.json:
           command: /usr/sbin/collectd -f
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
+          permissions:
+            - path: /var/log/collectd
+              owner: collectd:collectd
+              recurse: true
       docker_config:
         step_3:
           collectd:
-            image: *collectd_image
+            image: {get_param: DockerCollectdImage}
             net: host
+            pid: host
             privileged: true
+            user: root
             restart: always
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
-                  - /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/puppet-generated/collectd/:/var/lib/kolla/config_files/src: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
-