Skip to content
Snippets Groups Projects
Commit b607db3f authored by Zhibin Mai's avatar Zhibin Mai
Browse files

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/search-service

parents c53fb6d7 d14c8c41
Branches
Tags
1 merge request!657Correct the solution on how to exclude system/metadata indices in OSDU search
Pipeline #268207 failed
Stage: review
Stage: build
Stage: coverage
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Stage: publish
Hide whitespace changes
Inline Side-by-side
provider/search-gc/docs/gc/README.md
+ 18
− 16
View file @ b607db3f
......@@ -37,22 +37,24 @@ Must have:
Defined in default application property file but possible to override:
| name | value | description | sensitive? | source |
|------------------------------------|-----------------------------------------------------------------|---------------------------------------------------------------------------------------|------------|--------------------------------------------------------------|
| `LOG_PREFIX` | `service` | Logging prefix | no | - |
| `SERVER_SERVLET_CONTEXPATH` | `/api/search/v2/` | Servlet context path | no | - |
| `AUTHORIZE_API` | ex `https://entitlements.com/entitlements/v1` | Entitlements API endpoint | no | output of infrastructure deployment || `REDIS_SEARCH_HOST` | ex `records-changed` | Redis host for search | no | |
| `REDIS_SEARCH_PORT` | ex `6379` | Redis port for search | no | |
| `REDIS_SEARCH_PASSWORD` | ex `*****` | Redis search host password | yes | |
| `REDIS_SEARCH_WITH_SSL` | ex `true` or `false` | Redis search host ssl config | no | |
| `REDIS_SEARCH_EXPIRATION` | ex `30` | Redis search cache expiration in seconds | no | |
| `GOOGLE_APPLICATION_CREDENTIALS` | ex `/path/to/directory/service-key.json` | Service account credentials, you only need this if running locally | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
| `SECURITY_HTTPS_CERTIFICATE_TRUST` | ex `false` | Elastic client connection uses TrustSelfSignedStrategy(), if it is 'true' | false | output of infrastructure deployment |
| `PARTITION_API` | ex `http://localhost:8080/api/partition/v1` | Partition service endpoint | no | output of infrastructure deployment |
| `POLICY_API` | ex `http://localhost:8080/api/policy/v1/` | Policy service endpoint | no | output of infrastructure deployment |
| `POLICY_ID` | ex `search` | policyId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no | - |
| `SERVICE_POLICY_ENABLED` | ex `false` | Enable or Disable an integration with Policy Service | no | output of infrastructure deployment |
| `INDEXER_HOST` | ex `https://os-indexer-dot-opendes.appspot.com/api/indexer/v2/` | Indexer API endpoint | no | output of infrastructure deployment |
| name | value | description | sensitive? | source |
|-------------------------------------|-----------------------------------------------------------------|---------------------------------------------------------------------------------------|------------|--------------------------------------------------------------|
| `LOG_PREFIX` | `service` | Logging prefix | no | - |
| `SERVER_SERVLET_CONTEXPATH` | `/api/search/v2/` | Servlet context path | no | - |
| `AUTHORIZE_API` | ex `https://entitlements.com/entitlements/v1` | Entitlements API endpoint | no | output of infrastructure deployment || `REDIS_SEARCH_HOST` | ex `records-changed` | Redis host for search | no | |
| `REDIS_SEARCH_PORT` | ex `6379` | Redis port for search | no | |
| `REDIS_SEARCH_PASSWORD` | ex `*****` | Redis search host password | yes | |
| `REDIS_SEARCH_WITH_SSL` | ex `true` or `false` | Redis search host ssl config | no | |
| `REDIS_SEARCH_EXPIRATION` | ex `30` | Redis search cache expiration in seconds | no | |
| `GOOGLE_APPLICATION_CREDENTIALS` | ex `/path/to/directory/service-key.json` | Service account credentials, you only need this if running locally | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
| `SECURITY_HTTPS_CERTIFICATE_TRUST` | ex `false` | Elastic client connection uses TrustSelfSignedStrategy(), if it is 'true' | false | output of infrastructure deployment |
| `PARTITION_API` | ex `http://localhost:8080/api/partition/v1` | Partition service endpoint | no | output of infrastructure deployment |
| `POLICY_API` | ex `http://localhost:8080/api/policy/v1/` | Policy service endpoint | no | output of infrastructure deployment |
| `POLICY_ID` | ex `search` | policyId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no | - |
| `SERVICE_POLICY_ENABLED` | ex `false` | Enable or Disable an integration with Policy Service | no | output of infrastructure deployment |
| `INDEXER_HOST` | ex `https://os-indexer-dot-opendes.appspot.com/api/indexer/v2/` | Indexer API endpoint | no | output of infrastructure deployment |
| `MANAGEMENT_ENDPOINTS_WEB_BASE` | ex `/` | Web base for Actuator | no | - |
| `MANAGEMENT_SERVER_PORT` | ex `8081` | Port for Actuator | no | - |
These variables define service behavior, and are used to switch between `Reference` or `Google Cloud` environments, their overriding and usage in mixed mode was not tested.
Usage of spring profiles is preferred.
......
provider/search-gc/src/main/resources/application.properties
+ 3
− 1
View file @ b607db3f
......@@ -65,6 +65,8 @@ propertyResolver.strategy=partition
featureFlag.strategy=appProperty
featureFlag.autocomplete.enabled=false
# Health checks
management.server.port=${MANAGEMENT_SERVER_PORT:8081}
management.endpoints.web.base-path=${MANAGEMENT_ENDPOINTS_WEB_BASE:/}
management.endpoints.web.exposure.include=health, prometheus
management.health.probes.enabled=true
search-core-plus/docs/baremetal/README.md
+ 18
− 16
View file @ b607db3f
......@@ -36,22 +36,24 @@ Must have:
Defined in default application property file but possible to override:
| name | value | description | sensitive? | source |
|------------------------------------|-----------------------------------------------------------------|---------------------------------------------------------------------------------------|------------|--------------------------------------------------------------|
| `LOG_PREFIX` | `service` | Logging prefix | no | - |
| `SERVER_SERVLET_CONTEXPATH` | `/api/search/v2/` | Servlet context path | no | - |
| `AUTHORIZE_API` | ex `https://entitlements.com/entitlements/v1` | Entitlements API endpoint | no | output of infrastructure deployment |
| `REDIS_SEARCH_HOST` | ex `records-changed` | Redis host for search | no | |
| `REDIS_SEARCH_PORT` | ex `6379` | Redis port for search | no | |
| `REDIS_SEARCH_PASSWORD` | ex `127.0.0.1` | Redis search host password | yes | |
| `REDIS_SEARCH_WITH_SSL` | ex `true` or `false` | Redis search host ssl config | no | |
| `REDIS_SEARCH_EXPIRATION` | ex `30` | Redis search cache expiration in seconds | no | |
| `SECURITY_HTTPS_CERTIFICATE_TRUST` | ex `false` | Elastic client connection uses TrustSelfSignedStrategy(), if it is 'true' | false | output of infrastructure deployment |
| `PARTITION_API` | ex `http://localhost:8080/api/partition/v1` | Partition service endpoint | no | output of infrastructure deployment |
| `POLICY_API` | ex `http://localhost:8080/api/policy/v1/` | Policy service endpoint | no | output of infrastructure deployment |
| `POLICY_ID` | ex `search` | policyId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no | - |
| `SERVICE_POLICY_ENABLED` | ex `false` | Enable or Disable an integration with Policy Service | no | output of infrastructure deployment |
| `INDEXER_HOST` | ex `https://os-indexer-dot-opendes.appspot.com/api/indexer/v2/` | Indexer API endpoint | no | output of infrastructure deployment |
| name | value | description | sensitive? | source |
|------------------------------------|-----------------------------------------------------------------|---------------------------------------------------------------------------------------|------------|-------------------------------------|
| `LOG_PREFIX` | `service` | Logging prefix | no | - |
| `SERVER_SERVLET_CONTEXPATH` | `/api/search/v2/` | Servlet context path | no | - |
| `AUTHORIZE_API` | ex `https://entitlements.com/entitlements/v1` | Entitlements API endpoint | no | output of infrastructure deployment |
| `REDIS_SEARCH_HOST` | ex `records-changed` | Redis host for search | no | |
| `REDIS_SEARCH_PORT` | ex `6379` | Redis port for search | no | |
| `REDIS_SEARCH_PASSWORD` | ex `127.0.0.1` | Redis search host password | yes | |
| `REDIS_SEARCH_WITH_SSL` | ex `true` or `false` | Redis search host ssl config | no | |
| `REDIS_SEARCH_EXPIRATION` | ex `30` | Redis search cache expiration in seconds | no | |
| `SECURITY_HTTPS_CERTIFICATE_TRUST` | ex `false` | Elastic client connection uses TrustSelfSignedStrategy(), if it is 'true' | false | output of infrastructure deployment |
| `PARTITION_API` | ex `http://localhost:8080/api/partition/v1` | Partition service endpoint | no | output of infrastructure deployment |
| `POLICY_API` | ex `http://localhost:8080/api/policy/v1/` | Policy service endpoint | no | output of infrastructure deployment |
| `POLICY_ID` | ex `search` | policyId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no | - |
| `SERVICE_POLICY_ENABLED` | ex `false` | Enable or Disable an integration with Policy Service | no | output of infrastructure deployment |
| `INDEXER_HOST` | ex `https://os-indexer-dot-opendes.appspot.com/api/indexer/v2/` | Indexer API endpoint | no | output of infrastructure deployment |
| `MANAGEMENT_ENDPOINTS_WEB_BASE` | ex `/` | Web base for Actuator | no | - |
| `MANAGEMENT_SERVER_PORT` | ex `8081` | Port for Actuator | no | - |
These variables define service behavior, and are used to switch between `Reference` or `Google Cloud` environments, their overriding and usage in mixed mode was not tested.
Usage of spring profiles is preferred.
......
search-core-plus/src/main/resources/application.properties
+ 4
− 1
View file @ b607db3f
......@@ -83,5 +83,8 @@ partition-auth-enabled=false
featureFlag.strategy=appProperty
featureFlag.autocomplete.enabled=false
management.endpoints.web.exposure.include=health
# Health checks
management.server.port=${MANAGEMENT_SERVER_PORT:8081}
management.endpoints.web.base-path=${MANAGEMENT_ENDPOINTS_WEB_BASE:/}
management.endpoints.web.exposure.include=health, prometheus
management.health.probes.enabled=true
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment