улучшены логи, otel collector добавлен в git

2026-06-20 05:24:17 +03:00
parent aeee641c6c
commit 02f5ef93b0
7 changed files with 181 additions and 12 deletions
@@ -26,6 +26,7 @@ jobs:
              echo "APP_PORT=8004"
              echo "POSTGRES_PORT=5433"
              echo "REDIS_PORT=6380"
+              echo 'METRICS_FILTER_EXPRESSION=not IsMatch(resource.attributes["container.name"], "-stage$")'
              echo "COMPOSE_PROJECT=g2s-aggregator-stage"
              echo "DEPLOY_DIR=/home/deploy/g2s-aggregator-stage"
            } >> "$GITHUB_ENV"
@@ -36,6 +37,7 @@ jobs:
              echo "APP_PORT=8003"
              echo "POSTGRES_PORT=5432"
              echo "REDIS_PORT=6379"
+              echo 'METRICS_FILTER_EXPRESSION=IsMatch(resource.attributes["container.name"], "-stage$")'
              echo "COMPOSE_PROJECT=g2s-aggregator"
              echo "DEPLOY_DIR=/home/deploy/g2s-aggregator"
            } >> "$GITHUB_ENV"
@@ -106,11 +108,14 @@ jobs:

          render config.template.yaml config.rendered.yaml
          render docker-compose.template.yml docker-compose.rendered.yml
+          render otel-collector-config.template.yaml otel-collector-config.rendered.yaml

          scp -i ~/.ssh/deploy_key config.rendered.yaml \
            deploy@194.58.121.203:$DEPLOY_DIR/config.yaml
          scp -i ~/.ssh/deploy_key docker-compose.rendered.yml \
            deploy@194.58.121.203:$DEPLOY_DIR/docker-compose.yml
+          scp -i ~/.ssh/deploy_key otel-collector-config.rendered.yaml \
+            deploy@194.58.121.203:$DEPLOY_DIR/otel-collector-config.yaml

      - name: Deploy
        run: |