diff --git a/resources/examples/airflow/README.md b/resources/examples/airflow/README.md index 0d18c9fcb201e..70cb50dfdb568 100644 --- a/resources/examples/airflow/README.md +++ b/resources/examples/airflow/README.md @@ -13,5 +13,15 @@ Simple enter that ID into your terminal and a connection will be set up in Airfl Trigger the DAG with the switch in the top right and you should be in business! If it doesn't automatically run, just hit the play button in the top right to kick off the sync. +## Setting up Superset + +As the script has automatically set up a Postgres container for you, just enter these connection details to set up your destination: + +![](./assets/postgres_setup.png) + +Head over to http://localhost:8088 to get to the Superset UI. Enter `admin` as your username and `admin` as your password. Then head to the `Data` section in the top bar and navigate to `Databases`. Click `+DATABASE` and enter the following config: + +![](./assets/superset_database_setup.png) + ## Cleaning Up Run `down.sh` to clean up the containers. Or run `docker-compose down -v` here and in the root directory, your call. \ No newline at end of file diff --git a/resources/examples/airflow/assets/postgres_setup.png b/resources/examples/airflow/assets/postgres_setup.png new file mode 100644 index 0000000000000..412ccfaa21ce8 Binary files /dev/null and b/resources/examples/airflow/assets/postgres_setup.png differ diff --git a/resources/examples/airflow/assets/superset_database_setup.png b/resources/examples/airflow/assets/superset_database_setup.png new file mode 100644 index 0000000000000..3e887c084856b Binary files /dev/null and b/resources/examples/airflow/assets/superset_database_setup.png differ diff --git a/resources/examples/airflow/superset/docker-compose-superset.yaml b/resources/examples/airflow/superset/docker-compose-superset.yaml index a4161c57ef3ea..3a553556115fd 100644 --- a/resources/examples/airflow/superset/docker-compose-superset.yaml +++ b/resources/examples/airflow/superset/docker-compose-superset.yaml @@ -33,7 +33,7 @@ services: - redis:/data db: - env_file: ../docker/.env + env_file: docker/.env image: postgres:10 container_name: superset_db restart: unless-stopped @@ -41,7 +41,7 @@ services: - db_home:/var/lib/postgresql/data superset: - env_file: ../docker/.env-non-dev + env_file: docker/.env-non-dev image: *superset-image container_name: superset_app command: ["/app/docker/docker-bootstrap.sh", "app-gunicorn"] @@ -56,7 +56,7 @@ services: image: *superset-image container_name: superset_init command: ["/app/docker/docker-init.sh"] - env_file: ../docker/.env-non-dev + env_file: docker/.env-non-dev depends_on: *superset-depends-on user: "root" volumes: *superset-volumes @@ -65,7 +65,7 @@ services: image: *superset-image container_name: superset_worker command: ["/app/docker/docker-bootstrap.sh", "worker"] - env_file: ../docker/.env-non-dev + env_file: docker/.env-non-dev restart: unless-stopped depends_on: *superset-depends-on user: "root" @@ -75,7 +75,7 @@ services: image: *superset-image container_name: superset_worker_beat command: ["/app/docker/docker-bootstrap.sh", "beat"] - env_file: ../docker/.env-non-dev + env_file: docker/.env-non-dev restart: unless-stopped depends_on: *superset-depends-on user: "root" diff --git a/resources/examples/airflow/docker/.env b/resources/examples/airflow/superset/docker/.env similarity index 98% rename from resources/examples/airflow/docker/.env rename to resources/examples/airflow/superset/docker/.env index b2f11c1a185a2..af5721f50f5fb 100644 --- a/resources/examples/airflow/docker/.env +++ b/resources/examples/airflow/superset/docker/.env @@ -41,6 +41,6 @@ REDIS_PORT=6379 FLASK_ENV=development SUPERSET_ENV=development -SUPERSET_LOAD_EXAMPLES=yes +SUPERSET_LOAD_EXAMPLES=no CYPRESS_CONFIG=false SUPERSET_PORT=8088 diff --git a/resources/examples/airflow/docker/.env-non-dev b/resources/examples/airflow/superset/docker/.env-non-dev similarity index 100% rename from resources/examples/airflow/docker/.env-non-dev rename to resources/examples/airflow/superset/docker/.env-non-dev diff --git a/resources/examples/airflow/docker/docker-bootstrap.sh b/resources/examples/airflow/superset/docker/docker-bootstrap.sh similarity index 100% rename from resources/examples/airflow/docker/docker-bootstrap.sh rename to resources/examples/airflow/superset/docker/docker-bootstrap.sh diff --git a/resources/examples/airflow/docker/docker-ci.sh b/resources/examples/airflow/superset/docker/docker-ci.sh similarity index 100% rename from resources/examples/airflow/docker/docker-ci.sh rename to resources/examples/airflow/superset/docker/docker-ci.sh diff --git a/resources/examples/airflow/docker/docker-entrypoint.sh b/resources/examples/airflow/superset/docker/docker-entrypoint.sh similarity index 100% rename from resources/examples/airflow/docker/docker-entrypoint.sh rename to resources/examples/airflow/superset/docker/docker-entrypoint.sh diff --git a/resources/examples/airflow/docker/docker-frontend.sh b/resources/examples/airflow/superset/docker/docker-frontend.sh similarity index 100% rename from resources/examples/airflow/docker/docker-frontend.sh rename to resources/examples/airflow/superset/docker/docker-frontend.sh diff --git a/resources/examples/airflow/docker/docker-init.sh b/resources/examples/airflow/superset/docker/docker-init.sh similarity index 100% rename from resources/examples/airflow/docker/docker-init.sh rename to resources/examples/airflow/superset/docker/docker-init.sh diff --git a/resources/examples/airflow/docker/frontend-mem-nag.sh b/resources/examples/airflow/superset/docker/frontend-mem-nag.sh similarity index 100% rename from resources/examples/airflow/docker/frontend-mem-nag.sh rename to resources/examples/airflow/superset/docker/frontend-mem-nag.sh diff --git a/resources/examples/airflow/docker/pythonpath_dev/.gitignore b/resources/examples/airflow/superset/docker/pythonpath_dev/.gitignore similarity index 98% rename from resources/examples/airflow/docker/pythonpath_dev/.gitignore rename to resources/examples/airflow/superset/docker/pythonpath_dev/.gitignore index 376bb61ea96c0..04581b38877f0 100644 --- a/resources/examples/airflow/docker/pythonpath_dev/.gitignore +++ b/resources/examples/airflow/superset/docker/pythonpath_dev/.gitignore @@ -16,7 +16,7 @@ # # Ignore everything -* +.gitignore # DON'T ignore the .gitignore !.gitignore !superset_config.py diff --git a/resources/examples/airflow/docker/pythonpath_dev/superset_config.py b/resources/examples/airflow/superset/docker/pythonpath_dev/superset_config.py similarity index 100% rename from resources/examples/airflow/docker/pythonpath_dev/superset_config.py rename to resources/examples/airflow/superset/docker/pythonpath_dev/superset_config.py diff --git a/resources/examples/airflow/docker/pythonpath_dev/superset_config_local.example b/resources/examples/airflow/superset/docker/pythonpath_dev/superset_config_local.example similarity index 100% rename from resources/examples/airflow/docker/pythonpath_dev/superset_config_local.example rename to resources/examples/airflow/superset/docker/pythonpath_dev/superset_config_local.example