From fb8eb53dac4175f67be31880f201385c9034483a Mon Sep 17 00:00:00 2001 From: KenFujimoto12 Date: Thu, 27 Jan 2022 20:13:17 +0900 Subject: [PATCH 1/3] fix: minor collection --- README.md | 2 ++ README_JP.md | 2 ++ docs/aws/eks/secrets.env.template | 4 ++-- docs/gcp/gke/README_JP.md | 6 ++---- docs/gcp/gke/secrets.env.template | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d82ef1a..79dc5ae 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ MxTransporter is a middleware that accurately carries change streams of MongoDB in real time. For infrastructure, you can easily use this middleware by creating a container image with Dockerfile on any platform and deploying it. +With MxTransporter, real-time data can be reproduced and retained on the data utilization side, and data utilization will become even more active. + :jp: Japanese version of the README is [here](/README_JP.md). [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) diff --git a/README_JP.md b/README_JP.md index 5aa8070..e9f6054 100644 --- a/README_JP.md +++ b/README_JP.md @@ -2,6 +2,8 @@ MxTransporter は MongoDB の Change Streams を正確に、リアルタイムで送信先に運ぶミドルウェアです。MxTransporter は、用意された Dockerfile からコンテナイメージを作成し、お好きな環境へデプロイすることで簡単に利用することができます。 +MxTransporterにより、データ活用側でリアルタイムなデータを再現、保持でき、データ活用がより一層活発になるでしょう。 + [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=cam-inc_MxTransporter&metric=coverage)](https://sonarcloud.io/summary/new_code?id=cam-inc_MxTransporter)
diff --git a/docs/aws/eks/secrets.env.template b/docs/aws/eks/secrets.env.template index 5ef8058..b142bc5 100644 --- a/docs/aws/eks/secrets.env.template +++ b/docs/aws/eks/secrets.env.template @@ -33,11 +33,11 @@ LOG_LEVEL= ### Specify log format, json or console. default is json. ### e.g. LOG_FORMAT=console LOG_FORMAT= -### Specify log output Directory. +### Specify log output Directory. If not specified, it will be output to stdout. ### e.g. LOG_OUTPUT_PATH=/var/log/ ### e.g. LOG_OUTPUT_PATH=../../var/log/ LOG_OUTPUT_DIRECTORY= -### Specify log output File. +### Specify log output File. If not specified, it will be output to stdout. ### e.g. LOG_OUTPUT_FILE=mxt.log LOG_OUTPUT_FILE= diff --git a/docs/gcp/gke/README_JP.md b/docs/gcp/gke/README_JP.md index a68fa50..d037d04 100644 --- a/docs/gcp/gke/README_JP.md +++ b/docs/gcp/gke/README_JP.md @@ -122,7 +122,7 @@ $ make secrets **3. Kubernetes リソースをデプロイする** -もしオプションの環境変数を```.secrets.env```セットしたのであれば、```./templates/stateless.yaml```内の env パラメータを編集します。Kubernetes で実行されているコンテナに必要な環境変数のみを設定します。 +もしオプションの環境変数を```.secrets.env```にセットしたのであれば、```./templates/stateless.yaml```内の env パラメータを編集します。Kubernetes で実行されているコンテナに必要な環境変数のみを設定します。 Kubernetes リソースは helm によって作成されます。 @@ -133,9 +133,7 @@ $ make deploy ``` このコマンドでは、以下のような処理が行われます。
-・Docker イメージビルド
-・ECR リポジトリへのログイン
-・ECR リポジトリへ Docker イメージを送信
+・GCR リポジトリへ Docker イメージを送信
・helm の variables を作成します
・helm テンプレートをデプロイする
diff --git a/docs/gcp/gke/secrets.env.template b/docs/gcp/gke/secrets.env.template index 3f54628..ca7fc51 100644 --- a/docs/gcp/gke/secrets.env.template +++ b/docs/gcp/gke/secrets.env.template @@ -37,11 +37,11 @@ LOG_LEVEL= ### Specify log format, json or console. default is json. ### e.g. LOG_FORMAT=console LOG_FORMAT= -### Specify log output Directory. +### Specify log output Directory. If not specified, it will be output to stdout. ### e.g. LOG_OUTPUT_PATH=/var/log/ ### e.g. LOG_OUTPUT_PATH=../../var/log/ LOG_OUTPUT_DIRECTORY= -### Specify log output File. +### Specify log output File. If not specified, it will be output to stdout. ### e.g. LOG_OUTPUT_FILE=mxt.log LOG_OUTPUT_FILE= From ed04889cd279536b63d19415158433ebe0d365bf Mon Sep 17 00:00:00 2001 From: KenFujimoto12 Date: Fri, 28 Jan 2022 15:05:41 +0900 Subject: [PATCH 2/3] fix: minor collection --- docs/aws/eks/.env.template | 3 +++ docs/gcp/gke/.env.template | 3 +++ docs/gcp/gke/Makefile | 3 +++ 3 files changed, 9 insertions(+) diff --git a/docs/aws/eks/.env.template b/docs/aws/eks/.env.template index b0a87d2..7222387 100644 --- a/docs/aws/eks/.env.template +++ b/docs/aws/eks/.env.template @@ -33,6 +33,9 @@ EKS_SUBNET_B= ################################## ## Helm variables ################################## +## specify directory that saved resume token in +PERSISTENT_VOLUME_DIR= + ### target MongoDB collections (Uppercase) ## e.g. ## TARGET_MONGODB_COLLECTION___=__ diff --git a/docs/gcp/gke/.env.template b/docs/gcp/gke/.env.template index 6b66862..7a9a219 100644 --- a/docs/gcp/gke/.env.template +++ b/docs/gcp/gke/.env.template @@ -35,6 +35,9 @@ KUBERNETES_SECRET_NAME= ################################## ## Helm variables ################################## +## specify directory that saved resume token in +PERSISTENT_VOLUME_DIR= + ## target MongoDB collections (Uppercase and kebab-case) ## e.g. ## TARGET_MONGODB_COLLECTION___=__ diff --git a/docs/gcp/gke/Makefile b/docs/gcp/gke/Makefile index 715be4b..bcb4827 100644 --- a/docs/gcp/gke/Makefile +++ b/docs/gcp/gke/Makefile @@ -86,6 +86,9 @@ attach-role-to-service-account: gcloud projects add-iam-policy-binding $(PROJECT_NAME) \ --member="serviceAccount:mxtransporter@$(PROJECT_NAME).iam.gserviceaccount.com" \ --role="roles/logging.admin" + gcloud projects add-iam-policy-binding $(PROJECT_NAME) \ + --member="serviceAccount:change-streams-exporter@$(PROJECT_NAME).iam.gserviceaccount.com" \ + --role="roles/storage.admin" @echo "attach role to service accountin $(PROJECT_NAME_TO_EXPORT_CHANGE_STREAMS) ..." gcloud projects add-iam-policy-binding $(PROJECT_NAME_TO_EXPORT_CHANGE_STREAMS) \ From f1d96ddaa79b66c8b785606eae7681a7bb178230 Mon Sep 17 00:00:00 2001 From: KenFujimoto12 Date: Mon, 31 Jan 2022 16:03:21 +0900 Subject: [PATCH 3/3] fix --- docs/gcp/gke/.env.template | 1 + docs/gcp/gke/Makefile | 2 +- docs/gcp/gke/deployment-manager/gke.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/gcp/gke/.env.template b/docs/gcp/gke/.env.template index 7a9a219..2aa20a2 100644 --- a/docs/gcp/gke/.env.template +++ b/docs/gcp/gke/.env.template @@ -25,6 +25,7 @@ GKE_CLUSTER_VERSION= GKE_NODE_LOCATION_1= GKE_NODE_LOCATION_2= GKE_NODE_LOCATION_3= +GKE_NODE_MACHINE_TYPE= GKE_CLUSTER_MASTER_IP_CIDR_BLOCK= GKE_PODS_IP_CIDR_BLOCK= diff --git a/docs/gcp/gke/Makefile b/docs/gcp/gke/Makefile index bcb4827..ead9305 100644 --- a/docs/gcp/gke/Makefile +++ b/docs/gcp/gke/Makefile @@ -87,7 +87,7 @@ attach-role-to-service-account: --member="serviceAccount:mxtransporter@$(PROJECT_NAME).iam.gserviceaccount.com" \ --role="roles/logging.admin" gcloud projects add-iam-policy-binding $(PROJECT_NAME) \ - --member="serviceAccount:change-streams-exporter@$(PROJECT_NAME).iam.gserviceaccount.com" \ + --member="serviceAccount:mxtransporter@$(PROJECT_NAME).iam.gserviceaccount.com" \ --role="roles/storage.admin" @echo "attach role to service accountin $(PROJECT_NAME_TO_EXPORT_CHANGE_STREAMS) ..." diff --git a/docs/gcp/gke/deployment-manager/gke.sh b/docs/gcp/gke/deployment-manager/gke.sh index 3432c0c..11adee8 100644 --- a/docs/gcp/gke/deployment-manager/gke.sh +++ b/docs/gcp/gke/deployment-manager/gke.sh @@ -33,7 +33,7 @@ resources: autoUpgrade: False autoRepair: True config: - machineType: n1-standard-1 + machineType: $GKE_NODE_MACHINE_TYPE localSsdCount: 0 diskSizeGb: 100 preemptible: False