Merge pull request #49 from spectriclabs/dev

Dev -> master

Author: desean1625

Dockerfile

@@ -23,7 +23,7 @@ COPY --from=builder /build/dist/*.whl /home/datashader/tmp/
 ENV PATH="$PATH:/home/datashader/.local/bin"
 RUN pip install --upgrade pip && \
     pip install --no-cache-dir /home/datashader/tmp/*.whl && \
-    pip install gunicorn==21.2.0 && \
+    pip install gunicorn==20.1.0 && \
     pip install uvicorn==0.24.0
 
 COPY deployment/logging_config.yml /opt/elastic_datashader/

elastic_datashader/parameters.py

@@ -15,7 +15,7 @@
 from pydantic import BaseModel, Field
 
 from .config import config
-from .elastic import get_search_base, build_dsl_filter
+from .elastic import get_search_base, build_dsl_filter, hosts_url_to_nodeconfig
 from .logger import logger
 from .timeutil import quantize_time_range, convert_kibana_time
 
@@ -486,7 +486,7 @@ def generate_global_params(headers, params, idx):
 def merge_generated_parameters(headers, params, idx, param_hash):
     layer_id = f"{param_hash}_{config.hostname}"
     es = Elasticsearch(
-        config.elastic_hosts.split(","),
+        hosts_url_to_nodeconfig(config.elastic_hosts),
         verify_certs=False,
         timeout=120
     )

elastic_datashader/routers/indices.py

@@ -4,6 +4,7 @@
 from fastapi import APIRouter, Response
 
 from ..config import config
+from ..elastic import hosts_url_to_nodeconfig
 
 router = APIRouter(
     prefix="/indices",
@@ -14,7 +15,7 @@
 @router.get("")
 async def retrieve_indices():
     es = Elasticsearch(
-        config.elastic_hosts.split(","),
+        hosts_url_to_nodeconfig(config.elastic_hosts),
         verify_certs=False,
         timeout=120)
     aliases = es.indices.get_alias("*")  # pylint: disable=E1121
@@ -33,7 +34,7 @@ async def retrieve_indices():
 @router.get("/{index}/field_caps")
 async def retrieve_field_caps(index: str):
     es = Elasticsearch(
-        config.elastic_hosts.split(","), verify_certs=False, timeout=120
+        hosts_url_to_nodeconfig(config.elastic_hosts), verify_certs=False, timeout=120
     )
     field_caps = es.field_caps(  # pylint: disable=E1121,E1123
         index,
@@ -55,7 +56,7 @@ async def retrieve_field_caps(index: str):
 @router.get("/{index}/mapping")
 async def retrieve_index_mapping(index: str):
     es = Elasticsearch(
-        config.elastic_hosts.split(","), verify_certs=False, timeout=120
+        hosts_url_to_nodeconfig(config.elastic_hosts), verify_certs=False, timeout=120
     )
     index_mapping = es.indices.get_mapping(index)  # pylint: disable=E1121
     mapping = [

elastic_datashader/routers/tms.py

@@ -25,7 +25,7 @@
 )
 from ..config import config
 from ..drawing import generate_x_tile
-from ..elastic import get_es_headers, get_search_base
+from ..elastic import get_es_headers, get_search_base, hosts_url_to_nodeconfig
 from ..logger import logger
 from ..parameters import extract_parameters, merge_generated_parameters, SearchParams
 from ..tilegen import (
@@ -233,7 +233,7 @@ def generate_tile_to_cache(idx: str, x: int, y: int, z: int, params, parameter_h
         )
         error_info = {**base_tile_info, 'error': repr(ex)}
         create_datashader_tiles_entry(
-            Elasticsearch(config.elastic_hosts.split(","), verify_certs=False, timeout=120),
+            Elasticsearch(hosts_url_to_nodeconfig(config.elastic_hosts), verify_certs=False, timeout=120),
             **error_info
         )
         logger.debug("Releasing cache placeholder %s", rendering_tile_name(idx, x, y, z, parameter_hash))
@@ -254,7 +254,7 @@ def generate_tile_to_cache(idx: str, x: int, y: int, z: int, params, parameter_h
         }
 
         create_datashader_tiles_entry(
-            Elasticsearch(config.elastic_hosts.split(","), verify_certs=False, timeout=120),
+            Elasticsearch(hosts_url_to_nodeconfig(config.elastic_hosts), verify_certs=False, timeout=120),
             **new_tile_info,
         )
 
@@ -286,7 +286,7 @@ async def fetch_or_render_tile(already_waited: int, idx: str, x: int, y: int, z:
     check_proxy_key(request.headers.get('tms-proxy-key'))
 
     es = Elasticsearch(
-        config.elastic_hosts.split(","),
+        hosts_url_to_nodeconfig(config.elastic_hosts),
         verify_certs=False,
         timeout=120,
     )