Feature: logs2notifications

Makefile

@@ -188,12 +188,7 @@ services :=	api \
 			logs-concentrator \
 			logs-dispatcher \
 			logs-tee \
-			logs2email \
-			logs2microsoftteams \
-			logs2rocketchat \
-			logs2slack \
-			logs2s3 \
-			logs2webhook \
+			logs2notifications \
 			storage-calculator \
 			ui \
 			webhook-handler \
@@ -213,7 +208,7 @@ $(build-services):
 	touch $@
 
 # Dependencies of Service Images
-build/auth-server build/logs2email build/logs2slack build/logs2rocketchat build/logs2s3 build/logs2webhook build/logs2microsoftteams build/backup-handler build/controllerhandler build/webhook-handler build/webhooks2tasks build/api build/ui: build/yarn-workspace-builder
+build/auth-server build/logs2notifications build/backup-handler build/controllerhandler build/webhook-handler build/webhooks2tasks build/api build/ui: build/yarn-workspace-builder
 build/api-db: services/api-db/Dockerfile
 build/api-redis: services/api-redis/Dockerfile
 build/actions-handler: services/actions-handler/Dockerfile
@@ -292,7 +287,7 @@ wait-for-keycloak:
 	grep -m 1 "Config of Keycloak done." <(docker-compose -p $(CI_BUILD_TAG) --compatibility logs -f keycloak 2>&1)
 
 # Define a list of which Lagoon Services are needed for running any deployment testing
-main-test-services = actions-handler broker logs2email logs2slack logs2rocketchat logs2microsoftteams logs2s3 logs2webhook api api-db api-redis keycloak keycloak-db ssh auth-server local-git local-api-data-watcher-pusher local-minio
+main-test-services = actions-handler broker logs2notifications api api-db api-redis keycloak keycloak-db ssh auth-server local-git local-api-data-watcher-pusher local-minio
 
 # List of Lagoon Services needed for webhook endpoint testing
 webhooks-test-services = webhook-handler webhooks2tasks backup-handler
@@ -490,8 +485,8 @@ api-development: build/api build/api-db build/local-api-data-watcher-pusher buil
 	IMAGE_REPO=$(CI_BUILD_TAG) docker-compose -p $(CI_BUILD_TAG) --compatibility up -d api api-db local-api-data-watcher-pusher keycloak keycloak-db broker api-redis
 
 .PHONY: ui-logs-development
-ui-logs-development: build/actions-handler build/api build/api-db build/local-api-data-watcher-pusher build/ui build/keycloak build/keycloak-db build/broker-single build/api-redis build/logs2s3 build/local-minio
-	IMAGE_REPO=$(CI_BUILD_TAG) docker-compose -p $(CI_BUILD_TAG) --compatibility up -d api api-db actions-handler local-api-data-watcher-pusher ui keycloak keycloak-db broker api-redis logs2s3 local-minio
+ui-logs-development: build/actions-handler build/api build/api-db build/local-api-data-watcher-pusher build/ui build/keycloak build/keycloak-db build/broker-single build/api-redis build/logs2notifications build/local-minio
+	IMAGE_REPO=$(CI_BUILD_TAG) docker-compose -p $(CI_BUILD_TAG) --compatibility up -d api api-db actions-handler local-api-data-watcher-pusher ui keycloak keycloak-db broker api-redis logs2notifications local-minio
 
 ## CI targets
 
@@ -503,7 +498,7 @@ STERN_VERSION = 2.1.20
 CHART_TESTING_VERSION = v3.6.0
 KIND_IMAGE = kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae
 TESTS = [nginx,api,features-kubernetes,bulk-deployment,features-kubernetes-2,features-api-variables,active-standby-kubernetes,tasks,drush,drupal-php80,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch,workflows]
-CHARTS_TREEISH = "main"
+CHARTS_TREEISH = "logs2notifications"
 TASK_IMAGES = task-activestandby
 
 # Symlink the installed kubectl client if the correct version is already
@@ -623,7 +618,7 @@ ifeq ($(ARCH), darwin)
       tcp-listen:32080,fork,reuseaddr tcp-connect:target:32080
 endif
 
