From 493a0a7d76ac5dce70aa3955b4e62d6e6e82f581 Mon Sep 17 00:00:00 2001 From: Damian Ujma Date: Tue, 1 Oct 2024 17:20:03 +0200 Subject: [PATCH 1/6] ACS-8856 Add audit storage to docker compose --- docker-compose/docker-compose.yml | 40 +++++++++++++++++++ .../solr6-override-docker-compose.yml | 1 + 2 files changed, 41 insertions(+) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 7c11b46bc..d791b4da7 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -43,6 +43,7 @@ services: -Dshare.port=8080 -Dalfresco.host=localhost -Dalfresco.port=8080 + -Drepo.event2.topic.endpoint=amqp:topic:VirtualTopic.alfresco.repo.event2 -Dcsrf.filter.enabled=false -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url="failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true" @@ -165,6 +166,34 @@ services: ports: - 9200:9200 - 9300:9300 + elasticsearch-audit-storage: + image: elasticsearch:7.17.3 + mem_limit: 1700m + environment: + - xpack.security.enabled=false + - discovery.type=single-node + - node.name=es01 + - cluster.name=elastic + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 65536 + hard: 65536 + cap_add: + - IPC_LOCK + ports: + - 9400:9200 + - 9500:9300 + kibana: + image: kibana:7.17.3 + environment: + - ELASTICSEARCH_HOSTS=http://elasticsearch-audit-storage:9200 + ports: + - 5601:5601 + depends_on: + - elasticsearch-audit-storage search: image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.1.0 mem_limit: 1g @@ -207,6 +236,17 @@ services: - "5672:5672" # AMQP - "61616:61616" # OpenWire - "61613:61613" # STOMP + audit-storage: + image: alfresco/alfresco-audit-storage:latest + mem_limit: 1g + environment: + SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000 + AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_URI: http://elasticsearch-audit-storage:9200 + AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_USERNAME: admin + AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_PASSWORD: admin + depends_on: + - activemq + - elasticsearch-audit-storage digital-workspace: image: quay.io/alfresco/alfresco-digital-workspace:5.1.0 mem_limit: 128m diff --git a/docker-compose/solr6-override-docker-compose.yml b/docker-compose/solr6-override-docker-compose.yml index 551da6a70..dd1bd28b2 100644 --- a/docker-compose/solr6-override-docker-compose.yml +++ b/docker-compose/solr6-override-docker-compose.yml @@ -19,6 +19,7 @@ services: -Dshare.port=8080 -Dalfresco.host=localhost -Dalfresco.port=8080 + -Drepo.event2.topic.endpoint=amqp:topic:VirtualTopic.alfresco.repo.event2 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url="failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true" -Ddeployment.method=DOCKER_COMPOSE From 00e8844d1dd9710f7a74743b34892118564f6e67 Mon Sep 17 00:00:00 2001 From: Damian Ujma Date: Wed, 2 Oct 2024 17:12:52 +0200 Subject: [PATCH 2/6] ACS-8856 Add audit storage to docker compose --- docker-compose/docker-compose.yml | 34 ++++--------------- .../solr6-override-docker-compose.yml | 4 --- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index d791b4da7..4280165fb 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -43,7 +43,6 @@ services: -Dshare.port=8080 -Dalfresco.host=localhost -Dalfresco.port=8080 - -Drepo.event2.topic.endpoint=amqp:topic:VirtualTopic.alfresco.repo.event2 -Dcsrf.filter.enabled=false -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url="failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true" @@ -150,7 +149,7 @@ services: ports: - "5432:5432" elasticsearch: - image: elasticsearch:7.10.1 + image: elasticsearch:7.17.3 environment: - xpack.security.enabled=false - discovery.type=single-node @@ -166,34 +165,14 @@ services: ports: - 9200:9200 - 9300:9300 - elasticsearch-audit-storage: - image: elasticsearch:7.17.3 - mem_limit: 1700m - environment: - - xpack.security.enabled=false - - discovery.type=single-node - - node.name=es01 - - cluster.name=elastic - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - cap_add: - - IPC_LOCK - ports: - - 9400:9200 - - 9500:9300 kibana: image: kibana:7.17.3 environment: - - ELASTICSEARCH_HOSTS=http://elasticsearch-audit-storage:9200 + - ELASTICSEARCH_HOSTS=http://elasticsearch:9200 ports: - 5601:5601 depends_on: - - elasticsearch-audit-storage + - elasticsearch search: image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.1.0 mem_limit: 1g @@ -237,16 +216,17 @@ services: - "61616:61616" # OpenWire - "61613:61613" # STOMP audit-storage: - image: alfresco/alfresco-audit-storage:latest + image: quay.io/alfresco/alfresco-audit-storage:0.0.1-A7 mem_limit: 1g environment: SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000 - AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_URI: http://elasticsearch-audit-storage:9200 + 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 depends_on: - activemq - - elasticsearch-audit-storage + - elasticsearch digital-workspace: image: quay.io/alfresco/alfresco-digital-workspace:5.1.0 mem_limit: 128m diff --git a/docker-compose/solr6-override-docker-compose.yml b/docker-compose/solr6-override-docker-compose.yml index dd1bd28b2..5deeab20d 100644 --- a/docker-compose/solr6-override-docker-compose.yml +++ b/docker-compose/solr6-override-docker-compose.yml @@ -19,7 +19,6 @@ services: -Dshare.port=8080 -Dalfresco.host=localhost -Dalfresco.port=8080 - -Drepo.event2.topic.endpoint=amqp:topic:VirtualTopic.alfresco.repo.event2 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url="failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true" -Ddeployment.method=DOCKER_COMPOSE @@ -57,6 +56,3 @@ services: search-reindexing: image: busybox:musl command: "true" - elasticsearch: - image: busybox:musl - command: "true" From cc8d766fc32a576a011e548c8e590318c2fa546a Mon Sep 17 00:00:00 2001 From: Damian Ujma Date: Wed, 2 Oct 2024 17:21:14 +0200 Subject: [PATCH 3/6] ACS-8856 Set mem_limit --- docker-compose/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 4280165fb..0530e078e 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -167,10 +167,11 @@ services: - 9300:9300 kibana: image: kibana:7.17.3 + mem_limit: 1g environment: - ELASTICSEARCH_HOSTS=http://elasticsearch:9200 ports: - - 5601:5601 + - "5601:5601" depends_on: - elasticsearch search: From 7f31f02c1d8e656f44a71abad1416ff48c4ab4ca Mon Sep 17 00:00:00 2001 From: Damian Ujma Date: Thu, 3 Oct 2024 11:16:48 +0200 Subject: [PATCH 4/6] ACS-8856 Reduce mem_limit --- docker-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 0530e078e..8dce3c6c7 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -218,7 +218,7 @@ services: - "61613:61613" # STOMP audit-storage: image: quay.io/alfresco/alfresco-audit-storage:0.0.1-A7 - mem_limit: 1g + mem_limit: 512m environment: SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000 AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_URI: http://elasticsearch:9200 From 1f48e59f47e9d44c28fe072c99aefbafa5e30afe Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Thu, 3 Oct 2024 16:48:03 +0200 Subject: [PATCH 5/6] bump pre-release --- docker-compose/pre-release-docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/pre-release-docker-compose.yml b/docker-compose/pre-release-docker-compose.yml index de28d1362..767b07fc7 100644 --- a/docker-compose/pre-release-docker-compose.yml +++ b/docker-compose/pre-release-docker-compose.yml @@ -146,7 +146,7 @@ services: ports: - "5432:5432" elasticsearch: - image: elasticsearch:7.10.1 + image: elasticsearch:7.17.3 environment: - xpack.security.enabled=false - discovery.type=single-node From a543cdb4c37f9255bc47df34fcf9380b0d59e3d8 Mon Sep 17 00:00:00 2001 From: Damian Ujma Date: Wed, 9 Oct 2024 13:06:34 +0200 Subject: [PATCH 6/6] ACS-8856 Bump Alfresco Audit Storage to 0.0.1-A8 --- docker-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 6e9f5ae16..a578ac017 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -214,7 +214,7 @@ services: - "61616:61616" # OpenWire - "61613:61613" # STOMP audit-storage: - image: quay.io/alfresco/alfresco-audit-storage:0.0.1-A7 + image: quay.io/alfresco/alfresco-audit-storage:0.0.1-A8 mem_limit: 512m environment: SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000