diff --git a/textproc/opensearch-dashboards/Makefile b/textproc/opensearch-dashboards/Makefile
index 3728c93683e2..8e0365f4e303 100644
--- a/textproc/opensearch-dashboards/Makefile
+++ b/textproc/opensearch-dashboards/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	opensearch-dashboards
-DISTVERSION=	2.0.0
+DISTVERSION=	2.1.0
 DISTVERSIONSUFFIX=	-linux-x64
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	opensearch@FreeBSD.org
 COMMENT=	Visualization dashboards for OpenSearch
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	npm-node14>0:www/npm-node14
 
 USES=		nodejs:14,build,run python:build
 USE_RC_SUBR=	${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	CHROME
 
 CHROME_DESC=	Add dependency on www/chromium (required for PDF reports)
 CHROME_RUN_DEPENDS=chrome:www/chromium
 
 _DEVDIR=	${WRKDIR}/.devdir
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%WRKSRC%%|${WRKSRC}|' \
 		${WRKSRC}/bin/opensearch-dashboards \
 		${WRKSRC}/bin/opensearch-dashboards-keystore \
 		${WRKSRC}/bin/opensearch-dashboards-plugin \
 		${WRKSRC}/node_modules/re2/binding.gyp \
 		${WRKSRC}/plugins/reportsDashboards/server/routes/utils/constants.js
 	${RM} \
 		${WRKSRC}/bin/*.orig \
 		${WRKSRC}/bin/*.bak \
 		${WRKSRC}/node_modules/re2/binding.gyp.orig \
 		${WRKSRC}/node_modules/re2/binding.gyp.bak \
 		${WRKSRC}/plugins/reportsDashboards/server/routes/utils/constants.js.orig \
 		${WRKSRC}/plugins/reportsDashboards/server/routes/utils/constants.js.bak
 	${RM} -r ${WRKSRC}/plugins/reportsDashboards/.chromium
 
 do-configure:
 	(cd ${WRKSRC}/node_modules/re2 && \
 		${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
 		${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure \
 		--python=${PYTHON_CMD} \
 		--nodedir ${LOCALBASE} \
 		--devdir=${_DEVDIR})
 
 do-build:
 	(cd ${WRKSRC}/node_modules/re2 && \
 		${SETENV} HOME=${WRKDIR} PYTHONDONTWRITEBYTECODE=1 \
 		${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build \
 		--devdir=${_DEVDIR})
 	${RM} -r ${WRKSRC}/node_modules/re2/build/Release/.deps \
 		${WRKSRC}/node_modules/re2/build/Release/obj.target
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config/opensearch_dashboards.yml ${STAGEDIR}${ETCDIR}/opensearch_dashboards.yml.sample
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} "data node_modules package.json plugins src" ${STAGEDIR}${WWWDIR} && \
 		${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR})
 	${STRIP_CMD} ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node
 
 post-install:
 	${ECHO} "@sample ${ETCDIR}/opensearch_dashboards.yml.sample" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/legacy" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/fixed" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/dynamic" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/examples/fixed" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/examples/dynamic" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/opensearch-dashboards/distinfo b/textproc/opensearch-dashboards/distinfo
index 7752662b83bd..a682f11dcc5e 100644
--- a/textproc/opensearch-dashboards/distinfo
+++ b/textproc/opensearch-dashboards/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653931629
-SHA256 (opensearch-dashboards-2.0.0-linux-x64.tar.gz) = e2434659b02d9ee4502523198ac51f42f7b09845b0950986f4c2ff9e347fe474
-SIZE (opensearch-dashboards-2.0.0-linux-x64.tar.gz) = 227494898
+TIMESTAMP = 1657299734
+SHA256 (opensearch-dashboards-2.1.0-linux-x64.tar.gz) = 47b062e880372368b096abecd2f255d96ce8861dd87ada1ca5eaf052e72b17b7
+SIZE (opensearch-dashboards-2.1.0-linux-x64.tar.gz) = 227733934
diff --git a/textproc/opensearch-dashboards/files/opensearch-dashboards.in b/textproc/opensearch-dashboards/files/opensearch-dashboards.in
index 38d667de990c..7043fa9301a9 100644
--- a/textproc/opensearch-dashboards/files/opensearch-dashboards.in
+++ b/textproc/opensearch-dashboards/files/opensearch-dashboards.in
@@ -1,80 +1,79 @@
 #!/bin/sh
 
 # PROVIDE: opensearch_dashboards
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 . /etc/rc.subr
 
 name=opensearch_dashboards
 rcvar=opensearch_dashboards_enable
 
 load_rc_config $name
 
 : ${opensearch_dashboards_enable:="NO"}
 : ${opensearch_dashboards_config:="%%ETCDIR%%/opensearch_dashboards.yml"}
 : ${opensearch_dashboards_user:="www"}
 : ${opensearch_dashboards_group:="www"}
 : ${opensearch_dashboards_log:="/var/log/opensearch_dashboards.log"}
 : ${opensearch_dashboards_syslog_output_enable:="NO"}
 
 start_precmd="opensearch_dashboards_start_precmd"
 reload_cmd="opensearch_dashboards_reload_cmd"
 extra_commands="reload"
 
 if checkyesno opensearch_dashboards_syslog_output_enable; then
 	if [ -n "${opensearch_dashboards_syslog_output_tag}" ]; then
 		opensearch_dashboards_syslog_output_flags="-T ${opensearch_dashboards_syslog_output_tag}"
 	else
 		opensearch_dashboards_syslog_output_flags="-T ${name}"
 	fi
 	if [ -n "${opensearch_dashboards_syslog_output_priority}" ]; then
 		opensearch_dashboards_syslog_output_flags="${opensearch_dashboards_syslog_output_flags} -s ${opensearch_dashboards_syslog_output_priority}"
 	fi
 	if [ -n "${opensearch_dashboards_syslog_output_facility}" ]; then
 		opensearch_dashboards_syslog_output_flags="${opensearch_dashboards_syslog_output_flags} -l ${opensearch_dashboards_syslog_output_facility}"
 	fi
 fi
 
 NODE="%%LOCALBASE%%/bin/node"
 
 required_files="${opensearch_dashboards_config}"
 pidfile="/var/run/${name}.pid"
 
 command="/usr/sbin/daemon"
 command_args="-f ${opensearch_dashboards_syslog_output_flags} -P ${pidfile} -t ${name} \
 	/usr/bin/env NODE_ENV=production ${opensearch_dashboards_env} \
-	${NODE} --no-warnings --max-http-header-size=65536 \
-	%%WWWDIR%%/src/cli/dist serve \
+	${NODE} %%WWWDIR%%/src/cli/dist serve \
 	--config ${opensearch_dashboards_config} --log-file ${opensearch_dashboards_log} \
 	${opensearch_dashboards_args}"
 
 opensearch_dashboards_start_precmd()
 {
 	if [ ! -e "${pidfile}" ]; then
 		install -m 0600 -o ${opensearch_dashboards_user} -g ${opensearch_dashboards_group} /dev/null ${pidfile}
 	fi
 	if [ ! -f ${opensearch_dashboards_log} ]; then
 		install -o ${opensearch_dashboards_user} -g ${opensearch_dashboards_group} -m 640 /dev/null ${opensearch_dashboards_log}
 	fi
 	if [ ! -d %%WWWDIR%%/optimize ]; then
 		install -d -o ${opensearch_dashboards_user} -g ${opensearch_dashboards_group} %%WWWDIR%%/optimize
 	else
 		# We may have installed a plugin as root which will cause files in here
 		# to be owned by root:wheel. Fix with a chown.
 		chown -R ${opensearch_dashboards_user}:${opensearch_dashboards_group} %%WWWDIR%%/optimize
 	fi
 }
 
 opensearch_dashboards_reload_cmd()
 {
 	if [ -z "$rc_pid" ]; then
 		_run_rc_notrunning
 		return 1
 	else
 		pkill -HUP -P ${rc_pid}
 	fi
 }
 
 run_rc_command "$1"
diff --git a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore
index d8c1b1d5387a..bf943cba637b 100644
--- a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore
+++ b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-keystore
@@ -1,13 +1,13 @@
---- bin/opensearch-dashboards-keystore.orig	2021-07-02 23:30:56 UTC
+--- bin/opensearch-dashboards-keystore.orig	2022-06-30 21:38:00 UTC
 +++ bin/opensearch-dashboards-keystore
-@@ -14,8 +14,8 @@ while [ -h "$SCRIPT" ] ; do
+@@ -26,8 +26,8 @@ while [ -h "$SCRIPT" ] ; do
  done
  
  DIR="$(dirname "${SCRIPT}")/.."
 -CONFIG_DIR=${OSD_PATH_CONF:-"$DIR/config"}
 -NODE="${DIR}/node/bin/node"
 +CONFIG_DIR="%%PREFIX%%/etc/opensearch-dashboards"
 +NODE="%%LOCALBASE%%/bin/node"
  test -x "$NODE"
  if [ ! -x "$NODE" ]; then
    echo "unable to find usable node.js executable."
diff --git a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin
index 358fc3f02326..1a3cff5bef3f 100644
--- a/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin
+++ b/textproc/opensearch-dashboards/files/patch-bin_opensearch-dashboards-plugin
@@ -1,13 +1,13 @@
---- bin/opensearch-dashboards-plugin.orig	2021-07-02 23:30:56 UTC
+--- bin/opensearch-dashboards-plugin.orig	2022-06-30 21:38:00 UTC
 +++ bin/opensearch-dashboards-plugin
-@@ -14,8 +14,8 @@ while [ -h "$SCRIPT" ] ; do
+@@ -26,8 +26,8 @@ while [ -h "$SCRIPT" ] ; do
  done
  
  DIR="$(dirname "${SCRIPT}")/.."
 -CONFIG_DIR=${OSD_PATH_CONF:-"$DIR/config"}
 -NODE="${DIR}/node/bin/node"
 +CONFIG_DIR="%%PREFIX%%/etc/opensearch-dashboards"
 +NODE="%%LOCALBASE%%/bin/node"
  test -x "$NODE"
  if [ ! -x "$NODE" ]; then
    echo "unable to find usable node.js executable."
diff --git a/textproc/opensearch-dashboards/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js b/textproc/opensearch-dashboards/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js
index 520cc7c3a192..20519110401b 100644
--- a/textproc/opensearch-dashboards/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js
+++ b/textproc/opensearch-dashboards/files/patch-plugins_reportsDashboards_server_routes_utils_constants.js
@@ -1,11 +1,11 @@
---- plugins/reportsDashboards/server/routes/utils/constants.js.orig	2021-11-22 18:22:17 UTC
+--- plugins/reportsDashboards/server/routes/utils/constants.js.orig	2022-06-30 21:47:37 UTC
 +++ plugins/reportsDashboards/server/routes/utils/constants.js
-@@ -107,7 +107,7 @@ const SECURITY_CONSTANTS = {
- exports.SECURITY_CONSTANTS = SECURITY_CONSTANTS;
- const EXTRA_HEADERS = ['cookie', 'x-proxy-user', 'x-proxy-roles', 'x-forwarded-for'];
- exports.EXTRA_HEADERS = EXTRA_HEADERS;
+@@ -138,7 +138,7 @@ const replaceBlockedKeywords = htmlString => {
+ };
+ 
+ exports.replaceBlockedKeywords = replaceBlockedKeywords;
 -const CHROMIUM_PATH = `${__dirname}/../../../.chromium/headless_shell`;
 +const CHROMIUM_PATH = `%%LOCALBASE%%/bin/chrome`;
  /**
   * Metric constants
   */
diff --git a/textproc/opensearch-dashboards/files/patch-src_setup__node__env_node__version__validator.js b/textproc/opensearch-dashboards/files/patch-src_setup__node__env_node__version__validator.js
deleted file mode 100644
index d7fb2e5ead8b..000000000000
--- a/textproc/opensearch-dashboards/files/patch-src_setup__node__env_node__version__validator.js
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/setup_node_env/node_version_validator.js.orig	2021-09-07 03:05:30 UTC
-+++ src/setup_node_env/node_version_validator.js
-@@ -38,11 +38,11 @@ var pkg = require('../../package.json'); // Note: This
- var currentVersion = process && process.version || null;
- var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
- var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
--var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when OpenSearch Dashboards starts.
-+var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion >= requiredVersion; // Validates current the NodeJS version compatibility when OpenSearch Dashboards starts.
- 
- if (!isVersionValid) {
--  var errorMessage = 'OpenSearch Dashboards does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.
-+  var errorMessage = 'OpenSearch Dashboards does not support the current Node.js version ' + currentVersion + '. Please use Node.js >= ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.
- 
-   console.error(errorMessage);
-   process.exit(1);
--}
-\ No newline at end of file
-+}