Skip to content

Commit

Permalink
fix: fixed failed services
Browse files Browse the repository at this point in the history
  • Loading branch information
yevhen-cap committed Sep 10, 2024
1 parent 8169aef commit 5b48adf
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 24 deletions.
20 changes: 16 additions & 4 deletions .env.elasticsearch
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
# ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_CLASSNAME=io.camunda.zeebe.exporter.ElasticsearchExporter
# ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_URL=http://elasticsearch:9200
# CAMUNDA_OPERATE_ELASTICSEARCH_URL=http://elasticsearch:9200
# CAMUNDA_OPERATE_ZEEBEELASTICSEARCH_URL=http://elasticsearch:9200
# OPTIMIZE_ELASTICSEARCH_HOST=elasticsearch
# OPTIMIZE_ELASTICSEARCH_HTTP_PORT=9200
# CAMUNDA_TASKLIST_ELASTICSEARCH_URL=http://elasticsearch:9200
# CAMUNDA_TASKLIST_ZEEBEELASTICSEARCH_URL=http://elasticsearch:9200
# ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_BULK_SIZE=1


OPTIMIZE_ELASTICSEARCH_HOST=elasticsearch
OPTIMIZE_ELASTICSEARCH_HTTP_PORT=9200
ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_CLASSNAME=io.camunda.zeebe.exporter.ElasticsearchExporter
ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_URL=http://elasticsearch:9200
# default is 1000, see here: https://github.com/camunda/zeebe/blob/main/exporters/elasticsearch-exporter/src/main/java/io/camunda/zeebe/exporter/ElasticsearchExporterConfiguration.java#L259
ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_BULK_SIZE=1
CAMUNDA_OPERATE_ELASTICSEARCH_URL=http://elasticsearch:9200
CAMUNDA_OPERATE_ZEEBEELASTICSEARCH_URL=http://elasticsearch:9200
OPTIMIZE_ELASTICSEARCH_HOST=elasticsearch
OPTIMIZE_ELASTICSEARCH_HTTP_PORT=9200
CAMUNDA_TASKLIST_ELASTICSEARCH_URL=http://elasticsearch:9200
CAMUNDA_TASKLIST_ZEEBEELASTICSEARCH_URL=http://elasticsearch:9200
ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_BULK_SIZE=1
CAMUNDA_TASKLIST_ZEEBEELASTICSEARCH_URL=http://elasticsearch:9200
39 changes: 31 additions & 8 deletions .env.opensearch
Original file line number Diff line number Diff line change
@@ -1,16 +1,39 @@
# CAMUNDA_OPERATE_DATABASE=opensearch
# CAMUNDA_OPERATE_OPENSEARCH_URL=http://opensearch:9200
# CAMUNDA_OPERATE_ZEEBEOPENSEARCH_URL=http://opensearch:9200
# CAMUNDA_TASKLIST_OPENSEARCH_URL=http://opensearch:9200
# CAMUNDA_TASKLIST_ZEEBEEOPENSEARCH_URL=http://opensearch:9200
# camunda.tasklist.database=opensearch
# camunda.tasklist.opensearch.url=http://opensearch:9200
# camunda.tasklist.zeebeOpensearch.url=http://opensearch:9200
# ZEEBE_BROKER_EXPORTERS_OPENSEARCH_CLASSNAME=io.camunda.zeebe.exporter.opensearch.OpensearchExporter
# ZEEBE_BROKER_EXPORTERS_OPENSEARCH_ARGS_INDEX_DEPLOYMENT=false
# ZEEBE_BROKER_EXPORTERS_OPENSEARCH_CLASSNAME=io.camunda.zeebe.exporter.opensearch.OpensearchExporter
# ZEEBE_BROKER_EXPORTERS_OPENSEARCH_ARGS_URL=http://opensearch:9200
# ZEEBE_BROKER_EXPORTERS_OPENSEARCH_ARGS_BULK_SIZE=1
# CAMUNDA_OPTIMIZE_DATABASE=opensearch
# CAMUNDA_OPTIMIZE_OPENSEARCH_HOST=opensearch
# CAMUNDA_OPTIMIZE_OPENSEARCH_HTTP_PORT=9200

# Optimize
CAMUNDA_OPTIMIZE_OPENSEARCH_HOST=opensearch
CAMUNDA_OPTIMIZE_OPENSEARCH_HTTP_PORT=9200
CAMUNDA_OPTIMIZE_DATABASE=opensearch