-KIND_SERVICES = api api-db api-redis auth-server actions-handler broker controllerhandler docker-host drush-alias keycloak keycloak-db logs2s3 webhook-handler webhooks2tasks local-api-data-watcher-pusher local-git ssh tests ui workflows $(TASK_IMAGES)
+KIND_SERVICES = api api-db api-redis auth-server actions-handler broker controllerhandler docker-host drush-alias keycloak keycloak-db logs2notifications webhook-handler webhooks2tasks local-api-data-watcher-pusher local-git ssh tests ui workflows $(TASK_IMAGES)
 KIND_TESTS = local-api-data-watcher-pusher local-git tests
 KIND_TOOLS = kind helm kubectl jq stern
 
@@ -657,7 +652,7 @@ kind/test: kind/cluster helm/repos $(addprefix local-dev/,$(KIND_TOOLS)) $(addpr
 			"quay.io/helmpack/chart-testing:$(CHART_TESTING_VERSION)" \
 			ct install
 
-LOCAL_DEV_SERVICES = api auth-server controllerhandler logs2email logs2microsoftteams logs2rocketchat logs2slack logs2s3 logs2webhook ui webhook-handler webhooks2tasks
+LOCAL_DEV_SERVICES = api auth-server controllerhandler logs2notifications ui webhook-handler webhooks2tasks
 
 # install lagoon charts in a Kind cluster
 .PHONY: kind/setup

docker-compose.yaml

@@ -33,46 +33,10 @@ services:
     volumes:
       - ./services/controllerhandler/src:/app/services/controllerhandler/src
       - ./node-packages:/app/node-packages:delegated
-  logs2rocketchat:
-    image: ${IMAGE_REPO:-lagoon}/logs2rocketchat
-    command: yarn run dev
-    volumes:
-      - ./services/logs2rocketchat/src:/app/services/logs2rocketchat/src
-      - ./node-packages:/app/node-packages:delegated
-  logs2slack:
-    image: ${IMAGE_REPO:-lagoon}/logs2slack
-    command: yarn run dev
-    volumes:
-      - ./services/logs2slack/src:/app/services/logs2slack/src
-      - ./node-packages:/app/node-packages:delegated
-  logs2webhook:
-    image: ${IMAGE_REPO:-lagoon}/logs2webhook
-    command: yarn run dev
-    volumes:
-      - ./services/logs2webhook/src:/app/services/logs2webhook/src
-      - ./node-packages:/app/node-packages:delegated
-  logs2s3:
-    image: ${IMAGE_REPO:-lagoon}/logs2s3
-    command: yarn run dev
-    volumes:
-      - ./services/logs2s3/src:/app/services/logs2s3/src
-      - ./node-packages:/app/node-packages:delegated
+  logs2notifications:
+    image: ${IMAGE_REPO:-lagoon}/logs2notifications
     environment:
       - S3_FILES_HOST=http://172.17.0.1:9000
-  logs2microsoftteams:
-    image: ${IMAGE_REPO:-lagoon}/logs2microsoftteams
-    command: yarn run dev
-    volumes:
-      - ./services/logs2microsoftteams/src:/app/services/logs2microsoftteams/src
-      - ./node-packages:/app/node-packages:delegated
-  logs2email:
-    image: ${IMAGE_REPO:-lagoon}/logs2email
-    command: yarn run dev
-    volumes:
-      - ./services/logs2email/src:/app/services/logs2email/src
-      - ./node-packages:/app/node-packages:delegated
-    depends_on:
-      - mailhog
   mailhog:
     image: mailhog/mailhog
     ports:

images/yarn-workspace-builder/Dockerfile

@@ -13,12 +13,6 @@ COPY node-packages /app/node-packages
 # subdependencies won't be installed
 COPY services/api/package.json /app/services/api/
 COPY services/auth-server/package.json /app/services/auth-server/
-COPY services/logs2email/package.json /app/services/logs2email/
-COPY services/logs2microsoftteams/package.json /app/services/logs2microsoftteams/
-COPY services/logs2rocketchat/package.json /app/services/logs2rocketchat/
-COPY services/logs2slack/package.json /app/services/logs2slack/
-COPY services/logs2s3/package.json /app/services/logs2s3/
-COPY services/logs2webhook/package.json /app/services/logs2webhook/
 COPY services/controllerhandler/package.json /app/services/controllerhandler/
 COPY services/webhook-handler/package.json /app/services/webhook-handler/
 COPY services/webhooks2tasks/package.json /app/services/webhooks2tasks/