diff --git a/.env b/.env index 63f96b9..7605860 100644 --- a/.env +++ b/.env @@ -70,24 +70,6 @@ SITE=senaite SENAITE_ADMIN_USER=admin SENAITE_ADMIN_PASSWORD=password -# -# Superset -# -SECRET_KEY=thisISaSECRET_1234 -SUPERSET_DB=superset -SUPERSET_DB_USER=superset -SUPERSET_DB_PASSWORD=superset -SUPERSET_ADMIN_USERNAME=admin -SUPERSET_ADMIN_PASSWORD=password -SUPERSET_LOAD_EXAMPLES=no -ANALYTICS_DATASOURCE_NAME=PostgreSQL - -# Superset Default Analytics DB -ANALYTICS_DB_USER=analytics -ANALYTICS_DB_PASSWORD=password -ANALYTICS_DB_HOST=postgresql -ANALYTICS_DB_NAME=analytics - # # Common EIP clients config # @@ -139,17 +121,12 @@ OPENMRS_OWAS_PATH= ODOO_CONFIG_PATH= ODOO_EXTRA_ADDONS= SENAITE_CONFIG_PATH= -SUPERSET_CONFIG_PATH= OPENMRS_FRONTEND_BINARY_PATH= OPENMRS_FRONTEND_CONFIG_PATH= EIP_OPENMRS_SENAITE_CONFIG_PATH= EIP_OPENMRS_SENAITE_ROUTES_PATH= EIP_ODOO_OPENMRS_PROPERTIES_PATH= EIP_ODOO_OPENMRS_ROUTES_PATH= -SUPERSET_DATASOURCES_PATH= -SUPERSET_INIT_PATH= -SUPERSET_CONFIG_PATH= -SUPERSET_DASHBOARDS_PATH= # Use the following volume to point to override database initialization scripts # Be careful when overriding this because the default scripts run essential configuration tasks needed by Ozone FOSS @@ -170,5 +147,4 @@ ODOO_CONFIG_CHECKSUMS_PATH= O3_HOSTNAME=emr-172-17-0-1.traefik.me ODOO_HOSTNAME=erp-172-17-0-1.traefik.me SENAITE_HOSTNAME=lims-172-17-0-1.traefik.me -SUPERSET_HOSTNAME=analytics-172-17-0-1.traefik.me ERPNEXT_HOSTNAME=erpnext-172-17-0-1.traefik.me diff --git a/.gitpod.yml b/.gitpod.yml index d2541f0..c70472c 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -10,9 +10,6 @@ ports: - name: Odoo description: Odoo port: 8069 - - name: Superset - description: Superset - port: 8088 - name: SENAITE description: SENAITE port: 8081 diff --git a/docker-compose-superset.yml b/docker-compose-superset.yml deleted file mode 100644 index 154f452..0000000 --- a/docker-compose-superset.yml +++ /dev/null @@ -1,96 +0,0 @@ -services: - - superset: - depends_on: - redis: - condition: service_started - postgresql: - condition: service_started - superset-init: - condition: service_completed_successfully - environment: &superset-env - - DATABASE_HOST=${POSTGRES_DB_HOST} - - DATABASE_DB=${SUPERSET_DB} - - DATABASE_USER=${SUPERSET_DB_USER} - - DATABASE_PASSWORD=${SUPERSET_DB_PASSWORD} - - SECRET_KEY=${SECRET_KEY} - - ADMIN_USERNAME=${SUPERSET_ADMIN_USERNAME} - - ADMIN_PASSWORD=${SUPERSET_ADMIN_PASSWORD} - - ANALYTICS_DB_PASSWORD=${ANALYTICS_DB_PASSWORD} - - ANALYTICS_DB_NAME=${ANALYTICS_DB_NAME} - - ANALYTICS_DB_USER=${ANALYTICS_DB_USER} - - ANALYTICS_DB_HOST=${ANALYTICS_DB_HOST} - - ANALYTICS_DATASOURCE_NAME=${ANALYTICS_DATASOURCE_NAME} - image: &superset-image amancevice/superset:4.0.0 - labels: - traefik.enable: "true" - traefik.http.routers.superset.rule: "Host(`${SUPERSET_HOSTNAME}`)" - traefik.http.routers.superset.entrypoints: "websecure" - traefik.http.services.superset.loadbalancer.server.port: 8088 - networks: - - ozone - - web - restart: unless-stopped - volumes: - - ${SUPERSET_CONFIG_PATH}/:/etc/superset/ - - superset-worker: - command: "celery --app=superset.tasks.celery_app:app worker --pool=gevent -Ofair -n worker1@%h --loglevel=INFO" - depends_on: - redis: - condition: service_started - postgresql: - condition: service_started - superset-init: - condition: service_completed_successfully - environment: *superset-env - image: *superset-image - networks: - - ozone - restart: unless-stopped - volumes: - - ${SUPERSET_CONFIG_PATH}/:/etc/superset/ - - - superset-init: - command: "/etc/superset/superset-init.sh" - depends_on: - - postgresql - - redis - environment: *superset-env - image: *superset-image - networks: - - ozone - restart: on-failure - volumes: - - ${SUPERSET_CONFIG_PATH}/:/etc/superset/ - - ${SUPERSET_DASHBOARDS_PATH}/:/dashboards/ - - redis: - image: redis:7 - restart: unless-stopped - networks: - - ozone - volumes: - - redis-data:/data - - postgresql: - environment: - # Analytics - ANALYTICS_DB_NAME: ${ANALYTICS_DB_NAME} - ANALYTICS_DB_USER: ${ANALYTICS_DB_USER} - ANALYTICS_DB_PASSWORD: ${ANALYTICS_DB_PASSWORD} - # Superset - SUPERSET_DB: ${SUPERSET_DB} - SUPERSET_DB_USER: ${SUPERSET_DB_USER} - SUPERSET_DB_PASSWORD: ${SUPERSET_DB_PASSWORD} - volumes: - - "${SQL_SCRIPTS_PATH}/postgresql/analytics:/docker-entrypoint-initdb.d/db/analytics" - - "${SQL_SCRIPTS_PATH}/postgresql/superset:/docker-entrypoint-initdb.d/db/superset" - - env-substitution: - environment: - - SUPERSET_PUBLIC_URL=https://${SUPERSET_HOSTNAME} - -volumes: - redis-data: ~ diff --git a/proxy/default.conf.template b/proxy/default.conf.template index ac91d79..7c13e14 100644 --- a/proxy/default.conf.template +++ b/proxy/default.conf.template @@ -146,16 +146,6 @@ server { } } -server { - listen 8088; - location / { - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - set $superset superset:8088; - proxy_pass http://$superset; - } -} - server { listen 8081; location / { diff --git a/scripts/docker-compose-files.txt b/scripts/docker-compose-files.txt index 08c5052..b23e48a 100755 --- a/scripts/docker-compose-files.txt +++ b/scripts/docker-compose-files.txt @@ -2,4 +2,3 @@ docker-compose-common.yml docker-compose-odoo.yml docker-compose-openmrs.yml docker-compose-senaite.yml -docker-compose-superset.yml diff --git a/scripts/ozone-urls-template.csv b/scripts/ozone-urls-template.csv index 42c4fa4..bdeafa3 100644 --- a/scripts/ozone-urls-template.csv +++ b/scripts/ozone-urls-template.csv @@ -3,5 +3,4 @@ HIS Component,URL,Username,Password,Service OpenMRS 3,${O3_HOSTNAME}/openmrs/spa,admin,Admin123,openmrs SENAITE,${SENAITE_HOSTNAME},admin,password,senaite Odoo,${ODOO_HOSTNAME},admin,admin,odoo -Superset,${SUPERSET_HOSTNAME},admin,password,superset ERPNext,${ERPNEXT_HOSTNAME},administrator,password,erpnext diff --git a/scripts/utils.sh b/scripts/utils.sh index a43d270..fd97c20 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -34,8 +34,6 @@ function exportPaths () { export OPENMRS_FRONTEND_BINARY_PATH=$DISTRO_PATH/binaries/openmrs/frontend export OPENMRS_FRONTEND_CONFIG_PATH=$DISTRO_PATH/configs/openmrs/frontend_config/ export SQL_SCRIPTS_PATH=$DISTRO_PATH/data/ - export SUPERSET_CONFIG_PATH=$DISTRO_PATH/configs/superset/ - export SUPERSET_DASHBOARDS_PATH=$DISTRO_PATH/configs/superset/dashboard-assets/ export ERPNEXT_CONFIG_PATH=$DISTRO_PATH/configs/erpnext/initializer_config/ export ERPNEXT_SCRIPTS_PATH=$DISTRO_PATH/binaries/erpnext/scripts/ @@ -52,8 +50,6 @@ function exportPaths () { echo "→ EIP_ERPNEXT_OPENMRS_ROUTES_PATH=$EIP_ERPNEXT_OPENMRS_ROUTES_PATH" echo "→ OPENMRS_FRONTEND_CONFIG_PATH=$OPENMRS_FRONTEND_CONFIG_PATH" echo "→ SQL_SCRIPTS_PATH=$SQL_SCRIPTS_PATH" - echo "→ SUPERSET_CONFIG_PATH=$SUPERSET_CONFIG_PATH" - echo "→ SUPERSET_DASHBOARDS_PATH=$SUPERSET_DASHBOARDS_PATH" echo "→ ERPNEXT_CONFIG_PATH=$ERPNEXT_CONFIG_PATH" echo "→ ERPNEXT_SCRIPTS_PATH=$ERPNEXT_SCRIPTS_PATH" @@ -109,12 +105,10 @@ function setTraefikHostnames { export O3_HOSTNAME=emr-"${IP_WITH_DASHES}.traefik.me" export ODOO_HOSTNAME=erp-"${IP_WITH_DASHES}.traefik.me" export SENAITE_HOSTNAME=lims-"${IP_WITH_DASHES}.traefik.me" - export SUPERSET_HOSTNAME=analytics-"${IP_WITH_DASHES}.traefik.me" export ERPNEXT_HOSTNAME=erpnext-"${IP_WITH_DASHES}.traefik.me" echo "→ O3_HOSTNAME=$O3_HOSTNAME" echo "→ ODOO_HOSTNAME=$ODOO_HOSTNAME" echo "→ SENAITE_HOSTNAME=$SENAITE_HOSTNAME" - echo "→ SUPERSET_HOSTNAME=$SUPERSET_HOSTNAME" echo "→ ERPNEXT_HOSTNAME=$ERPNEXT_HOSTNAME" } @@ -125,12 +119,10 @@ function setNginxHostnames { export O3_HOSTNAME="localhost" export ODOO_HOSTNAME="localhost:8069" export SENAITE_HOSTNAME="localhost:8081" - export SUPERSET_HOSTNAME="localhost:8088" export ERPNEXT_HOSTNAME="localhost:8082" echo "→ O3_HOSTNAME=$O3_HOSTNAME" echo "→ ODOO_HOSTNAME=$ODOO_HOSTNAME" echo "→ SENAITE_HOSTNAME=$SENAITE_HOSTNAME" - echo "→ SUPERSET_HOSTNAME=$SUPERSET_HOSTNAME" echo "→ ERPNEXT_HOSTNAME=$ERPNEXT_HOSTNAME" }