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/defaults/main.yml | 6 ++++-- roles/openshift_logging_mux/templates/mux.j2 | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'roles/openshift_logging_mux') diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 10fa4372c..3c706b1ca 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -9,8 +9,10 @@ openshift_logging_mux_namespace: logging ### Common settings openshift_logging_mux_nodeselector: "{{ openshift_hosted_logging_mux_nodeselector_label | default('') | map_from_pairs }}" -openshift_logging_mux_cpu_limit: 500m -openshift_logging_mux_memory_limit: 1Gi +openshift_logging_mux_cpu_limit: "{{ openshift_hosted_logging_mux_cpu_limit | default('500m') }}" +openshift_logging_mux_memory_limit: "{{ openshift_hosted_logging_mux_memory_limit | default('1Gi') }}" +openshift_logging_mux_buffer_queue_limit: "{{ openshift_hosted_logging_mux_buffer_queue_limit | default('1024') }}" +openshift_logging_mux_buffer_size_limit: "{{ openshift_hosted_logging_mux_buffer_size_limit | default('1m') }}" openshift_logging_mux_replicas: 1 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.3 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') 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.3 From e1b3fe7618186f84136675e24e6c3ec7877ea944 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Sun, 4 Jun 2017 20:07:23 -0700 Subject: Adding the defaults for openshift_logging_fluentd_{cpu,memory}_limit to roles/openshift_logging_fluentd/defaults/main.yml. Adding the description for openshift_hosted_logging_fluentd_{cpu,memory}_limit to README.md. Replaced openshift_hosted_logging_mux_.* with openshift_logging_mux_.*. --- roles/openshift_logging_mux/defaults/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'roles/openshift_logging_mux') diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 3c706b1ca..52d1c5320 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -9,10 +9,10 @@ openshift_logging_mux_namespace: logging ### Common settings openshift_logging_mux_nodeselector: "{{ openshift_hosted_logging_mux_nodeselector_label | default('') | map_from_pairs }}" -openshift_logging_mux_cpu_limit: "{{ openshift_hosted_logging_mux_cpu_limit | default('500m') }}" -openshift_logging_mux_memory_limit: "{{ openshift_hosted_logging_mux_memory_limit | default('1Gi') }}" -openshift_logging_mux_buffer_queue_limit: "{{ openshift_hosted_logging_mux_buffer_queue_limit | default('1024') }}" -openshift_logging_mux_buffer_size_limit: "{{ openshift_hosted_logging_mux_buffer_size_limit | default('1m') }}" +openshift_logging_mux_cpu_limit: "{{ openshift_logging_mux_cpu_limit | default('500m') }}" +openshift_logging_mux_memory_limit: "{{ openshift_logging_mux_memory_limit | default('1Gi') }}" +openshift_logging_mux_buffer_queue_limit: "{{ openshift_logging_mux_buffer_queue_limit | default('1024') }}" +openshift_logging_mux_buffer_size_limit: "{{ openshift_logging_mux_buffer_size_limit | default('1m') }}" openshift_logging_mux_replicas: 1 -- cgit v1.2.3 From 1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Mon, 5 Jun 2017 13:46:33 -0700 Subject: Reverted most of this pr 4356 except: adding openshift_logging_fluentd_buffer_queue_limit: 1024 openshift_logging_fluentd_buffer_size_limit: 1m openshift_logging_mux_buffer_queue_limit: 1024 openshift_logging_mux_buffer_size_limit: 1m and setting the matched environment variables. --- roles/openshift_logging_mux/defaults/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'roles/openshift_logging_mux') diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 52d1c5320..77e47d38c 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -9,10 +9,10 @@ openshift_logging_mux_namespace: logging ### Common settings openshift_logging_mux_nodeselector: "{{ openshift_hosted_logging_mux_nodeselector_label | default('') | map_from_pairs }}" -openshift_logging_mux_cpu_limit: "{{ openshift_logging_mux_cpu_limit | default('500m') }}" -openshift_logging_mux_memory_limit: "{{ openshift_logging_mux_memory_limit | default('1Gi') }}" -openshift_logging_mux_buffer_queue_limit: "{{ openshift_logging_mux_buffer_queue_limit | default('1024') }}" -openshift_logging_mux_buffer_size_limit: "{{ openshift_logging_mux_buffer_size_limit | default('1m') }}" +openshift_logging_mux_cpu_limit: 500m +openshift_logging_mux_memory_limit: 2Gi +openshift_logging_mux_buffer_queue_limit: 1024 +openshift_logging_mux_buffer_size_limit: 1m openshift_logging_mux_replicas: 1 -- cgit v1.2.3