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

Jump to bottom

ACS-8989 Update audit storage and elasticsearch connector versions #1245

Merged
merged 3 commits into from
Nov 11, 2024
Merged

ACS-8989 Update audit storage and elasticsearch connector versions #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcfe602
Update alfresco-audit-storage in compose.yaml to 1.0.0-A1
SaraAspery Nov 8, 2024
8f59c5e
Add alfresco-audit-storage and kibana to pre-release-compose.yaml
SaraAspery Nov 8, 2024
778c83b
Update alfresco-elasticsearch-connector in pre-release-compose.yaml t…
SaraAspery Nov 8, 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
2 changes: 1 addition & 1 deletion docker-compose/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ services:
retries: 5
start_period: 5s
audit-storage:
image: quay.io/alfresco/alfresco-audit-storage:0.0.1-A8
image: quay.io/alfresco/alfresco-audit-storage:1.0.0-A1
mem_limit: 512m
environment:
SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000
Expand Down
40 changes: 38 additions & 2 deletions docker-compose/pre-release-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,24 @@ services:
timeout: 10s
retries: 5
start_period: 30s
kibana:
image: kibana:7.17.3
mem_limit: 1g
environment:
- ELASTICSEARCH_HOSTS=http://elasticsearch:9200
ports:
- "5601:5601"
depends_on:
elasticsearch:
condition: service_healthy
healthcheck:
test: [ "CMD", "curl", "-f", "-o", "/dev/null", "http://localhost:5601/status" ]
interval: 10s
timeout: 2s
retries: 5
start_period: 30s
search:
image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.2.0-A4
image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.2.0-A5
mem_limit: 1g
environment:
ALFRESCO_ACCEPTED_CONTENT_MEDIA_TYPES_CACHE_BASE_URL: >-
Expand All @@ -227,7 +243,7 @@ services:
shared-file-store:
condition: service_healthy
search-reindexing:
image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.2.0-A4
image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.2.0-A5
mem_limit: 1g
restart: on-failure:5
environment:
Expand Down Expand Up @@ -283,6 +299,26 @@ services:
- "traefik.http.middlewares.adwroot.stripprefix.prefixes=/workspace"
- "traefik.http.middlewares.adwchain.chain.middlewares=adwforceslash,adwroot"
- "traefik.http.routers.adw.middlewares=adwchain@docker"
audit-storage:
image: quay.io/alfresco/alfresco-audit-storage:1.0.0-A1
mem_limit: 512m
environment:
SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000
AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_URI: http://elasticsearch:9200
AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_USERNAME: admin
AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_PASSWORD: admin
AUDIT_EVENTINGESTION_URI: activemq:topic:alfresco.repo.event2
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost:8081/actuator/health/readiness" ]
interval: 60s
timeout: 2s
retries: 3
start_period: 15s
depends_on:
activemq:
condition: service_healthy
elasticsearch:
condition: service_healthy
control-center:
image: quay.io/alfresco/alfresco-control-center:9.1.0-11106981658
mem_limit: 128m
Expand Down