Просмотр исходного кода

Bug 1554293 - logging-eventrouter event not formatted correctly in Elasticsearch when using MUX

If openshift_logging_install_eventrouter is true, set TRANSFORM_EVENTS true in MUX, as well.
Noriko Hosoi 6 лет назад
Родитель
Сommit
e215ce7c5d

+ 1 - 1
roles/openshift_logging_fluentd/templates/fluentd.j2

@@ -149,7 +149,7 @@ spec:
         - name: "MUX_CLIENT_MODE"
           value: "{{ openshift_logging_mux_client_mode }}"
 {% endif %}
-{% if openshift_logging_install_eventrouter is defined and openshift_logging_install_eventrouter %}
+{% if openshift_logging_install_eventrouter is defined and (openshift_logging_install_eventrouter | bool) %}
         - name: "TRANSFORM_EVENTS"
           value: "true"
 {% endif %}

+ 4 - 0
roles/openshift_logging_mux/templates/mux.j2

@@ -128,6 +128,10 @@ spec:
               resource: limits.memory
         - name: "FILE_BUFFER_LIMIT"
           value: "{{ openshift_logging_mux_file_buffer_limit | default('2Gi') }}"
+{% if openshift_logging_install_eventrouter is defined and (openshift_logging_install_eventrouter | bool) %}
+        - name: "TRANSFORM_EVENTS"
+          value: "true"
+{% endif %}
 
 {% if openshift_logging_mux_remote_syslog is defined and openshift_logging_mux_remote_syslog %}
         - name: USE_REMOTE_SYSLOG