Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker for default admin creds update #114

Merged
merged 5 commits into from
Feb 6, 2024
Merged

Update docker for default admin creds update #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f2e618
Update docker for default admin creds update
derek-ho Dec 29, 2023
41532a3
Add env variable
derek-ho Jan 18, 2024
31fe560
Add helpful comment
derek-ho Jan 18, 2024
405586b
use env variable
derek-ho Jan 18, 2024
a65db4c
Merge branch 'main' into admin
derek-ho Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}

# OpenSearch versionins
OPENSEARCH_VERSION=2.11.1
OPENSEARCH_ADMIN_PASSWORD=admin # After 2.12.0 release, this needs to be changed to the value passed in as OPENSEARCH_INITIAL_ADMIN_PASSWORD

# OpenSearch Node1
OPENSEARCH_PORT=9200
Expand Down
5 changes: 4 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
environment:
- CURRENCY_SERVICE_PORT
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME

Check warning on line 185 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

185:91 [comments] too few spaces before comment
depends_on:
otelcol:
condition: service_started
Expand Down Expand Up @@ -233,8 +233,8 @@
memory: 175M
restart: unless-stopped
ports:
- "${FEATURE_FLAG_SERVICE_PORT}:${FEATURE_FLAG_SERVICE_PORT}" # Feature Flag Service UI

Check warning on line 236 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

236:69 [comments] too few spaces before comment
- "${FEATURE_FLAG_GRPC_SERVICE_PORT}" # Feature Flag Service gRPC API

Check warning on line 237 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

237:45 [comments] too few spaces before comment
environment:
- FEATURE_FLAG_SERVICE_PORT
- FEATURE_FLAG_GRPC_SERVICE_PORT
Expand Down Expand Up @@ -653,8 +653,8 @@
memory: 300M
restart: unless-stopped
ports:
- "${JAEGER_SERVICE_PORT}" # Jaeger UI

Check warning on line 656 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

656:34 [comments] too few spaces before comment
- "4317" # OTLP gRPC default port

Check warning on line 657 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

657:16 [comments] too few spaces before comment
- "14269:14269"
- "14268:14268"
- "14267:14267"
Expand All @@ -666,7 +666,7 @@
- SPAN_STORAGE_TYPE=opensearch
- ES_TAGS_AS_FIELDS_ALL=true
- ES_USERNAME=admin
- ES_PASSWORD=admin
- ES_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD}
- ES_TLS_SKIP_HOST_VERIFY=true
logging: *logging
depends_on:
Expand Down Expand Up @@ -730,11 +730,11 @@
- ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml
- ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml
ports:
- "4317" # OTLP over gRPC receiver

Check warning on line 733 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

733:16 [comments] too few spaces before comment
- "4318:4318" # OTLP over HTTP receiver

Check warning on line 734 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

734:21 [comments] too few spaces before comment
- "13133:13133" # health check port

Check warning on line 735 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

735:23 [comments] too few spaces before comment
- "9464" # Prometheus exporter

Check warning on line 736 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

736:16 [comments] too few spaces before comment
- "8888" # metrics endpoint

Check warning on line 737 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

737:16 [comments] too few spaces before comment
depends_on:
- jaeger-agent
- data-prepper
Expand Down Expand Up @@ -770,6 +770,7 @@
networks:
- opensearch-otel-demo


opensearch-node1:
image: opensearchproject/opensearch:latest
container_name: opensearch-node1
Expand All @@ -780,6 +781,7 @@
- cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2
- bootstrap.memory_lock=true # along with the memlock settings below, disables swapping
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
- "OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD}"
ulimits:
memlock:
soft: -1
Expand All @@ -794,7 +796,7 @@
- 9600:9600 # required for Performance Analyzer
networks:
- opensearch-otel-demo

Check failure on line 799 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

799:1 [trailing-spaces] trailing spaces
opensearch-node2:
image: opensearchproject/opensearch:latest
container_name: opensearch-node2
Expand All @@ -805,6 +807,7 @@
- cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2
- bootstrap.memory_lock=true
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
- "OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_ADMIN_PASSWORD}"
ulimits:
memlock:
soft: -1
Expand All @@ -826,7 +829,7 @@
- "5601"
environment:
OPENSEARCH_HOSTS: '["https://opensearch-node1:9200","https://opensearch-node2:9200"]'
depends_on:

Check failure on line 832 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

832:16 [trailing-spaces] trailing spaces
- opensearch-node1
- opensearch-node2
networks:
Expand Down
Loading