diff options
| author | jackning <ningyougang@navercorp.com> | 2016-08-08 21:40:46 -0400 |
|---|---|---|
| committer | jackning <ningyougang@navercorp.com> | 2016-08-08 21:44:03 -0400 |
| commit | 173d2540865987733f4346440f6c5f9d3bc4ae40 (patch) | |
| tree | 436c85ed469f640f6ab90871e2a4cb941e83628b | |
| parent | aa5864fc409ac8ff27f0b380b3ba45a3de0d1b98 (diff) | |
| download | kolla-173d2540865987733f4346440f6c5f9d3bc4ae40.tar.gz kolla-173d2540865987733f4346440f6c5f9d3bc4ae40.zip | |
Add heka custom config to define user's log pipline
Kolla's default heka pipline may not satisfy user's requirements,
for example, sending openstack log to outer log analyze system.
So it is necessary to add heka custom configuration for define
user's encoders, outputs and other plugins.
Change-Id: I48bd8d7e0afbc2d023c49c83041f87a04970bbb6
Closes-Bug: #1611164
| -rw-r--r-- | ansible/roles/common/tasks/config.yml | 10 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka.json.j2 | 7 |
2 files changed, 17 insertions, 0 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 27a98576c..d3d0c3a71 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -48,6 +48,16 @@ - { name: "swift-proxy-server", src: "swift", enabled: "{{ enable_swift }}" } - { name: "swift-rsyncd", src: "swift", enabled: "{{ enable_swift }}" } +- name: Heka custom config file exists + stat: "path={{ node_custom_config }}/heka/heka-custom.toml" + register: heka_custom_stat_result + +- name: Copying over heka custom config file + template: + src: "{{ node_custom_config }}/heka/heka-custom.toml" + dest: "{{ node_config_directory }}/heka/heka-custom.toml" + when: heka_custom_stat_result.stat.exists == true + - name: Copying over cron logrotate config files template: src: "cron-logrotate-{{ item }}.conf.j2" diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index 5b2de756a..11a73c55e 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -16,6 +16,13 @@ "perm": "0600" }, { + "source": "{{ container_config_directory }}/heka-custom.toml", + "dest": "/etc/heka/heka-custom.toml", + "owner": "heka", + "perm": "0600", + "optional": true + }, + { "source": "{{ container_config_directory }}/heka-haproxy.toml", "dest": "/etc/heka/heka-haproxy.toml", "owner": "heka", |