fix: update script with mongodb connection string

fix: update script with mongodb connection string

Author: omrozowicz-splunk

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ### Changed
+- create MONGODB connection string from environment variables instead of full MONGO_URI variable
 - create REDIS connection string from environment variables instead of full REDIS_URL variable
 
 ## 1.1.0

backend/Dockerfile

@@ -9,15 +9,15 @@ ENV FLASK_DEBUG production
 # Copy scripts
 COPY ./flask_start.sh /flask_start.sh
 COPY ./celery_start.sh /celery_start.sh
-COPY ./construct-redis-url.sh /app/construct-redis-url.sh
+COPY construct-connection-strings.sh /app/construct-connection-strings.sh
 
 # Set permissions BEFORE USER switch
-RUN chmod +x /flask_start.sh /celery_start.sh /app/construct-redis-url.sh
+RUN chmod +x /flask_start.sh /celery_start.sh /app/construct-connection-strings.sh
 
 # Switch to non-root
 USER 10000:10000
 
 EXPOSE 5000
 
-# Use flask_start.sh which sources construct-redis-url.sh
+# Use flask_start.sh which sources construct-connection-strings.sh
 CMD ["/flask_start.sh"]

backend/SC4SNMP_UI_backend/__init__.py

@@ -1,5 +1,9 @@
+import sys
+import time
+
 from flask import Flask
 from pymongo import MongoClient
+from pymongo.errors import ConnectionFailure, ServerSelectionTimeoutError
 import os
 import logging
 from celery import Celery
@@ -11,6 +15,63 @@
 __version__ = "1.1.2-beta.1"
 
 MONGO_URI = os.getenv("MONGO_URI")
+
+
+
+def wait_for_mongodb_replicaset(logger, max_retries=120, retry_interval=5):
+    """
+    Wait for MongoDB to be ready before starting the application.
+    For replica sets, waits for PRIMARY to be elected.
+    """
+    mongo_mode = os.getenv("MONGODB_MODE", "standalone").lower()
+    if mongo_mode == "standalone":
+        logger.info("MongoDB is in standalone mode, skipping ReplicaSet wait")
+        return
+
+    mongo_uri = os.getenv("MONGO_URI")
+
+    if not mongo_uri:
+        logger.warning("MONGO_URI not set, exiting application")
+        sys.exit(1)
+
+    logger.info(f"Waiting for MongoDB ReplicaSet to be ready and elect the primary...")
+
+    for attempt in range(1, max_retries + 1):
+        try:
+            # Try to connect
+            client = MongoClient(
+                mongo_uri, serverSelectionTimeoutMS=5000, connectTimeoutMS=5000
+            )
+
+            # Execute a simple operation to verify PRIMARY exists
+            client.admin.command("ping")
+
+            # For replica sets, verify PRIMARY exists
+            if "replicaSet=" in mongo_uri:
+                if client.primary is None:
+                    raise Exception("No PRIMARY elected yet")
+                logger.info(f"PRIMARY found: {client.primary}")
+
+            client.close()
+            logger.info("MongoDB is ready")
+            return
+
+        except (ServerSelectionTimeoutError, ConnectionFailure, Exception) as e:
+            if attempt >= max_retries:
+                logger.info(
+                    f"MongoDB not ready after {max_retries * retry_interval}s"
+                )
+                logger.info(f"   Error: {e}")
+                sys.exit(1)
+
+            if attempt % 6 == 0:  # Print every 30 seconds
+                logger.info(
+                    f"  Still waiting... ({attempt}/{max_retries}) - {e.__class__.__name__}"
+                )
+
+            time.sleep(retry_interval)
+
+wait_for_mongodb_replicaset(logging.getLogger())
 mongo_client = MongoClient(MONGO_URI)
 
 VALUES_DIRECTORY = os.getenv("VALUES_DIRECTORY", "")

backend/celery_start.sh

@@ -2,7 +2,7 @@
 set -e
 
 # Source Redis URL construction
-. /app/construct-redis-url.sh
+. /app/construct-connection-strings.sh
 
 set -o errexit
 set -o nounset

backend/construct-redis-url.sh backend/construct-connection-strings.shbackend/construct-redis-url.sh renamed to backend/construct-connection-strings.sh

@@ -21,23 +21,19 @@ if [ -z "$REDIS_URL" ] || [ -z "$CELERY_BROKER_URL" ]; then
 
     if [ -n "$REDIS_PASSWORD" ]; then
       SENTINEL_SCHEME="sentinel://:${REDIS_PASSWORD}@${REDIS_SENTINEL_SERVICE}:${REDIS_SENTINEL_PORT}"
-      REDBEAT_SCHEME="redis-sentinel://:${REDIS_PASSWORD}@${REDIS_SENTINEL_SERVICE}:${REDIS_SENTINEL_PORT}"
       REDIS_HA_CHECK="redis://:${REDIS_PASSWORD}@${REDIS_HEADLESS_SERVICE}:${REDIS_PORT}"
     else
       SENTINEL_SCHEME="sentinel://${REDIS_SENTINEL_SERVICE}:${REDIS_SENTINEL_PORT}"
-      REDBEAT_SCHEME="redis-sentinel://${REDIS_SENTINEL_SERVICE}:${REDIS_SENTINEL_PORT}"
       REDIS_HA_CHECK="redis://${REDIS_HEADLESS_SERVICE}:${REDIS_PORT}"
-
     fi
 
+    REDBEAT_SCHEME="redis-sentinel://${REDIS_SENTINEL_SERVICE}:${REDIS_SENTINEL_PORT}"
+
     # Celery broker uses sentinel://
     : "${CELERY_BROKER_URL:=${SENTINEL_SCHEME}/${CELERY_DB}#master_name=${REDIS_MASTER_NAME}}"
 
     # RedBeat uses redis-sentinel:// with master_name query
     : "${REDIS_URL:=${REDBEAT_SCHEME}/${REDIS_DB}#master_name=${REDIS_MASTER_NAME}}"
-    SENTINEL_CHECK="redis://${REDIS_SENTINEL_SERVICE}:${REDIS_SENTINEL_PORT}"
-    # For healthcheck / wait-for-dep - space-separated list
-    REDIS_DEPENDENCIES="${SENTINEL_CHECK} ${REDIS_HA_CHECK}"
 
   else
     # Standalone mode
@@ -53,16 +49,30 @@ if [ -z "$REDIS_URL" ] || [ -z "$CELERY_BROKER_URL" ]; then
 
     : "${REDIS_URL:=$BASE/${REDIS_DB:-1}}"
     : "${CELERY_BROKER_URL:=$BASE/${CELERY_DB:-0}}"
-
-    # For healthcheck / wait-for-dep - space-separated list
-    REDIS_DEPENDENCIES="${REDIS_URL} ${CELERY_BROKER_URL}"
   fi
 
-  echo "Constructed REDIS_URL: $REDIS_URL"
-  echo "Constructed CELERY_BROKER_URL: $CELERY_BROKER_URL"
+  # Build MongoDB URI from environment variables
+  if [ -n "$MONGODB_PASSWORD" ]; then
+    # With authentication
+    if [ -n "$MONGODB_REPLICA_SET" ]; then
+      # Replica set
+      export MONGO_URI="mongodb://${MONGODB_USERNAME}:${MONGODB_PASSWORD}@${MONGODB_HOST}/${MONGODB_DATABASE}?replicaSet=${MONGODB_REPLICA_SET}&authSource=${MONGODB_AUTH_SOURCE:-admin}&readPreference=primary"
+    else
+      # Standalone
+      export MONGO_URI="mongodb://${MONGODB_USERNAME}:${MONGODB_PASSWORD}@${MONGODB_HOST}:${MONGODB_PORT}/${MONGODB_DATABASE}?authSource=admin"
+    fi
+  else
+    # Without authentication
+    if [ -n "$MONGODB_REPLICA_SET" ]; then
+      export MONGO_URI="mongodb://${MONGODB_HOST}/${MONGODB_DATABASE}?replicaSet=${MONGODB_REPLICA_SET}&authSource=admin&retryWrites=false"
+    else
+      export MONGO_URI="mongodb://${MONGODB_HOST}:${MONGODB_PORT}/${MONGODB_DATABASE}?authSource=admin"
+    fi
+  fi
 
+  export MONGO_URI
   export REDIS_URL
   export CELERY_BROKER_URL
-  export REDIS_DEPENDENCIES
   export REDIS_MODE
+
 fi

backend/flask_start.sh

@@ -2,7 +2,7 @@
 set -e
 
 # Source Redis URL construction
-. /app/construct-redis-url.sh
+. /app/construct-connection-strings.sh
 
 set -o errexit
 set -o nounset