Skip to content
Snippets Groups Projects
Commit 17296336 authored by Artem Dobrynin (EPAM)'s avatar Artem Dobrynin (EPAM)
Browse files

GONRG-744: Move search.Config out of os-core-common. Search, Indexer, Indexer-Queue [publish] 

https://jiraeu.epam.com/browse/GONRG-744

* Changed @Value usage to @ConfigurationProperties
* Added Indexer Config
* Updated os-core-common to the version without search config
parent a96ad9ae
No related branches found
No related tags found
1 merge request!54Move Search Config out of os-core-common (GONRG-744)
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 54 deletions
indexer-core/src/main/java/org/opengroup/osdu/indexer/config/IndexerConfigurationProperties.java
+ 0
− 1
View file @ 17296336
...@@ -9,7 +9,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; ...@@ -9,7 +9,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
@ConfigurationProperties(prefix = "indexer")
@Getter @Getter
@Setter @Setter
public class IndexerConfigurationProperties { public class IndexerConfigurationProperties {
......
provider/indexer-gcp/src/main/resources/application-dev.properties
+ 9
− 9
View file @ 17296336
indexer.google-cloud-project=opendes google-cloud-project=opendes
indexer.indexer-host=os-indexer-dot-opendes.appspot.com indexer-host=os-indexer-dot-opendes.appspot.com
STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com
indexer.storage-schema-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/schemas storage-schema-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/schemas
indexer.storage-query-record-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records storage-query-record-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records
indexer.storage-query-record-for-conversion-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records:batch storage-query-record-for-conversion-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records:batch
indexer.storage-records-batch-size=20 storage-records-batch-size=20
indexer.indexer-queue-host=https://os-indexer-queue-dot-opendes.appspot.com/_dps/task-handlers/enqueue indexer-queue-host=https://os-indexer-queue-dot-opendes.appspot.com/_dps/task-handlers/enqueue
AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1 AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1
LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1 LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1
...@@ -16,6 +16,6 @@ CRS_API=https://crs-converter-gae-dot-opendes.appspot.com/api/crs/v1 ...@@ -16,6 +16,6 @@ CRS_API=https://crs-converter-gae-dot-opendes.appspot.com/api/crs/v1
## use below values for gcp: opendes ## use below values for gcp: opendes
REDIS_GROUP_HOST=10.0.16.28 REDIS_GROUP_HOST=10.0.16.28
indexer.redis-search-host=10.0.16.20 redis-search-host=10.0.16.20
indexer.google-audiences=245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com google-audiences=245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com
\ No newline at end of file \ No newline at end of file
provider/indexer-gcp/src/main/resources/application-kuber.properties
+ 10
− 10
View file @ 17296336
indexer.google-cloud-project=${GOOGLE_CLOUD_PROJECT} google-cloud-project=${GOOGLE_CLOUD_PROJECT}
indexer.indexer-host=os-indexer-service indexer-host=os-indexer-service
STORAGE_HOSTNAME=os-storage-service STORAGE_HOSTNAME=os-storage-service
indexer.storage-schema-host=http://os-storage-service/api/storage/v2/schemas storage-schema-host=http://os-storage-service/api/storage/v2/schemas
indexer.storage-query-record-host=http://os-storage-service/api/storage/v2/query/records storage-query-record-host=http://os-storage-service/api/storage/v2/query/records
indexer.storage-query-record-for-conversion-host=http://os-storage-service/api/storage/v2/query/records:batch storage-query-record-for-conversion-host=http://os-storage-service/api/storage/v2/query/records:batch
indexer.storage-records-batch-size=20 storage-records-batch-size=20
indexer.indexer-queue-host=http://os-storage-service/_dps/task-handlers/enqueue indexer-queue-host=http://os-storage-service/_dps/task-handlers/enqueue
AUTHORIZE_API=http://os-entitlement-service/entitlements/v1 AUTHORIZE_API=http://os-entitlement-service/entitlements/v1
LEGALTAG_API=http://os-legal-service/api/legal/v1 LEGALTAG_API=http://os-legal-service/api/legal/v1
...@@ -16,9 +16,9 @@ CRS_API=${CRS_API} ...@@ -16,9 +16,9 @@ CRS_API=${CRS_API}
## use below values for gcp: opendes ## use below values for gcp: opendes
REDIS_GROUP_HOST=${REDIS_GROUP_HOST} REDIS_GROUP_HOST=${REDIS_GROUP_HOST}
indexer.redis-search-host=${REDIS_SEARCH_HOST} redis-search-host=${REDIS_SEARCH_HOST}
indexer.google-audiences=${GOOGLE_AUDIENCES} google-audiences=${GOOGLE_AUDIENCES}
indexer.deployment-environment=cloud deployment-environment=cloud
disable.appengine.log.factory=true disable.appengine.log.factory=true
\ No newline at end of file
provider/indexer-gcp/src/main/resources/application-local.properties
+ 9
− 9
View file @ 17296336
indexer.google-cloud-project=osdu google-cloud-project=osdu
indexer.indexer-host=os-indexer-dot-opendes.appspot.com indexer-host=os-indexer-dot-opendes.appspot.com
STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com STORAGE_HOSTNAME=os-storage-dot-opendes.appspot.com
indexer.storage-schema-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/schemas storage-schema-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/schemas
indexer.storage-query-record-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records storage-query-record-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records
indexer.storage-query-record-for-conversion-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records:batch storage-query-record-for-conversion-host=https://os-storage-dot-opendes.appspot.com/api/storage/v2/query/records:batch
indexer.storage-records-batch-size=20 storage-records-batch-size=20
indexer.indexer-queue-host=https://os-indexer-queue-dot-opendes.appspot.com/_dps/task-handlers/enqueue indexer-queue-host=https://os-indexer-queue-dot-opendes.appspot.com/_dps/task-handlers/enqueue
AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1 AUTHORIZE_API=https://entitlements-dot-opendes.appspot.com/entitlements/v1
LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1 LEGALTAG_API=https://os-legal-dot-opendes.appspot.com/api/legal/v1
...@@ -16,6 +16,6 @@ CRS_API=https://crs-converter-gae-dot-opendes.appspot.com/api/crs/v1 ...@@ -16,6 +16,6 @@ CRS_API=https://crs-converter-gae-dot-opendes.appspot.com/api/crs/v1
## use below values for gcp: opendes ## use below values for gcp: opendes
REDIS_GROUP_HOST=127.0.0.1 REDIS_GROUP_HOST=127.0.0.1
indexer.redis-search-host=127.0.0.1 redis-search-host=127.0.0.1
indexer.google-audiences=245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com google-audiences=245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com
provider/indexer-gcp/src/main/resources/application-testing.properties
+ 9
− 9
View file @ 17296336
indexer.google-cloud-project=opendes-evt google-cloud-project=opendes-evt
indexer.indexer-host=os-indexer-dot-opendes-evt.appspot.com indexer-host=os-indexer-dot-opendes-evt.appspot.com
STORAGE_HOSTNAME=os-storage-dot-opendes-evt.appspot.com STORAGE_HOSTNAME=os-storage-dot-opendes-evt.appspot.com
indexer.storage-schema-host=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/schemas storage-schema-host=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/schemas
indexer.storage-query-record-host=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/query/records storage-query-record-host=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/query/records
indexer.storage-query-record-for-conversion-host=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/query/records:batch storage-query-record-for-conversion-host=https://os-storage-dot-opendes-evt.appspot.com/api/storage/v2/query/records:batch
indexer.storage-records-batch-size=20 storage-records-batch-size=20
indexer.indexer-queue-host=https://os-indexer-queue-dot-opendes-evt.appspot.com/_dps/task-handlers/enqueue indexer-queue-host=https://os-indexer-queue-dot-opendes-evt.appspot.com/_dps/task-handlers/enqueue
AUTHORIZE_API=https://entitlements-dot-opendes-evt.appspot.com/entitlements/v1 AUTHORIZE_API=https://entitlements-dot-opendes-evt.appspot.com/entitlements/v1
LEGALTAG_API=https://os-legal-dot-opendes-evt.appspot.com/api/legal/v1 LEGALTAG_API=https://os-legal-dot-opendes-evt.appspot.com/api/legal/v1
...@@ -16,6 +16,6 @@ CRS_API=https://crs-converter-gae-dot-opendes-evt.appspot.com/api/crs/v1 ...@@ -16,6 +16,6 @@ CRS_API=https://crs-converter-gae-dot-opendes-evt.appspot.com/api/crs/v1
## use below values for gcp: opendes ## use below values for gcp: opendes
REDIS_GROUP_HOST=10.253.209.196 REDIS_GROUP_HOST=10.253.209.196
indexer.redis-search-host=10.118.2.140 redis-search-host=10.118.2.140
indexer.google-audiences=833591776864-oobhqvmtdg9rpreubjvn44m5f8revglk.apps.googleusercontent.com google-audiences=833591776864-oobhqvmtdg9rpreubjvn44m5f8revglk.apps.googleusercontent.com
\ No newline at end of file \ No newline at end of file
provider/indexer-gcp/src/main/resources/application.properties
+ 16
− 16
View file @ 17296336
...@@ -6,33 +6,33 @@ server.port=8080 ...@@ -6,33 +6,33 @@ server.port=8080
JAVA_OPTS=-Xms3072m -Xmx3072m JAVA_OPTS=-Xms3072m -Xmx3072m
JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45 JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45
indexer.deployment-environment=CLOUD deployment-environment=CLOUD
REDIS_GROUP_PORT=6379 REDIS_GROUP_PORT=6379
DEFAULT_DATA_COUNTRY=US DEFAULT_DATA_COUNTRY=US
indexer.redis-search-port=6379 redis-search-port=6379
#Default Cache Settings #Default Cache Settings
indexer.schema-cache-expiration=60 schema-cache-expiration=60
indexer.index-cache-expiration=60 index-cache-expiration=60
indexer.elastic-cache-expiration=1440 elastic-cache-expiration=1440
indexer.cursor-cache-expiration=60 cursor-cache-expiration=60
# Kinds Cache expiration 2*24*60 # Kinds Cache expiration 2*24*60
indexer.kinds-cache-expiration=2880 kinds-cache-expiration=2880
# Attributes Cache expiration 2*24*60 # Attributes Cache expiration 2*24*60
indexer.attributes-cache-expiration=2880 attributes-cache-expiration=2880
indexer.kinds-redis-database=1 kinds-redis-database=1
indexer.cron-index-cleanup-threshold-days=3 cron-index-cleanup-threshold-days=3
indexer.cron-empty-index-cleanup-threshold-days=7 cron-empty-index-cleanup-threshold-days=7
indexer.gae-service=indexer gae-service=indexer
indexer.key-ring=csqp key-ring=csqp
indexer.kms-key=searchService kms-key=searchService
indexer.elastic-datastore-kind=SearchSettings elastic-datastore-kind=SearchSettings
indexer.elastic-datastore-id=indexer-service elastic-datastore-id=indexer-service
security.https.certificate.trust=false security.https.certificate.trust=false
indexer.que.service.mail=default@iam.gserviceaccount.com indexer.que.service.mail=default@iam.gserviceaccount.com
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment