From 8a92d253db9d2cbdf4898a549ccac130b1eb9a6e Mon Sep 17 00:00:00 2001 From: parthp2107 <83201188+parthp2107@users.noreply.github.com> Date: Thu, 5 Aug 2021 10:15:52 +0530 Subject: [PATCH] replaced catalog to openmetadata #2 (#47) Co-authored-by: parthp2107 --- README.md | 18 +++++++++--------- ...r-start.sh => openmetadata-server-start.sh} | 2 +- bin/{catalog.sh => openmetadata.sh} | 6 +++--- bootstrap/bootstrap_storage.sh | 2 +- conf/{catalog-env.sh => openmetadata-env.sh} | 0 ...ecurity.yaml => openmetadata-security.yaml} | 8 ++++---- conf/{catalog.yaml => openmetadata.yaml} | 8 ++++---- dist/pom.xml | 2 +- docker/metadata/docker-compose.yml | 10 +++++----- ...{catalog-start.sh => openmetadata-start.sh} | 8 ++++---- .../{catalog.yaml => openmetadata.yaml} | 8 ++++---- 11 files changed, 36 insertions(+), 36 deletions(-) rename bin/{catalog-server-start.sh => openmetadata-server-start.sh} (98%) rename bin/{catalog.sh => openmetadata.sh} (97%) rename conf/{catalog-env.sh => openmetadata-env.sh} (100%) rename conf/{catalog-security.yaml => openmetadata-security.yaml} (95%) rename conf/{catalog.yaml => openmetadata.yaml} (95%) rename docker/metadata/{catalog-start.sh => openmetadata-start.sh} (82%) rename docker/metadata/{catalog.yaml => openmetadata.yaml} (94%) diff --git a/README.md b/README.md index b53b508a91b..acc7c237e84 100644 --- a/README.md +++ b/README.md @@ -26,37 +26,37 @@ ```shell mysql -u username -p (Enter password when prompted) -mysql> CREATE USER 'catalog_user'@'%' IDENTIFIED WITH mysql_native_password BY 'catalog_password'; -mysql> CREATE DATABASE catalog_db; -mysql> GRANT ALL PRIVILEGES ON catalog_db.* TO 'catalog_user'@'%' IDENTIFIED BY 'catalog_password'; +mysql> CREATE USER 'openmetadata_user'@'%' IDENTIFIED WITH mysql_native_password BY 'openmetadata_password'; +mysql> CREATE DATABASE openmetadata_db; +mysql> `GRANT ALL PRIVILEGES ON openmetadata_db.* TO 'openmetadata_user'@'%' IDENTIFIED BY 'openmetadata_password'`; mysql> FLUSH PRIVILEGES; ``` ### Build OpenMetdata project and run it -Make sure mysql is running with credentials user 'catalog_user' with password 'catalog_password'. +Make sure mysql is running with credentials user 'openmetadata_user' with password 'openmetadata_password'. Connect to mysql following steps mentioned [here](#steps-to-connect-mysql). ```shells mvn -DskipTests clean package cd dist/target -tar zxvf catalog-1.0.0-SNAPSHOT.tar.gz -cd catalog-1.0.0-SNAPSHOT/bootstrap +tar zxvf openmetadata-1.0.0-SNAPSHOT.tar.gz +cd openmetadata-1.0.0-SNAPSHOT/bootstrap ./bootstrap_storage.sh migrate cd ../ ``` If authorizer is configured, run: ``` -./bin/catalog-server-start.sh conf/catalog-security.yaml +./bin/openmetadata-server-start.sh conf/openmetadata-security.yaml ``` otherwise run ``` -./bin/catalog-server-start.sh conf/catalog.yaml +./bin/openmetadata-server-start.sh conf/openmetadata.yaml ``` Open browser http://localhost:8585/ to start the UI.\ Open browser http://localhost:8585/api/swagger to look at API documentation. ### Setup Authorizer Configuration -Enter following information in ***/conf/catalog-security.yaml*** file: +Enter following information in ***/conf/openmetadata-security.yaml*** file: ``` authorizerConfiguration: className: diff --git a/bin/catalog-server-start.sh b/bin/openmetadata-server-start.sh similarity index 98% rename from bin/catalog-server-start.sh rename to bin/openmetadata-server-start.sh index 7342cca770d..49cc078f6ca 100644 --- a/bin/catalog-server-start.sh +++ b/bin/openmetadata-server-start.sh @@ -18,7 +18,7 @@ if [ $# -lt 1 ]; then - echo "USAGE: $0 [-daemon] catalog.yaml" + echo "USAGE: $0 [-daemon] openmetadata.yaml" exit 1 fi base_dir=$(dirname $0)/.. diff --git a/bin/catalog.sh b/bin/openmetadata.sh similarity index 97% rename from bin/catalog.sh rename to bin/openmetadata.sh index b1937b566ef..78340169224 100644 --- a/bin/catalog.sh +++ b/bin/openmetadata.sh @@ -28,7 +28,7 @@ mkdir -p $LOG_DIR [ -z $MAX_WAIT_TIME ] && MAX_WAIT_TIME=120 # OpenMetadata env script -. $CATALOG_HOME/conf/catalog-env.sh +. $CATALOG_HOME/conf/openmetadata-env.sh function catalogStart { catalogStatus -q @@ -125,7 +125,7 @@ else fi # CATALOG env script -. ${CATALOG_HOME}/conf/catalog-env.sh +. ${CATALOG_HOME}/conf/openmetadata-env.sh PID=0 @@ -187,7 +187,7 @@ option="$1" shift case "${option}" in start) - conf="$CATALOG_HOME/conf/catalog.yaml" + conf="$CATALOG_HOME/conf/openmetadata.yaml" if [[ $# -eq 1 ]]; then conf="${1}"; fi catalogStart "${conf}" ;; diff --git a/bootstrap/bootstrap_storage.sh b/bootstrap/bootstrap_storage.sh index 866edd305ce..1fe1dd67d85 100644 --- a/bootstrap/bootstrap_storage.sh +++ b/bootstrap/bootstrap_storage.sh @@ -30,7 +30,7 @@ while [ -h "${PRG}" ]; do done BOOTSTRAP_DIR=`dirname ${PRG}` -CONFIG_FILE_PATH=${BOOTSTRAP_DIR}/../conf/catalog.yaml +CONFIG_FILE_PATH=${BOOTSTRAP_DIR}/../conf/openmetadata.yaml SCRIPT_ROOT_DIR="${BOOTSTRAP_DIR}/sql" # Which java to use diff --git a/conf/catalog-env.sh b/conf/openmetadata-env.sh similarity index 100% rename from conf/catalog-env.sh rename to conf/openmetadata-env.sh diff --git a/conf/catalog-security.yaml b/conf/openmetadata-security.yaml similarity index 95% rename from conf/catalog-security.yaml rename to conf/openmetadata-security.yaml index f718a057493..cae562cc943 100644 --- a/conf/catalog-security.yaml +++ b/conf/openmetadata-security.yaml @@ -110,10 +110,10 @@ database: # the name of the JDBC driver, mysql in our case driverClass: com.mysql.cj.jdbc.Driver # the username and password - user: catalog_user - password: catalog_password - # the JDBC URL; the database is called catalog_db - url: jdbc:mysql://localhost/catalog_db?useSSL=false&serverTimezone=UTC + user: openmetadata_user + password: openmetadata_password + # the JDBC URL; the database is called openmetadata_db + url: jdbc:mysql://localhost/openmetadata_db?useSSL=false&serverTimezone=UTC # Authorizer Configuration diff --git a/conf/catalog.yaml b/conf/openmetadata.yaml similarity index 95% rename from conf/catalog.yaml rename to conf/openmetadata.yaml index 891b73b790b..aa90bbafdb5 100644 --- a/conf/catalog.yaml +++ b/conf/openmetadata.yaml @@ -109,10 +109,10 @@ database: # the name of the JDBC driver, mysql in our case driverClass: com.mysql.cj.jdbc.Driver # the username and password - user: catalog_user - password: catalog_password - # the JDBC URL; the database is called catalog_db - url: jdbc:mysql://localhost/catalog_db?useSSL=false&serverTimezone=UTC + user: openmetadata_user + password: openmetadata_password + # the JDBC URL; the database is called openmetadata_db + url: jdbc:mysql://localhost/openmetadata_db?useSSL=false&serverTimezone=UTC elasticsearch: diff --git a/dist/pom.xml b/dist/pom.xml index 90c2e5d3817..747f0ff39d2 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -46,7 +46,7 @@ - catalog + openmetadata diff --git a/docker/metadata/docker-compose.yml b/docker/metadata/docker-compose.yml index 79a9d89fd39..9fd16f50880 100644 --- a/docker/metadata/docker-compose.yml +++ b/docker/metadata/docker-compose.yml @@ -21,9 +21,9 @@ services: restart: always environment: MYSQL_ROOT_PASSWORD: password - MYSQL_USER: catalog_user - MYSQL_PASSWORD: catalog_password - MYSQL_DATABASE: catalog_db + MYSQL_USER: openmetadata_user + MYSQL_PASSWORD: openmetadata_password + MYSQL_DATABASE: openmetadata_db expose: - 3306 networks: @@ -82,8 +82,8 @@ services: restart: always environment: POSTGRES_DB: pagila - POSTGRES_USER: catalog_user - POSTGRES_PASSWORD: catalog_password + POSTGRES_USER: openmetadata_user + POSTGRES_PASSWORD: openmetadata_password ports: - 5433:5432 networks: diff --git a/docker/metadata/catalog-start.sh b/docker/metadata/openmetadata-start.sh similarity index 82% rename from docker/metadata/catalog-start.sh rename to docker/metadata/openmetadata-start.sh index a80557b68b4..24147dda93b 100644 --- a/docker/metadata/catalog-start.sh +++ b/docker/metadata/openmetadata-start.sh @@ -20,10 +20,10 @@ cd / while ! curl -o - 172.16.239.10:3306; do sleep 1; done -tar zxvf catalog-1.0.0-SNAPSHOT.tar.gz -cp /catalog.yaml /catalog-1.0.0-SNAPSHOT/conf/ +tar zxvf openmetadata-1.0.0-SNAPSHOT.tar.gz +cp /openmetadata.yaml /openmetadata-1.0.0-SNAPSHOT/conf/ -cd /catalog-1.0.0-SNAPSHOT +cd /openmetadata-1.0.0-SNAPSHOT ./bootstrap/bootstrap_storage.sh migrate -./bin/catalog-server-start.sh conf/catalog.yaml +./bin/openmetadata-server-start.sh conf/openmetadata.yaml diff --git a/docker/metadata/catalog.yaml b/docker/metadata/openmetadata.yaml similarity index 94% rename from docker/metadata/catalog.yaml rename to docker/metadata/openmetadata.yaml index 079bc993ffa..e2bb7c1a847 100644 --- a/docker/metadata/catalog.yaml +++ b/docker/metadata/openmetadata.yaml @@ -109,10 +109,10 @@ database: # the name of the JDBC driver, mysql in our case driverClass: com.mysql.cj.jdbc.Driver # the username and password - user: catalog_user - password: catalog_password - # the JDBC URL; the database is called catalog_db - url: jdbc:mysql://localhost/catalog_db?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true + user: openmetadata_user + password: openmetadata_password + # the JDBC URL; the database is called openmetadata_db + url: jdbc:mysql://localhost/openmetadata_db?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true elasticsearch: