diff options
author | stran <steveqtran@gmail.com> | 2017-09-25 17:46:29 -0400 |
---|---|---|
committer | stran <steveqtran@gmail.com> | 2017-09-27 10:54:47 -0400 |
commit | 5a8736cab14618e6c9dd11183613ac5eff403c66 (patch) | |
tree | 02fa7b63f1c510290a3eafd37ecfc462d41ff1a6 /roles/openshift_logging_mux | |
parent | 5afef2e7b29813760aa7b4f42013aebe16d08ec8 (diff) | |
download | openshift-5a8736cab14618e6c9dd11183613ac5eff403c66.tar.gz openshift-5a8736cab14618e6c9dd11183613ac5eff403c66.tar.bz2 openshift-5a8736cab14618e6c9dd11183613ac5eff403c66.tar.xz openshift-5a8736cab14618e6c9dd11183613ac5eff403c66.zip |
Added new variables for logging role for remote-syslog plugin
Includes the following code review fixes, and a rebase with upstream/master
- mux.j2 template needed mux specific parameters for syslog configs
- fixed bug in IF condition not checking for true-ness
- updated README wording to remove ambiguity of payload_key's datatype
Diffstat (limited to 'roles/openshift_logging_mux')
-rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index ff18d3270..4cc48139f 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -119,6 +119,52 @@ spec: resource: limits.memory - name: "FILE_BUFFER_LIMIT" value: "{{ openshift_logging_mux_file_buffer_limit | default('2Gi') }}" + +{% if openshift_logging_mux_remote_syslog is defined and openshift_logging_mux_remote_syslog %} + - name: USE_REMOTE_SYSLOG + value: "true" +{% endif %} + +{% if openshift_logging_mux_remote_syslog_host is defined %} + - name: REMOTE_SYSLOG_HOST + value: "{{ openshift_logging_mux_remote_syslog_host }}" +{% endif %} + +{% if openshift_logging_mux_remote_syslog_port is defined %} + - name: REMOTE_SYSLOG_PORT + value: "{{ openshift_logging_mux_remote_syslog_port }}" +{% endif %} + +{% if openshift_logging_mux_remote_syslog_severity is defined %} + - name: REMOTE_SYSLOG_SEVERITY + value: "{{ openshift_logging_mux_remote_syslog_severity }}" +{% endif %} + +{% if openshift_logging_mux_remote_syslog_facility is defined %} + - name: REMOTE_SYSLOG_FACILITY + value: "{{ openshift_logging_mux_remote_syslog_facility }}" +{% endif %} + +{% if openshift_logging_mux_remote_syslog_remove_tag_prefix is defined %} + - name: REMOTE_SYSLOG_REMOVE_TAG_PREFIX + value: "{{ openshift_logging_mux_remote_syslog_remove_tag_prefix }}" +{% endif %} + +{% if openshift_logging_mux_remote_syslog_tag_key is defined %} + - name: REMOTE_SYSLOG_TAG_KEY + value: "{{ openshift_logging_mux_remote_syslog_tag_key }}" +{% endif %} + +{% if openshift_logging_mux_remote_syslog_use_record is defined %} + - name: REMOTE_SYSLOG_USE_RECORD + value: "{{ openshift_logging_mux_remote_syslog_use_record }}" +{% endif %} + +{% if openshift_logging_mux_remote_syslog_payload_key is defined %} + - name: REMOTE_SYSLOG_PAYLOAD_KEY + value: "{{ openshift_logging_mux_remote_syslog_payload_key }}" +{% endif %} + volumes: - name: config configMap: |