From 49d8b7e373f00dfcce2940cdd22d4d60471f84c4 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Wed, 24 May 2017 09:50:07 -0700 Subject: Introducing fluentd/mux buffer_queue_limit, buffer_size_limit, cpu_limit, and memory_limit. Default values: openshift_logging_fluentd_cpu_limit: 100m openshift_logging_fluentd_memory_limit: 512Mi openshift_logging_fluentd_buffer_queue_limit: 1024 openshift_logging_fluentd_buffer_size_limit: 16m openshift_logging_fluentd_buffer_size_limit: 1m openshift_logging_mux_cpu_limit: 500m openshift_logging_mux_memory_limit: 1Gi openshift_logging_mux_buffer_queue_limit: 1024 openshift_logging_mux_buffer_size_limit: 1m --- roles/openshift_logging_mux/templates/mux.j2 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'roles/openshift_logging_mux/templates/mux.j2') diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index 770a2bfbd..e51cfcbc6 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -103,6 +103,10 @@ spec: value: "true" - name: MUX_ALLOW_EXTERNAL value: "{{ openshift_logging_mux_allow_external | default('false') }}" + - name: "BUFFER_QUEUE_LIMIT" + value: "{{ openshift_logging_mux_buffer_queue_limit }}" + - name: "BUFFER_SIZE_LIMIT" + value: "{{ openshift_logging_mux_buffer_size_limit }}" volumes: - name: config configMap: -- cgit v1.2.1 From 33f3a95da29ba2441911e761fbf8a5a2a553b9b9 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Fri, 2 Jun 2017 17:06:30 -0700 Subject: Adding environment variables FLUENTD_CPU_LIMIT, FLUENTD_MEMORY_LIMIT, MUX_CPU_LIMIT, MUX_MEMORY_LIMIT. --- roles/openshift_logging_mux/templates/mux.j2 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'roles/openshift_logging_mux/templates/mux.j2') 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: -- cgit v1.2.1