Browse Source

Merge pull request #8761 from jcantrill/1575903_es_mem

bug 1575903. Default ES memory to 16G
OpenShift Merge Robot 6 years ago
parent
commit
3ef81eee7c

+ 2 - 2
roles/openshift_logging/defaults/main.yml

@@ -102,7 +102,7 @@ openshift_logging_es_cpu_limit: null
 openshift_logging_es_cpu_request: "1"
 # the logging appenders for the root loggers to write ES logs. Valid values: 'file', 'console'
 openshift_logging_es_log_appenders: ['file']
-openshift_logging_es_memory_limit: "8Gi"
+openshift_logging_es_memory_limit: "16Gi"
 openshift_logging_es_pv_selector: "{{ openshift_logging_storage_labels | default('') }}"
 openshift_logging_es_pvc_dynamic: "{{ openshift_logging_elasticsearch_pvc_dynamic | default(False) }}"
 openshift_logging_es_pvc_size: ''
@@ -139,7 +139,7 @@ openshift_logging_es_ops_client_cert: /etc/fluent/keys/cert
 openshift_logging_es_ops_client_key: /etc/fluent/keys/key
 openshift_logging_es_ops_cluster_size: "{{ openshift_logging_elasticsearch_ops_cluster_size | default(1) }}"
 openshift_logging_es_ops_cpu_limit: null
-openshift_logging_es_ops_memory_limit: 8Gi
+openshift_logging_es_ops_memory_limit: "16Gi"
 openshift_logging_es_ops_cpu_request: "1"
 openshift_logging_es_ops_pv_selector: "{{ openshift_loggingops_storage_labels | default('') }}"
 openshift_logging_es_ops_pvc_dynamic: "{{ openshift_logging_elasticsearch_ops_pvc_dynamic | default(False) }}"

+ 1 - 1
roles/openshift_logging_elasticsearch/defaults/main.yml

@@ -6,7 +6,7 @@ openshift_logging_elasticsearch_namespace: openshift-logging
 openshift_logging_elasticsearch_nodeselector: "{{ openshift_logging_es_nodeselector | default('') }}"
 openshift_logging_elasticsearch_cpu_limit: null
 openshift_logging_elasticsearch_cpu_request: "{{ openshift_logging_es_cpu_request | default('1000m') }}"
-openshift_logging_elasticsearch_memory_limit: "{{ openshift_logging_es_memory_limit | default('1Gi') }}"
+openshift_logging_elasticsearch_memory_limit: "{{ openshift_logging_es_memory_limit | default('16Gi') }}"
 openshift_logging_elasticsearch_recover_after_time: "{{ openshift_logging_es_recover_after_time | default('5m') }}"
 
 openshift_logging_elasticsearch_replica_count: 1