diff --git a/cloudbuild.yaml b/cloudbuild.yaml index ebc627e..4314931 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -26,7 +26,7 @@ steps: - set - image - deployment/groomeong-logstash - - logstash-sha256-1=asia.gcr.io/project-groomeong/logstash:1.1 + - logstash-sha256-1=asia.gcr.io/project-groomeong/logstash:1.2 env: - CLOUDSDK_COMPUTE_ZONE=asia-northeast3 - CLOUDSDK_CONTAINER_CLUSTER=autopilot-cluster-5 diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml index 8c6af5f..0b9c4ad 100644 --- a/docker-compose.prod.yaml +++ b/docker-compose.prod.yaml @@ -9,7 +9,7 @@ services: dockerfile: Dockerfile.prod logstash: - image: asia.gcr.io/project-groomeong/logstash:1.1 + image: asia.gcr.io/project-groomeong/logstash:1.2 platform: linux/x86_64 build: context: . diff --git a/elk/logstash/logstash.prod.conf b/elk/logstash/logstash.prod.conf index a3aaf82..84adb20 100644 --- a/elk/logstash/logstash.prod.conf +++ b/elk/logstash/logstash.prod.conf @@ -2,14 +2,14 @@ input { jdbc { jdbc_driver_library => "/usr/share/logstash/mysql-connector-java-8.0.28.jar" jdbc_driver_class => "com.mysql.cj.jdbc.Driver" - jdbc_connection_string => "jdbc:mysql://10.42.208.3:3306/groomeongprod" # jdbc:mysql://SQL인스턴스비공개IP주소:포트번호/db이름 + jdbc_connection_string => "jdbc:mysql://10.42.208.3:3306/prod" # jdbc:mysql://SQL인스턴스비공개IP주소:포트번호/db이름 jdbc_user => "root" jdbc_password => "root" schedule => "*/30 * * * *" use_column_value => true tracking_column => "updatedat" tracking_column_type => "numeric" - last_run_metadata_path => "./updatedat_auto.txt" + last_run_metadata_path => "./updatedat_auto2.txt" statement => "select *, unix_timestamp(updatedat) as updatedat from shop inner join shop_image on shop.id = shop_image.shopid where unix_timestamp(updatedat) > :sql_last_value or shop_image.isthumbnail = 1 order by updatedat asc" } } @@ -27,7 +27,7 @@ output { hosts => "https://search-groomeong-elasticsearch-7mvk7xnf5m2a6tcx6p5ro5qste.ap-southeast-2.es.amazonaws.com:443" user => "groomeong11" password => "QKQHwngus1!" - index => "auto_shop_1" + index => "auto_shop_2" document_id => "%{shopid}" manage_template => true template => "/usr/share/logstash/auto_template3.json" diff --git a/src/apis/shops/shops.resolver.ts b/src/apis/shops/shops.resolver.ts index 11f09a5..337e5db 100644 --- a/src/apis/shops/shops.resolver.ts +++ b/src/apis/shops/shops.resolver.ts @@ -29,7 +29,7 @@ export class ShopsResolver { searchKeyword: string, // ): Promise { const searchResult = await this.elasticsearchService.search({ - index: 'auto_shop_1', + index: 'auto_shop_2', body: { query: { multi_match: {