Update docker compose deploy

Author: Rados13

.env.example

@@ -13,3 +13,19 @@ DOMAIN=localhost
 
 GF_SECURITY_ADMIN_USER=ADMIN
 GF_SECURITY_ADMIN_PASSWORD=PASSWORD
+
+ALLOY_CONFIG_FILE=config.alloy
+ALLOY_CONFIG_PATH=/etc/alloy
+ALLOY_CONFIG_PATH_LOCAL=./infra/alloy/config
+
+AGENT_KEY_APP_RECEIVER=api_key
+AGENT_HOST=alloy
+AGENT_LOGS_PATH=/var/log
+AGENT_PORT=12345
+AGENT_PORT_APP_RECEIVER=8027
+AGENT_TEMP_PATH=/tmp/agent
+AGENT_WAL_PATH=wal
+
+
+DEMO_CLIENT_PACKAGE_NAME="app"
+DEMO_PACKAGE_NAME="app"

.github/workflows/sandbox_build_and_deploy.yml

@@ -30,6 +30,9 @@ jobs:
         id: variables_population
         run: |
           echo "DOMAIN=${{env.DOMAIN}} 
+          ALLOY_CONFIG_FILE=config.alloy
+          ALLOY_CONFIG_PATH=/etc/alloy
+          ALLOY_CONFIG_PATH_LOCAL=./infra/alloy/config
           FISHJAM_ROOM_VERSION=${{ steps.versions.outputs.fishjam_room }}
           FISHJAM_VERSION=${{ steps.versions.outputs.fishjam }}
           JF_SERVER_API_TOKEN=${{secrets.SERVER_API_TOKEN_CLOUD_SANDBOX}}
@@ -44,6 +47,8 @@ jobs:
           privateKey: ${{ secrets.SSH_PRIV_KEY }}
           command: |
             docker ps -aq | xargs -r docker stop | xargs -r docker rm 
+            
+    
 
       - name: Deploy docker compose to a pre-configured server on first host
         uses: TapTap21/docker-remote-deployment-action@v1.1
@@ -52,4 +57,4 @@ jobs:
           ssh_private_key: ${{ secrets.SSH_PRIV_KEY }}
           ssh_public_key: ${{ secrets.SSH_PUB_KEY }}
           stack_file_name: ${{ env.COMPOSE_FILE_NAME }}
-          args: -p ${{ env.PROJECT }} --env-file .env up -d --remove-orphans --build frontend backend
+          args: -p ${{ env.PROJECT }} --env-file .env up -d --remove-orphans --build 

docker-compose-deploy.yaml

@@ -32,3 +32,45 @@ services:
     ports:
       - "5004:5004"
 
+  grafana:
+    build:
+      context: ./infra/grafana/
+      dockerfile: Dockerfile
+    container_name: grafana
+    ports:
+      - "3000:3000"
+    environment:
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+    volumes:
+      - grafana-storage:/var/lib/grafana
+
+  loki:
+    build:
+      context: ./infra/loki/
+      dockerfile: Dockerfile
+    container_name: loki
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+    volumes:
+      - loki-data:/loki
+
+  grafana-alloy:
+    build:
+      context: ./infra/alloy/
+      dockerfile: Dockerfile
+    env_file:
+      - './.env.example'
+    entrypoint:
+      - '/bin/alloy'
+      - 'run'
+      - '--server.http.listen-addr=0.0.0.0:12345'
+      - '--config.extra-args="-config.expand-env"'
+      - '${ALLOY_CONFIG_PATH}/${ALLOY_CONFIG_FILE}'
+    environment:
+      AGENT_PORT_APP_RECEIVER: 8027
+
+volumes:
+  grafana-storage:
+  loki-data:

infra/alloy/Dockerfile

@@ -0,0 +1,2 @@
+FROM grafana/alloy:latest
+COPY ./config.alloy /etc/alloy/config.alloy

infra/grafana/Dockerfile

@@ -0,0 +1,2 @@
+FROM grafana/grafana:latest
+COPY ./provisioning /etc/grafana/provisioning

infra/loki/Dockerfile

@@ -0,0 +1,3 @@
+FROM grafana/loki:latest
+
+COPY ./loki-config.yaml /etc/loki/local-config.yaml

infra/loki/loki-config.yaml

@@ -19,13 +19,20 @@ ingester:
 schema_config:
   configs:
     - from: 2020-05-15
-      store: boltdb
+      store: tsdb  # Changed from boltdb to tsdb
       object_store: filesystem
-      schema: v11
+      schema: v13  # Updated from v11 to v13
       index:
         prefix: index_
         period: 168h
 
+storage_config:
+  tsdb:  # Changed from boltdb to tsdb
+    dir: /tmp/loki/index
+
+  filesystem:
+    directory: /tmp/loki/chunks
+
 storage_config:
   boltdb:
     directory: /tmp/loki/index