# Zeebe
ZEEBE_BROKER_EXPORTERS_OPENSEARCH_CLASSNAME=io.camunda.zeebe.exporter.opensearch.OpensearchExporter
ZEEBE_BROKER_EXPORTERS_OPENSEARCH_ARGS_URL=http://opensearch:9200
ZEEBE_BROKER_EXPORTERS_OPENSEARCH_ARGS_BULK_SIZE=1

# Operate
CAMUNDA_OPERATE_DATABASE=opensearch
CAMUNDA_OPERATE_OPENSEARCH_URL=http://opensearch:9200
CAMUNDA_OPERATE_ZEEBEOPENSEARCH_URL=http://opensearch:9200

# Tasklist
CAMUNDA_TASKLIST_OPENSEARCH_URL=http://opensearch:9200
CAMUNDA_TASKLIST_ZEEBEEOPENSEARCH_URL=http://opensearch:9200
# CAMUNDA_TASKLIST_DATABASE=opensearch
camunda.tasklist.database=opensearch
camunda.tasklist.opensearch.url=http://opensearch:9200
camunda.tasklist.zeebeOpensearch.url=http://opensearch:9200
ZEEBE_BROKER_EXPORTERS_OPENSEARCH_CLASSNAME=io.camunda.zeebe.exporter.opensearch.OpensearchExporter
ZEEBE_BROKER_EXPORTERS_OPENSEARCH_ARGS_INDEX_DEPLOYMENT=false
ZEEBE_BROKER_EXPORTERS_OPENSEARCH_CLASSNAME=io.camunda.zeebe.exporter.opensearch.OpensearchExporter
ZEEBE_BROKER_EXPORTERS_OPENSEARCH_ARGS_URL=http://opensearch:9200
ZEEBE_BROKER_EXPORTERS_OPENSEARCH_ARGS_BULK_SIZE=1
CAMUNDA_OPTIMIZE_DATABASE=opensearch
CAMUNDA_OPTIMIZE_OPENSEARCH_HOST=opensearch
CAMUNDA_OPTIMIZE_OPENSEARCH_HTTP_PORT=9200
7 changes: 4 additions & 3 deletions .github/workflows/template-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
required: false
type: string
search_db:
description: runs playwright tests
description: elasticsearch or opensearch
required: false
default: elasticsearch
type: string
Expand All @@ -40,8 +40,9 @@ jobs:
- uses: actions/checkout@v4
- name: change search db
run: >-
sed -i 's/SEARCH_DB=elasticsearch/SEARCH_DB=opensearch/g' .env
if: ${{ contains(inputs.search_db, 'opensearch') }}
run: |
sudo sed -i 's/SEARCH_DB=elasticsearch/SEARCH_DB=opensearch/g' .env
- name: Login to private registry
if: ${{ inputs.directory != 'docker-compose/camunda-8.6' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-core-opensearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
uses: ./.github/workflows/template-deploy.yaml
secrets: inherit
with:
compose_args: "-f docker-compose-core.opensearch.yaml --profile opensearch"
compose_args: "-f docker-compose-core.yaml --profile opensearch"
run_e2e_tests: false
search_db: opensearch
search_db: opensearch
2 changes: 1 addition & 1 deletion .github/workflows/test-default.opensearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
with:
compose_args: "-f docker-compose.yaml --profile opensearch"
run_e2e_tests: false
search_db: opensearch
search_db: opensearch
2 changes: 1 addition & 1 deletion .github/workflows/test-modeler.opensearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
with:
compose_args: "-f docker-compose.yaml -f docker-compose-web-modeler.yaml --profile opensearch"
run_e2e_tests: true
search_db: opensearch
search_db: opensearch
1 change: 0 additions & 1 deletion docker-compose-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ services:
network.bind_host: 0.0.0.0
node.name: opensearch
plugins.security.disabled: true
plugins.security.audit.config.index: myauditlogindex
discovery.type: single-node
discovery.seed_hosts: opensearch
bootstrap.memory_lock: true
Expand Down
19 changes: 15 additions & 4 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ services:
- ZEEBE_BROKER_GATEWAY_SECURITY_AUTHENTICATION_IDENTITY_AUDIENCE=zeebe-api
- ZEEBE_BROKER_GATEWAY_SECURITY_AUTHENTICATION_IDENTITY_BASEURL=http://identity:8084
- ZEEBE_BROKER_GATEWAY_MULTITENANCY_ENABLED=${MULTI_TENANCY_ENABLED}
# default is 1000, see here: https://github.com/camunda/zeebe/blob/main/exporters/elasticsearch-exporter/src/main/java/io/camunda/zeebe/exporter/ElasticsearchExporterConfiguration.java#L259
# - ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_CLASSNAME=io.camunda.zeebe.exporter.ElasticsearchExporter
# - ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_URL=http://elasticsearch:9200
# # default is 1000, see here: https://github.com/camunda/zeebe/blob/main/exporters/elasticsearch-exporter/src/main/java/io/camunda/zeebe/exporter/ElasticsearchExporterConfiguration.java#L259
# - ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_BULK_SIZE=1
# allow running with low disk space
- ZEEBE_BROKER_DATA_DISKUSAGECOMMANDWATERMARK=0.998
- ZEEBE_BROKER_DATA_DISKUSAGEREPLICATIONWATERMARK=0.999
Expand All @@ -50,8 +53,8 @@ services:
networks:
- camunda-platform
depends_on:
- identity
- ${SEARCH_DB}
- identity

operate: # https://docs.camunda.io/docs/self-managed/platform-deployment/docker/#operate
image: camunda/operate:${CAMUNDA_OPERATE_VERSION}
Expand All @@ -66,7 +69,9 @@ services:
- ZEEBE_CLIENT_ID=${ZEEBE_CLIENT_ID}
- ZEEBE_CLIENT_SECRET=${ZEEBE_CLIENT_SECRET}
- ZEEBE_TOKEN_AUDIENCE=zeebe-api
- ZEEBE_AUTHORIZATION_SERVER_URL=http://keycloak:8080/auth/realms/camunda-platform/protocol/openid-connect/token
- ZEEBE_AUTHORIZATION_SERVER_URL=http://keycloak:18080/auth/realms/camunda-platform/protocol/openid-connect/token
# - CAMUNDA_OPERATE_ELASTICSEARCH_URL=http://elasticsearch:9200
# - CAMUNDA_OPERATE_ZEEBEELASTICSEARCH_URL=http://elasticsearch:9200
# For more information regarding configuration with Identity see:
# https://docs.camunda.io/docs/self-managed/operate-deployment/authentication/#identity
- SPRING_PROFILES_ACTIVE=identity-auth
Expand Down Expand Up @@ -113,7 +118,9 @@ services:
- ZEEBE_CLIENT_SECRET=${ZEEBE_CLIENT_SECRET}
- ZEEBE_CLIENT_CONFIG_PATH=/tmp/zeebe_auth_cache
- ZEEBE_TOKEN_AUDIENCE=zeebe-api
- ZEEBE_AUTHORIZATION_SERVER_URL=http://keycloak:8080/auth/realms/camunda-platform/protocol/openid-connect/token
- ZEEBE_AUTHORIZATION_SERVER_URL=http://keycloak:18080/auth/realms/camunda-platform/protocol/openid-connect/token
# - CAMUNDA_TASKLIST_ELASTICSEARCH_URL=http://elasticsearch:9200
# - CAMUNDA_TASKLIST_ZEEBEELASTICSEARCH_URL=http://elasticsearch:9200
# For more information regarding configuration with Identity see:
# https://docs.camunda.io/docs/self-managed/tasklist-deployment/authentication/#identity
- SPRING_PROFILES_ACTIVE=identity-auth
Expand Down Expand Up @@ -142,6 +149,8 @@ services:
depends_on:
zeebe:
condition: service_started
# elasticsearch:
# condition: service_healthy
identity:
condition: service_healthy

Expand Down Expand Up @@ -192,6 +201,8 @@ services:
- .env.${SEARCH_DB}
environment: # https://docs.camunda.io/docs/self-managed/optimize-deployment/setup/installation/#available-environment-variables
- SPRING_PROFILES_ACTIVE=ccsm
# - CAMUNDA_OPTIMIZE_OPENSEARCH_HOST=opensearch
# - CAMUNDA_OPTIMIZE_OPENSEARCH_HTTP_PORT=9200
- CAMUNDA_OPTIMIZE_ZEEBE_ENABLED=true
- CAMUNDA_OPTIMIZE_ENTERPRISE=false
- CAMUNDA_OPTIMIZE_IDENTITY_ISSUER_URL=http://${KEYCLOAK_HOST}:18080/auth/realms/camunda-platform
Expand Down

0 comments on commit 5b48adf

Please sign in to comment.