Update Elasticsearch connection settings to use ELASTICSEARCH_URL and ELASTICSEARCH_PASS environment variables

Author: satomic

src/cpuad-updater/create_user_summary.py

@@ -11,12 +11,13 @@
 
 def get_es_client():
     """Initialize Elasticsearch client"""
-    es_host = os.getenv("ELASTICSEARCH_HOST", "elasticsearch")
-    es_port = int(os.getenv("ELASTICSEARCH_PORT", "9200"))
-    es_url = f"http://{es_host}:{es_port}"
+    # es_host = os.getenv("ELASTICSEARCH_HOST", "elasticsearch")
+    # es_port = int(os.getenv("ELASTICSEARCH_PORT", "9200"))
+    # es_url = f"http://{es_host}:{es_port}"
+    es_url = os.getenv("ELASTICSEARCH_URL", "http://localhost:9200")
 
     es_user = os.getenv("ELASTICSEARCH_USER")
-    es_password = os.getenv("ELASTICSEARCH_PASSWORD")
+    es_password = os.getenv("ELASTICSEARCH_PASS")
 
     if es_user and es_password:
         es = Elasticsearch([es_url], http_auth=(es_user, es_password))

src/cpuad-updater/create_user_top_by_day.py

@@ -32,12 +32,13 @@
 
 
 def get_es_client() -> Elasticsearch:
-    es_host = os.getenv("ELASTICSEARCH_HOST", "elasticsearch")
-    es_port = int(os.getenv("ELASTICSEARCH_PORT", "9200"))
-    es_url = f"http://{es_host}:{es_port}"
+    # es_host = os.getenv("ELASTICSEARCH_HOST", "elasticsearch")
+    # es_port = int(os.getenv("ELASTICSEARCH_PORT", "9200"))
+    # es_url = f"http://{es_host}:{es_port}"
+    es_url = os.getenv("ELASTICSEARCH_URL", "http://localhost:9200")
 
     es_user = os.getenv("ELASTICSEARCH_USER")
-    es_password = os.getenv("ELASTICSEARCH_PASSWORD")
+    es_password = os.getenv("ELASTICSEARCH_PASS")
 
     if es_user and es_password:
         logger.info(f"Connecting to Elasticsearch at {es_url} with authentication")

src/cpuad-updater/main.py

@@ -94,7 +94,7 @@ def date_str():
 
     # ElasticSearch
     primary_key = os.getenv("PRIMARY_KEY", "unique_hash")
-    elasticsearch_url = os.getenv("ELASTICSEARCH_URL", "http://$ELASTICSEARCH_URL")
+    elasticsearch_url = os.getenv("ELASTICSEARCH_URL", "http://localhost:9200")
     elasticsearch_user = os.getenv("ELASTICSEARCH_USER", None)
     elasticsearch_pass = os.getenv("ELASTICSEARCH_PASS", None)