From 64a556f42094aa5c92a0649d95c2b83b49b50541 Mon Sep 17 00:00:00 2001
From: Tao Liu <33105471+Flyingliuhub@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:17:52 -0700
Subject: [PATCH] Update configs and entrypoint for logging.ignoreEnospcError
 in 2.15.0 (#4695)

Signed-off-by: Flyingliuhub <33105471+flyingliuhub@users.noreply.github.com>
---
 config/opensearch_dashboards-2.x.yml                         | 5 +++++
 config/opensearch_dashboards-default.x.yml                   | 5 +++++
 .../opensearch-dashboards-docker-entrypoint-2.x.sh           | 1 +
 .../opensearch-dashboards-docker-entrypoint-default.x.sh     | 1 +
 4 files changed, 12 insertions(+)

diff --git a/config/opensearch_dashboards-2.x.yml b/config/opensearch_dashboards-2.x.yml
index 2e4f3c4dd3..4155496bec 100644
--- a/config/opensearch_dashboards-2.x.yml
+++ b/config/opensearch_dashboards-2.x.yml
@@ -103,6 +103,11 @@
 # Enables you to specify a file where OpenSearch Dashboards stores log output.
 # logging.dest: stdout
 
+# 2.15 Ignore 'ENOSPC' error for logging stream.
+# When set to true, the 'ENOSPC' error message will not cause the OpenSearch Dashboards process to crash. Otherwise,
+# the original behavior will be maintained. It is disabled by default.
+# logging.ignoreEnospcError: false
+
 # Set the value of this setting to true to suppress all logging output.
 # logging.silent: false
 
diff --git a/config/opensearch_dashboards-default.x.yml b/config/opensearch_dashboards-default.x.yml
index 2e4f3c4dd3..4155496bec 100644
--- a/config/opensearch_dashboards-default.x.yml
+++ b/config/opensearch_dashboards-default.x.yml
@@ -103,6 +103,11 @@
 # Enables you to specify a file where OpenSearch Dashboards stores log output.
 # logging.dest: stdout
 
+# 2.15 Ignore 'ENOSPC' error for logging stream.
+# When set to true, the 'ENOSPC' error message will not cause the OpenSearch Dashboards process to crash. Otherwise,
+# the original behavior will be maintained. It is disabled by default.
+# logging.ignoreEnospcError: false
+
 # Set the value of this setting to true to suppress all logging output.
 # logging.silent: false
 
diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh
index 20ab523591..dc584aebc5 100755
--- a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh
+++ b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh
@@ -61,6 +61,7 @@ opensearch_dashboards_vars=(
     opensearchDashboards.defaultAppId
     opensearchDashboards.index
     logging.dest
+    logging.ignoreEnospcError
     logging.json
     logging.quiet
     logging.rotate.enabled
diff --git a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh
index 20ab523591..dc584aebc5 100755
--- a/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh
+++ b/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-default.x.sh
@@ -61,6 +61,7 @@ opensearch_dashboards_vars=(
     opensearchDashboards.defaultAppId
     opensearchDashboards.index
     logging.dest
+    logging.ignoreEnospcError
     logging.json
     logging.quiet
     logging.rotate.enabled