diff --git a/install/OneClickInstall/install-Docker.sh b/install/OneClickInstall/install-Docker.sh
index 7b337ecff1..c43d241710 100644
--- a/install/OneClickInstall/install-Docker.sh
+++ b/install/OneClickInstall/install-Docker.sh
@@ -60,7 +60,7 @@ INSTALL_RABBITMQ="true";
INSTALL_MYSQL_SERVER="true";
INSTALL_DOCUMENT_SERVER="true";
INSTALL_ELASTICSEARCH="true";
-INSTALL_FLUENT_BIT="true";
+INSTALL_FLUENT_BIT="false";
INSTALL_PRODUCT="true";
UPDATE="false";
@@ -1379,6 +1379,7 @@ install_product () {
docker-compose -f $BASE_DIR/healthchecks.yml up -d
if [[ -n "${PREVIOUS_ELK_VERSION}" && "$(get_env_parameter "ELK_VERSION")" != "${PREVIOUS_ELK_VERSION}" ]]; then
+ docker ps -q -f name=${PACKAGE_SYSNAME}-elasticsearch | xargs -r docker stop
MYSQL_TAG=$(docker images --format "{{.Tag}}" mysql | head -n1)
MYSQL_CONTAINER_NAME=$(get_env_parameter "MYSQL_CONTAINER_NAME" | sed "s/\${CONTAINER_PREFIX}/${PACKAGE_SYSNAME}-/g")
docker run --rm --network="$(get_env_parameter "NETWORK_NAME")" mysql:${MYSQL_TAG:-latest} mysql -h "${MYSQL_HOST:-${MYSQL_CONTAINER_NAME}}" -P "${MYSQL_PORT:-3306}" -u "${MYSQL_USER}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" -e "TRUNCATE webstudio_index;"
diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip
index bb98a5efcd..be71af5e84 100644
--- a/install/win/DocSpace.aip
+++ b/install/win/DocSpace.aip
@@ -113,68 +113,68 @@
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
- |
- |
+ |
+ |
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
@@ -263,7 +263,7 @@
|
- |
+ |
|
|
|
@@ -289,25 +289,25 @@
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
@@ -539,7 +539,7 @@
|
- |
+ |
|
|
|
@@ -1035,7 +1035,6 @@
|
|
|
- |
|
|
|
@@ -1216,7 +1215,6 @@
|
|
|
- |
|
|
|
@@ -1465,7 +1463,7 @@
|
- |
+ |
|
|
|
@@ -1513,7 +1511,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/install/win/OpenSearch.aip b/install/win/OpenSearch.aip
index 230753b3e6..3be40d8bcd 100644
--- a/install/win/OpenSearch.aip
+++ b/install/win/OpenSearch.aip
@@ -5,15 +5,17 @@
|
+ |
|
|
+ |
|
|
|
|
|
|
- |
+ |
|
|
|
@@ -31,6 +33,7 @@
|
+ |
|
|
|
@@ -48,7 +51,7 @@
|
- |
+ |
|
@@ -71,10 +74,20 @@
|
+ |
+ |
+ |
+ |
|
+
+ |
+ |
+
+ |
|
+ |
|
@@ -107,9 +120,18 @@
|
|
|
+ |
|
+ |
+ |
+ |
+ |
|
|
+ |
+ |
+ |
+ |
|
|
|
@@ -129,6 +151,7 @@
|
|
|
+ |
|
@@ -140,6 +163,17 @@
|
|
|
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
@@ -156,10 +190,20 @@
|
|
+
+ |
+ |
+
+ |
+ |
+ |
+ |
|
|
+ |
|
+ |
|
|
diff --git a/install/win/build-batch.bat b/install/win/build-batch.bat
index c1d795b548..9f394a503b 100644
--- a/install/win/build-batch.bat
+++ b/install/win/build-batch.bat
@@ -6,6 +6,7 @@ set "opensearch_version=2.11.1"
REM echo ######## Extracting and preparing files to build ########
%sevenzip% x buildtools\install\win\opensearch-%opensearch_version%.zip -o"buildtools\install\win" -y
+%sevenzip% x buildtools\install\win\ingest-attachment-%opensearch_version%.zip -o"buildtools\install\win\OpenSearch\plugins\ingest-attachment" -y
xcopy "buildtools\install\win\opensearch-%opensearch_version%\plugins\opensearch-security" "buildtools\install\win\OpenSearch\plugins\opensearch-security" /s /y /b /i
xcopy "buildtools\install\win\opensearch-%opensearch_version%\plugins\opensearch-job-scheduler" "buildtools\install\win\OpenSearch\plugins\opensearch-job-scheduler" /s /y /b /i
xcopy "buildtools\install\win\opensearch-%opensearch_version%\plugins\opensearch-index-management" "buildtools\install\win\OpenSearch\plugins\opensearch-index-management" /s /y /b /i
diff --git a/install/win/build-download-prereq.ps1 b/install/win/build-download-prereq.ps1
index b5abfd7933..8844b3b51d 100644
--- a/install/win/build-download-prereq.ps1
+++ b/install/win/build-download-prereq.ps1
@@ -61,6 +61,12 @@ $prerequisites = @(
link = "https://artifacts.opensearch.org/releases/bundle/opensearch/${opensearch_version}/opensearch-${opensearch_version}-windows-x64.zip";
}
+ @{
+ download_allways = $false;
+ name = "ingest-attachment-${opensearch_version}.zip";
+ link = "https://artifacts.opensearch.org/releases/plugins/ingest-attachment/${opensearch_version}/ingest-attachment-${opensearch_version}.zip";
+ }
+
@{
download_allways = $false;
name = "WinSW.NET4new.exe";