chore: Bump OpenSearch and OpenSearch Dashboards to 3.4.0

demos/opensearch-rag/load-embeddings-from-git.yaml

@@ -18,8 +18,10 @@ data:
     from requests.auth import HTTPBasicAuth
 
     # Configuration
-    OPENSEARCH_HOST = os.getenv('OPENSEARCH_HOST', 'opensearch')
-    OPENSEARCH_PORT = int(os.getenv('OPENSEARCH_PORT', '9200'))
+    OPENSEARCH_HOSTS = os.getenv('OPENSEARCH_HOSTS', 'https://opensearch:9200')
+    OPENSEARCH_HOSTNAME = os.getenv('OPENSEARCH_HOSTNAME', 'opensearch')
+    OPENSEARCH_PORT = os.getenv('OPENSEARCH_PORT', '9200')
+    OPENSEARCH_PROTOCOL = os.getenv('OPENSEARCH_PROTOCOL', 'https')
     OPENSEARCH_USER = os.getenv('OPENSEARCH_USER', 'admin')
     OPENSEARCH_PASSWORD = os.getenv('OPENSEARCH_PASSWORD', 'adminadmin')
     INDEX_NAME = os.getenv('INDEX_NAME', 'rag-documents')
@@ -31,7 +33,7 @@ data:
         for i in range(60):
             try:
                 response = requests.get(
-                    f'https://{OPENSEARCH_HOST}:{OPENSEARCH_PORT}',
+                    OPENSEARCH_HOSTS,
                     auth=HTTPBasicAuth(OPENSEARCH_USER, OPENSEARCH_PASSWORD),
                     verify=False,
                     timeout=5
@@ -142,7 +144,7 @@ data:
         auth = HTTPBasicAuth(OPENSEARCH_USER, OPENSEARCH_PASSWORD)
 
         # Create index pattern
-        response = requests.put(
+        response = requests.post(
             f'{base_url}/api/saved_objects/index-pattern/{INDEX_NAME}?overwrite=true',
             json={"attributes": {"title": INDEX_NAME, "timeFieldName": "timestamp"}},
             auth=auth, headers=headers, timeout=10
@@ -202,9 +204,9 @@ data:
             return 1
 
         client = OpenSearch(
-            hosts=[{'host': OPENSEARCH_HOST, 'port': OPENSEARCH_PORT}],
+            hosts=[{'host': OPENSEARCH_HOSTNAME, 'port': OPENSEARCH_PORT}],
             http_auth=(OPENSEARCH_USER, OPENSEARCH_PASSWORD),
-            use_ssl=True,
+            use_ssl=OPENSEARCH_PROTOCOL == 'https',
             verify_certs=False,
             ssl_show_warn=False
         )
@@ -277,10 +279,6 @@ spec:
           pip install -q opensearch-py requests urllib3
           python -u /scripts/load.py
         env:
-        - name: OPENSEARCH_HOST
-          value: "opensearch"
-        - name: OPENSEARCH_PORT
-          value: "9200"
         - name: OPENSEARCH_USER
           value: "admin"
         - name: OPENSEARCH_PASSWORD
@@ -292,6 +290,9 @@ spec:
           value: "rag-documents"
         - name: EMBEDDINGS_FILE
           value: "/data/stackable-docs-embeddings.json"
+        envFrom:
+        - configMapRef:
+            name: opensearch
         volumeMounts:
         - name: script
           mountPath: /scripts

docs/modules/demos/pages/logging.adoc

@@ -56,7 +56,8 @@ $ stackablectl stacklet list
 ┌───────────────────────┬───────────────────────┬───────────┬────────────────────────────────────────────────────────────────────────────────────┬─────────────────────────────────┐
 │ PRODUCT               ┆ NAME                  ┆ NAMESPACE ┆ ENDPOINTS                                                                          ┆ CONDITIONS                      │
 ╞═══════════════════════╪═══════════════════════╪═══════════╪════════════════════════════════════════════════════════════════════════════════════╪═════════════════════════════════╡
-│ opensearch            ┆ opensearch            ┆ default   ┆ nodes-default-http  http://opensearch-nodes-default.default.svc.cluster.local:9200 ┆ Available, Reconciling, Running │
+│ opensearch            ┆ opensearch            ┆ default   ┆ -http               http://opensearch.default.svc.cluster.local:9200               ┆ Available, Reconciling, Running │
+│                       ┆                       ┆           ┆ nodes-default-http  http://opensearch-nodes-default.default.svc.cluster.local:9200 ┆                                 │
 ├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤
 │ zookeeper             ┆ simple-zk             ┆ default   ┆ server-zk           simple-zk-server.default.svc.cluster.local:2282                ┆ Available, Reconciling, Running │
 ├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┤

stacks/_templates/opensearch-dashboards.yaml

@@ -6,7 +6,6 @@ repo:
   url: https://opensearch-project.github.io/helm-charts
 version: {{ opensearchVersion }}
 options:
-  opensearchHosts: https://opensearch:9200
   image:
     repository: oci.stackable.tech/sdp/opensearch-dashboards
     tag: "{{ opensearchVersion }}-stackable{{ stackableReleaseVersion }}"
@@ -21,6 +20,13 @@ options:
       stackable.tech/logging-credentials-secret: opensearch-user
     labels:
       stackable.tech/vendor: Stackable
+  opensearchHosts: null # Use the discovery ConfigMap instead
+  extraEnvs:
+    - name: OPENSEARCH_HOSTS
+      valueFrom:
+        configMapKeyRef:
+          name: opensearch
+          key: OPENSEARCH_HOSTS
   opensearchAccount:
     secret: opensearch-dashboard-user
   serviceAccount:

stacks/opensearch-rag/jupyterlab.yaml

@@ -31,10 +31,6 @@ spec:
           env:
             - name: JUPYTER_PORT
               value: "8888"
-            - name: OPENSEARCH_HOST
-              value: "opensearch"
-            - name: OPENSEARCH_PORT
-              value: "9200"
             - name: OPENSEARCH_USER
               value: "admin"
             - name: OPENSEARCH_PASSWORD
@@ -48,6 +44,9 @@ spec:
               value: "11434"
             - name: OLLAMA_LLM_MODEL
               value: "{{ ollamaLlmModel }}"
+          envFrom:
+            - configMapRef:
+                name: opensearch
           ports:
             - name: http
               containerPort: 8888

stacks/opensearch-rag/opensearch-rag.ipynb

@@ -68,16 +68,18 @@
     "warnings.filterwarnings('ignore')\n",
     "\n",
     "# Configuration from environment variables\n",
-    "OPENSEARCH_HOST = os.getenv('OPENSEARCH_HOST')\n",
+    "OPENSEARCH_HOSTS = os.getenv('OPENSEARCH_HOSTS')\n",
+    "OPENSEARCH_HOSTNAME = os.getenv('OPENSEARCH_HOSTNAME')\n",
     "OPENSEARCH_PORT = int(os.getenv('OPENSEARCH_PORT'))\n",
+    "OPENSEARCH_PROTOCOL = os.getenv('OPENSEARCH_PROTOCOL')\n",
     "OPENSEARCH_USER = os.getenv('OPENSEARCH_USER')\n",
     "OPENSEARCH_PASSWORD = os.getenv('OPENSEARCH_PASSWORD')\n",
     "OLLAMA_HOST = os.getenv('OLLAMA_HOST')\n",
     "OLLAMA_PORT = int(os.getenv('OLLAMA_PORT'))\n",
     "OLLAMA_LLM_MODEL = os.getenv('OLLAMA_LLM_MODEL')\n",
     "INDEX_NAME = 'rag-documents'\n",
     "\n",
-    "print(f\"OpenSearch: {OPENSEARCH_HOST}:{OPENSEARCH_PORT}\")\n",
+    "print(f\"OpenSearch: {OPENSEARCH_HOSTS}\")\n",
     "print(f\"Ollama: {OLLAMA_HOST}:{OLLAMA_PORT} using {OLLAMA_LLM_MODEL} to generate responses\")\n",
     "print(f\"Index: {INDEX_NAME}\")"
    ]
@@ -101,9 +103,9 @@
    "source": [
     "# Initialize OpenSearch client\n",
     "opensearch_client = OpenSearch(\n",
-    "    hosts=[{'host': OPENSEARCH_HOST, 'port': OPENSEARCH_PORT}],\n",
+    "    hosts=[{'host': OPENSEARCH_HOSTNAME, 'port': OPENSEARCH_PORT}],\n",
     "    http_auth=(OPENSEARCH_USER, OPENSEARCH_PASSWORD),\n",
-    "    use_ssl=True,\n",
+    "    use_ssl=OPENSEARCH_PROTOCOL == 'https',\n",
     "    verify_certs=False,\n",
     "    ssl_show_warn=False\n",
     ")\n",

stacks/stacks-v2.yaml

@@ -101,7 +101,7 @@ stacks:
         default: kibanaserverkibanaserver
       - name: opensearchVersion
         description: Version of OpenSearch and OpenSearch Dashboards to deploy
-        default: 3.1.0
+        default: 3.4.0
       - name: stackableReleaseVersion
         description: The Stackable release to be used for the OpenSearch Dashboards image tag
         default: 0.0.0-dev
@@ -725,7 +725,7 @@ stacks:
         default: kibanaserverkibanaserver
       - name: opensearchVersion
         description: Version of OpenSearch and OpenSearch Dashboards to deploy
-        default: 3.1.0
+        default: 3.4.0
       - name: stackableReleaseVersion
         description: The Stackable release to be used for the OpenSearch Dashboards image tag
         default: 0.0.0-dev