Update develop to be main

.github/workflows/cicd-prod.server.yml

@@ -54,8 +54,7 @@ jobs:
           tags: ${{ secrets.DOCKER_USERNAME }}/minitwitapiimage:latest
           cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/minitwitapiimage:webbuildcache
           cache-to: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/minitwitapiimage:webbuildcache,mode=max
-
-
+
       - name: Build and push minitwitwebimage
         uses: docker/build-push-action@v7
         with:

Makefile

@@ -1,4 +1,14 @@
-.PHONY: staticcheck gofmt hadolint analysis checkmake all runlocalswarm buildlocal swarm createnetwork env deploy clean test 
+.PHONY: staticcheck gofmt hadolint analysis checkmake all runlocalswarm buildlocal swarm createnetwork env deploy clean test delete_all_volumes
+
+# Use ONE shell per recipe. Does not work across recipes.
+.ONESHELL:
+SHELL := /bin/bash
+
+# Make .env variables accessible to all recipes with $(VARIABLE_NAME)
+# include .env
+
+# Export all make variables to shell. Recipes can use $VARIABLE_NAME. Especially useful if we use python scripts to run stuff as we might want to expose variables instead of passing them.
+# export
 
 all: staticcheck gofmt hadolint checkmake semgrep
 
@@ -9,7 +19,6 @@ staticcheck:
 	go install honnef.co/go/tools/cmd/staticcheck@latest
 	staticcheck ./...
 
-
 gofmt:
 	gofmt -l .
 
@@ -28,7 +37,7 @@ STACK_NAME=minitwit
 MONITORING_STACK=monitoring
 NETWORK=minitwit-network
 
-runlocalswarm: buildlocal initswarm createnetwork setenv deploywebapi
+runlocalswarm: buildlocal initswarm createnetwork deploywebapi
 
 buildlocal:
 	docker build -t minitwit-api:dev -f Dockerfile.api .
@@ -44,18 +53,68 @@ createnetwork:
 		echo "Creating overlay network..."; docker network create --driver overlay --attachable $(NETWORK); \
 	else echo "Network already exists"; fi
 
-setenv:
-	@set -a && [ -f .env ] && . ./.env || true && set +a
-
 deploywebapi:
+	@set -a; source .env; set +a;
 	docker compose -f docker-compose.local-db.yml up -d
 	docker stack deploy -c docker-compose.develop.yml $(STACK_NAME)
 
 deploymonitoring:
+	@set -a; source .env; set +a;
 	docker stack deploy -c docker-compose.monitoring.yml $(MONITORING_STACK)
 
 clean:
 	docker stack rm $(STACK_NAME) || true
 	docker stack rm $(MONITORING_STACK) || true
 	docker compose -f docker-compose.local-db.yml down || true
-	docker network rm $(NETWORK);
+	docker network rm $(NETWORK) || true;
+
+delete_grafana_volume:
+	docker volume rm monitoring_grafana-storage
+
+delete_loki_volume:
+	docker volume rm monitoring_loki-storage
+
+delete_prometheus_volume:
+	docker volume rm monitoring_prometheus-storage
+
+delete_all_volumes: delete_grafana_volume delete_loki_volume delete_prometheus_volume
+
+deployall: createnetwork buildlocal initswarm  deploywebapi deploymonitoring
+	watch -n 2 docker service ls
+
+deploy_local_simulator:
+	cd ./test
+	python3 minitwit_simulator.py http://127.0.0.1/api
+
+service_watch:
+	watch -n 2 docker service ls
+
+log_web:
+	docker service logs minitwit_web -f --tail 20
+
+log_api:
+	docker service logs minitwit_api -f --tail 20
+
+log_proxy:
+	docker service logs minitwit_nginx -f --tail 20
+
+log_grafana:
+	docker service logs monitoring_grafana -f --tail 20
+
+log_loki:
+	docker service logs monitoring_loki -f --tail 20
+
+log_prometheus:
+	docker service logs monitoring_prometheus -f --tail 20
+
+log_promtail:
+	docker service logs monitoring_promtail -f --tail 20
+
+# Used to cleanup VM by removing: unused images, stopped containers, unused volumes, build cache
+# and other temporary files.
+aggressive_docker_clean:
+	docker system df
+	docker system prune -a --volumes
+	sudo journalctl --vacuum-size=100M
+	sudo apt-get clean
+	sudo apt-get autoremove -y

docker-compose.monitoring.yml

@@ -21,14 +21,14 @@ services:
     environment:
       - GF_SERVER_ROOT_URL=https://minitwit-devops.tech/grafana
       - GF_SERVER_SERVE_FROM_SUB_PATH=true
+      - DISCORD_WEBHOOK_URL=${DISCORD_WEBHOOK_URL}
     depends_on:
       - prometheus
       - loki
     volumes:
-      - ./monitoring/grafana/datasource.yml:/etc/grafana/provisioning/datasources/datasource.yml
-      - ./monitoring/grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards
-      - ./monitoring/grafana/dashboards:/var/lib/grafana/dashboards
       - grafana-storage:/var/lib/grafana
+      - ./monitoring/grafana/provisioning:/etc/grafana/provisioning
+      - ./monitoring/grafana/dashboards:/var/lib/grafana/dashboards
     networks:
       - minitwit-network
     deploy:
@@ -83,8 +83,8 @@ services:
     deploy:
       mode: global
       labels:
-        - "prometheus-job=cadvisor"
-        - "prometheus-port=8080"
+        - "prometheus_job=cadvisor"
+        - "prometheus_port=8080"
 
   node_exporter:
     image: quay.io/prometheus/node-exporter:latest
@@ -99,8 +99,8 @@ services:
     deploy:
       mode: global
       labels:
-        - "prometheus-job=node_exporter"
-        - "prometheus-port=9100"
+        - "prometheus_job=node_exporter"
+        - "prometheus_port=9100"
 
 networks:
   # Network shared between services so we can refer to them by name

docker-compose.yml

@@ -13,7 +13,7 @@ services:
       timeout: 10s
       retries: 3
     deploy:
-      replicas: 6
+      replicas: 3
       restart_policy:
         condition: on-failure
       update_config:
@@ -38,7 +38,7 @@ services:
       timeout: 10s
       retries: 3
     deploy:
-      replicas: 3
+      replicas: 2
       restart_policy:
         condition: on-failure
       update_config:
@@ -62,9 +62,16 @@ services:
     networks:
       - minitwit-network
     deploy:
+      replicas: 2
+      restart_policy:
+        condition: on-failure
+      update_config:
+        parallelism: 1
+        delay: 10s
+        failure_action: rollback
       placement:
-        constraints:
-          - node.role == manager
+        preferences:
+          - spread: node.role
 
 networks:  # Network shared between services so we can refer to them by name
   minitwit-network: