Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OZ-429: [WIP] Disable Superset when starting demo #102

Merged
merged 1 commit into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down Expand Up @@ -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
Expand All @@ -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
3 changes: 0 additions & 3 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ ports:
- name: Odoo
description: Odoo
port: 8069
- name: Superset
description: Superset
port: 8088
- name: SENAITE
description: SENAITE
port: 8081
96 changes: 0 additions & 96 deletions docker-compose-superset.yml

This file was deleted.

10 changes: 0 additions & 10 deletions proxy/default.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 / {
Expand Down
1 change: 0 additions & 1 deletion scripts/docker-compose-files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ docker-compose-common.yml
docker-compose-odoo.yml
docker-compose-openmrs.yml
docker-compose-senaite.yml
docker-compose-superset.yml
1 change: 0 additions & 1 deletion scripts/ozone-urls-template.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions scripts/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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"

Expand Down Expand Up @@ -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"

}
Expand All @@ -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"

}
Expand Down