diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2017-06-02 17:06:30 -0700 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2017-06-02 17:06:30 -0700 |
| commit | 33f3a95da29ba2441911e761fbf8a5a2a553b9b9 (patch) | |
| tree | d6839441c6895ab93ba8ef3ecf56e20331074803 | |
| parent | 49d8b7e373f00dfcce2940cdd22d4d60471f84c4 (diff) | |
| download | openshift-33f3a95da29ba2441911e761fbf8a5a2a553b9b9.tar.gz openshift-33f3a95da29ba2441911e761fbf8a5a2a553b9b9.tar.bz2 openshift-33f3a95da29ba2441911e761fbf8a5a2a553b9b9.tar.xz openshift-33f3a95da29ba2441911e761fbf8a5a2a553b9b9.zip | |
Adding environment variables FLUENTD_CPU_LIMIT, FLUENTD_MEMORY_LIMIT, MUX_CPU_LIMIT, MUX_MEMORY_LIMIT.
| -rw-r--r-- | roles/openshift_logging_fluentd/templates/fluentd.j2 | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2 index bfaef938f..a5695ee26 100644 --- a/roles/openshift_logging_fluentd/templates/fluentd.j2 +++ b/roles/openshift_logging_fluentd/templates/fluentd.j2 @@ -97,6 +97,10 @@ spec: value: "{{ openshift_logging_fluentd_buffer_queue_limit }}" - name: "BUFFER_SIZE_LIMIT" value: "{{ openshift_logging_fluentd_buffer_size_limit }}" + - name: "FLUENTD_CPU_LIMIT" + value: "{{ openshift_logging_fluentd_cpu_limit }}" + - name: "FLUENTD_MEMORY_LIMIT" + value: "{{ openshift_logging_fluentd_memory_limit }}" volumes: - name: runlogjournal hostPath: diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index e51cfcbc6..a00f7c939 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -107,6 +107,10 @@ spec: value: "{{ openshift_logging_mux_buffer_queue_limit }}" - name: "BUFFER_SIZE_LIMIT" value: "{{ openshift_logging_mux_buffer_size_limit }}" + - name: "MUX_CPU_LIMIT" + value: "{{ openshift_logging_mux_cpu_limit }}" + - name: "MUX_MEMORY_LIMIT" + value: "{{ openshift_logging_mux_memory_limit }}" volumes: - name: config configMap: |