Config changes for metrics after testing on hyde (#72)

* Apparently these config values were never checked in, and are the cause of the metrics not currently populating * A couple more fixes after testing on hyde * Remove unused erroneously added values
isamplesorg · Aug 2, 2024 · 4f4a0d5 · 4f4a0d5
1 parent 262abae
commit 4f4a0d5
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/isb/Dockerfile b/isb/Dockerfile
@@ -51,7 +51,7 @@ COPY ./isamples_webui/index.html /app/isb_web/ui/
 COPY ./isamples_webui/manifest.json /app/isb_web/ui/
 COPY ./isamples_webui/robots.txt /app/isb_web/ui/
 COPY ./isamples_webui/static /app/isb_web/ui/static
-RUN echo "const _server_base = \"$ISB_SITEMAP_PREFIX/\";\n\nconst DATACITE_PUBLISHER = [\"Sesar\", \"Geome\", \"OpenContext\", \"Smithsonian\"];\n\nconst config = {\n \"original_source\": \"https://n2t.net\",\n  \"solr_url\": _server_base + \"thing/select\",\n  \"solr_stream\": _server_base + \"thing/stream\",\n  \"thingpage\": _server_base + \"thingpage\",\n  \"dois_draft\": _server_base + \"manage/mint_draft_identifiers\",\n  \"login\": _server_base + \"manage/login\",\n  \"logout\": _server_base + \"manage/logout\",\n  \"userinfo\": _server_base + \"manage/userinfo\",\n  \"h3_count\": _server_base + \"h3_counts\", \n \"vocabulary_url\": _server_base + \"vocabulary\", \n  \"enable_login\": false, \n  \"analytics_src\": \"$ANALYTICS_SRC\",\n  \"analytics_domain\": \"$ANALYTICS_DOMAIN\",\n  \"datacite_prefix\": \"$DATACITE_PREFIX\",\n  \"datacite_publisher\": DATACITE_PUBLISHER\n};\n\nwindow.config = config;" | tee /app/isb_web/ui/config.js
+RUN echo "const _server_base = \"$ISB_SITEMAP_PREFIX/\";\n\nconst DATACITE_PUBLISHER = [\"Sesar\", \"Geome\", \"OpenContext\", \"Smithsonian\"];\n\nconst config = {\n \"original_source\": \"https://n2t.net\",\n  \"solr_url\": _server_base + \"thing/select\",\n  \"solr_stream\": _server_base + \"thing/stream\",\n  \"thingpage\": _server_base + \"thingpage\",\n  \"dois_draft\": _server_base + \"manage/mint_draft_identifiers\",\n  \"login\": _server_base + \"manage/login\",\n  \"logout\": _server_base + \"manage/logout\",\n  \"userinfo\": _server_base + \"manage/userinfo\",\n  \"h3_count\": _server_base + \"h3_counts\", \n \"vocabulary_url\": _server_base + \"vocabulary\", \n  \"enable_login\": false, \n  \"analytics_src\": \"https://metrics.isample.xyz/js/plausible.js\",\n  \"analytics_domain\": \"$ANALYTICS_DOMAIN\",\n  \"datacite_prefix\": \"$DATACITE_PREFIX\",\n  \"datacite_publisher\": DATACITE_PUBLISHER\n};\n\nwindow.config = config;" | tee /app/isb_web/ui/config.js
 
 # Install nodejs in the container
 USER root

diff --git a/isb/isb_web_config/geome.isb_web_config.env b/isb/isb_web_config/geome.isb_web_config.env
@@ -2,7 +2,6 @@ DATABASE_URL = "postgresql+psycopg2://isb_writer:isamplesinabox@db/isb_1"
 WEB_ROOT = "/"
 SOLR_URL = "http://solr:8983/solr/isb_core_records/"
 ANALYTICS_URL = "https://metrics.isample.xyz/api/event"
-ANALYTICS_SRC = "https://metrics.isample.xyz/js/plausible.js"
 ANALYTICS_DOMAIN = "geome.isamples.org"
 MODELSERVER_URL = "http://35.170.169.156:9000/"
 SITEMAP_URL_PREFIX = "https://henry.cyverse.org/geome/"

diff --git a/isb/isb_web_config/isamples_central.isb_web_config.env b/isb/isb_web_config/isamples_central.isb_web_config.env
@@ -2,8 +2,7 @@ DATABASE_URL = "postgresql+psycopg2://isb_writer:isamplesinabox@db/isb_1"
 WEB_ROOT = "/"
 SOLR_URL = "http://solr:8983/solr/isb_core_records/"
 ANALYTICS_URL = "https://metrics.isample.xyz/api/event"
-ANALYTICS_SRC = "https://metrics.isample.xyz/js/plausible.js"
-ANALYTICS_DOMAIN = "iscaws.isample.xyz"
+ANALYTICS_DOMAIN = "central.isample.xyz"
 FASTTEXT_MODEL_PATH = "/app/sampledFeature.bin"
 SESAR_MATERIAL_MODEL_PATH = "/app/metadata_models/sesar-material"
 SESAR_MATERIAL_CONFIG_PATH = "/app/metadata_models/models/SESAR_material_config.json"

diff --git a/isb/isb_web_config/opencontext.isb_web_config.env b/isb/isb_web_config/opencontext.isb_web_config.env
@@ -2,7 +2,6 @@ DATABASE_URL = "postgresql+psycopg2://isb_writer:isamplesinabox@db/isb_1"
 WEB_ROOT = "/"
 SOLR_URL = "http://solr:8983/solr/isb_core_records/"
 ANALYTICS_URL = "https://metrics.isample.xyz/api/event"
-ANALYTICS_SRC = "https://metrics.isample.xyz/js/plausible.js"
 ANALYTICS_DOMAIN = "opencontext.isamples.org"
 MODELSERVER_URL = "http://35.170.169.156:9000/"
 SITEMAP_URL_PREFIX = "https://henry.cyverse.org/opencontext/sitemaps/"

diff --git a/isb/isb_web_config/sesar.isb_web_config.env b/isb/isb_web_config/sesar.isb_web_config.env
@@ -2,6 +2,5 @@ DATABASE_URL = "postgresql+psycopg2://isb_writer:isamplesinabox@db/isb_1"
 WEB_ROOT = "/"
 SOLR_URL = "http://solr:8983/solr/isb_core_records/"
 ANALYTICS_URL = "https://metrics.isample.xyz/api/event"
-ANALYTICS_SRC = "https://metrics.isample.xyz/js/plausible.js"
 ANALYTICS_DOMAIN = "sesar.isamples.org"
 MODELSERVER_URL = "http://35.170.169.156:9000/"
diff --git a/isb/isb_web_config/smithsonian.isb_web_config.env b/isb/isb_web_config/smithsonian.isb_web_config.env
@@ -2,7 +2,6 @@ DATABASE_URL = "postgresql+psycopg2://isb_writer:isamplesinabox@db/isb_1"
 WEB_ROOT = "/"
 SOLR_URL = "http://solr:8983/solr/isb_core_records/"
 ANALYTICS_URL = "https://metrics.isample.xyz/api/event"
-ANALYTICS_SRC = "https://metrics.isample.xyz/js/plausible.js"
 ANALYTICS_DOMAIN = "smithsonian.isamples.org"
 MODELSERVER_URL = "http://35.170.169.156:9000/"
 SITEMAP_URL_PREFIX = "https://henry.cyverse.org/smithsonian/"