Merge branch 'main' of https://github.com/opensearch-project/opensear…

…ch-py-ml into kalyan/339-remove-pandas-versions-nox Signed-off-by: kalyanr <kalyan.ben10@live.com>
opensearch-project · Feb 12, 2024 · f80995c · f80995c
2 parents 7302835 + 261eab5
commit f80995c
Show file tree

Hide file tree

Showing 11 changed files with 161 additions and 142 deletions.
diff --git a/.ci/run-opensearch.sh b/.ci/run-opensearch.sh
@@ -20,6 +20,7 @@ environment=($(cat <<-END
   --env cluster.name=$cluster_name
   --env discovery.type=single-node
   --env discovery.seed_hosts=$master_node_name
+  --env OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!
   --env cluster.routing.allocation.disk.threshold_enabled=false
   --env bootstrap.memory_lock=true
   --env node.attr.testattr=test
@@ -62,10 +63,21 @@ END
   local_detach="true"
   if [[ "$i" == "$((NUMBER_OF_NODES-1))" ]]; then local_detach=$DETACH; fi
 
+  OPENSEARCH_REQUIRED_VERSION="2.12.0"
+
+  password="admin"
+  # Starting in 2.12.0, security demo configuration script requires an initial admin password
+  COMPARE_VERSION=`echo $OPENSEARCH_REQUIRED_VERSION $OPENSEARCH_VERSION | tr ' ' '\n' | sort -V | uniq | head -n 1`
+  if [ "$COMPARE_VERSION" != "$OPENSEARCH_REQUIRED_VERSION" ]; then
+    password="admin"
+  else
+    password="myStrongPassword123!"
+  fi
+
   set -x
   healthcmd="curl -vvv -s --fail http://localhost:9200/_cluster/health || exit 1"
   if [[ "$SECURE_INTEGRATION" == "true" ]]; then
-    healthcmd="curl -vvv -s --insecure -u admin:admin --fail https://localhost:9200/_cluster/health || exit 1"
+    healthcmd="curl -vvv -s --insecure -u admin:$password --fail https://localhost:9200/_cluster/health || exit 1"
   fi
 
   CLUSTER_TAG=$CLUSTER

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Add support for Model Access Control - Register, Update, Search and Delete by @rawwar in ([#332](https://github.com/opensearch-project/opensearch-py-ml/pull/332))
 - Add support for model connectors by @rawwar in ([#345](https://github.com/opensearch-project/opensearch-py-ml/pull/345))
 - Add support for model profiles by @rawwar in ([#358](https://github.com/opensearch-project/opensearch-py-ml/pull/358))
+- Support for security default admin credential changes in 2.12.0 in ([#365](https://github.com/opensearch-project/opensearch-py-ml/pull/365))
+
 
 ### Changed
 - Modify ml-models.JenkinsFile so that it takes model format into account and can be triggered with generic webhook by @thanawan-atc in ([#211](https://github.com/opensearch-project/opensearch-py-ml/pull/211))
@@ -32,9 +34,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Update pretrained_models_all_versions.json (2023-10-18 18:11:34) by @dhrubo-os ([#322](https://github.com/opensearch-project/opensearch-py-ml/pull/322))
 - Update model upload history -  sentence-transformers/paraphrase-mpnet-base-v2 (v.1.0.0)(BOTH) by @dhrubo-os ([#321](https://github.com/opensearch-project/opensearch-py-ml/pull/321))
 - Replaced usage of `is_datetime_or_timedelta_dtype` with `is_timedelta64_dtype` and `is_datetime64_any_dtype` by @rawwar ([#316](https://github.com/opensearch-project/opensearch-py-ml/pull/316))
+- use try-except-else block for handling unexpected exceptions during integration tests by @rawwar([#370](https://github.com/opensearch-project/opensearch-py-ml/pull/370))
 - Removed pandas version pin in nox tests by @rawwar ([#368](https://github.com/opensearch-project/opensearch-py-ml/pull/368))
 
-
 ### Fixed
 - Enable make_model_config_json to add model description to model config file by @thanawan-atc in ([#203](https://github.com/opensearch-project/opensearch-py-ml/pull/203))
 - Correct demo_ml_commons_integration.ipynb by @thanawan-atc in ([#208](https://github.com/opensearch-project/opensearch-py-ml/pull/208))

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
@@ -159,7 +159,7 @@ $ make html
 ```yml
 opensearch.hosts: ["https://localhost:9200"]
 opensearch.username: "admin" # Default username
-opensearch.password: "admin" # Default password
+opensearch.password: "< admin password >" # Password set during setup
 ```
 
 ## Code guidelines

diff --git a/docs/source/examples/demo_deploy_cliptextmodel.ipynb b/docs/source/examples/demo_deploy_cliptextmodel.ipynb
@@ -59,7 +59,7 @@
     "# Connect to OpenSearch cluster\n",
     "host = 'localhost'\n",
     "port = 9200\n",
-    "auth = ('admin', 'admin') # For testing only. Don't store credentials in code.\n",
+    "auth = ('admin', '< admin password >') # For testing only. Don't store credentials in code.\n",
     "\n",
     "def get_os_client(host = host, port = port, auth = auth):\n",
     "    '''\n",

diff --git a/docs/source/examples/demo_metrics_correlation.ipynb b/docs/source/examples/demo_metrics_correlation.ipynb
@@ -94,7 +94,7 @@
     "\n",
     "def get_os_client(cluster_url = CLUSTER_URL,\n",
     "                  username='admin',\n",
-    "                  password='admin'):\n",
+    "                  password='< admin password >'):\n",
     "    \"\"\"\n",
     "    Get OpenSearch client\n",
     "    :param cluster_url: cluster URL like https://ml-te-netwo-1s12ba42br23v-ff1736fa7db98ff2.elb.us-west-2.amazonaws.com:443\n",

diff --git a/docs/source/examples/demo_ml_commons_integration.ipynb b/docs/source/examples/demo_ml_commons_integration.ipynb
@@ -121,7 +121,7 @@
    "source": [
     "def get_os_client(cluster_url = CLUSTER_URL,\n",
     "                  username='admin',\n",
-    "                  password='admin'):\n",
+    "                  password='< admin password >'):\n",
     "    '''\n",
     "    Get OpenSearch client\n",
     "    :param cluster_url: cluster URL like https://ml-te-netwo-1s12ba42br23v-ff1736fa7db98ff2.elb.us-west-2.amazonaws.com:443\n",

diff --git a/docs/source/examples/demo_notebook.ipynb b/docs/source/examples/demo_notebook.ipynb
diff --git a/docs/source/examples/demo_tracing_model_torchscript_onnx.ipynb b/docs/source/examples/demo_tracing_model_torchscript_onnx.ipynb
@@ -109,7 +109,7 @@
    "source": [
     "def get_os_client(cluster_url = CLUSTER_URL,\n",
     "                  username='admin',\n",
-    "                  password='admin'):\n",
+    "                  password='< admin password >'):\n",
     "    '''\n",
     "    Get OpenSearch client\n",
     "    :param cluster_url: cluster URL like https://ml-te-netwo-1s12ba42br23v-ff1736fa7db98ff2.elb.us-west-2.amazonaws.com:443\n",

diff --git a/docs/source/examples/demo_transformer_model_train_save_upload_to_openSearch.ipynb b/docs/source/examples/demo_transformer_model_train_save_upload_to_openSearch.ipynb
@@ -145,7 +145,7 @@
    "source": [
     "def get_os_client(cluster_url = CLUSTER_URL,\n",
     "                  username='admin',\n",
-    "                  password='admin'):\n",
+    "                  password='< admin password >'):\n",
     "    '''\n",
     "    Get OpenSearch client\n",
     "    :param cluster_url: cluster URL like https://ml-te-netwo-1s12ba42br23v-ff1736fa7db98ff2.elb.us-west-2.amazonaws.com:443\n",

diff --git a/docs/source/examples/online_retail_analysis.ipynb b/docs/source/examples/online_retail_analysis.ipynb