Merge pull request #4982 from raft-tech/3258-alloy-conversion

3258 - Alloy conversion

Author: jtimpe

scripts/deploy-backend.sh

@@ -87,13 +87,10 @@ generate_jwt_cert()
     cf set-env "$CGAPPNAME_BACKEND" JWT_KEY "$(cat key.pem)"
 }
 
-prepare_promtail() {
-  pushd tdrs-backend/plg/promtail
-  CONFIG=config.yml
-  yq eval -i ".scrape_configs[0].job_name = \"system-$backend_app_name\""  $CONFIG
-  yq eval -i ".scrape_configs[0].static_configs[0].labels.job = \"system-$backend_app_name\""  $CONFIG
-  yq eval -i ".scrape_configs[1].job_name = \"backend-$backend_app_name\""  $CONFIG
-  yq eval -i ".scrape_configs[1].static_configs[0].labels.job = \"backend-$backend_app_name\""  $CONFIG
+prepare_alloy() {
+  pushd tdrs-backend/plg/alloy
+  cf set-env "$CGAPPNAME_BACKEND" ALLOY_SYSTEM_NAME "system-$backend_app_name"
+  cf set-env "$CGAPPNAME_BACKEND" ALLOY_BACKEND_NAME "backend-$backend_app_name"
   popd
 }
 
@@ -216,7 +213,7 @@ else
   CYPRESS_TOKEN=$CYPRESS_TOKEN
 fi
 
-prepare_promtail
+prepare_alloy
 if [ "$DEPLOY_STRATEGY" = "rolling" ] ; then
     # Perform a rolling update for the backend and frontend deployments if
     # specified, otherwise perform a normal deployment

tdrs-backend/docker-compose.yml

@@ -110,16 +110,16 @@ services:
       - alertmanager
       - mimir
 
-  promtail:
+  alloy:
     restart: always
-    image: grafana/promtail:3.1.1
+    image: grafana/alloy:v1.8.0
     ports:
-      - 9080:9080
+      - 12345:12345
     volumes:
-      - ./plg/promtail/config.local.yml:/etc/promtail/config.yml
+      - ./plg/alloy:/etc/alloy
       - ~/tdp-logs/nginx:/var/log/nginx
       - logs:/logs
-    command: -config.file=/etc/promtail/config.yml
+    command: run --server.http.listen-addr=0.0.0.0:12345 --storage.path=/var/lib/alloy/data /etc/alloy/alloy.local.config
 
   loki:
     restart: always

tdrs-backend/gunicorn_start.sh

@@ -37,10 +37,12 @@ fi
 gunicorn_cmd="gunicorn $gunicorn_params"
 
 if [[ $1 == "cloud" ]]; then
-    echo "Starting Promtail"
-    wget https://github.com/grafana/loki/releases/download/v3.1.1/promtail-linux-amd64.zip
-    unzip -a promtail-linux-amd64.zip && rm -rf promtail-linux-amd64.zip
-    ./promtail-linux-amd64 -config.file=./plg/promtail/config.yml &
+    echo "Starting Alloy"
+    mkdir /home/vcap/app/alloy-data
+    wget https://github.com/grafana/alloy/releases/download/v1.8.1/alloy-boringcrypto-linux-amd64.zip
+    unzip -a alloy-boringcrypto-linux-amd64.zip && rm -rf alloy-boringcrypto-linux-amd64.zip
+    chmod +x alloy-boringcrypto-linux-amd64
+    ./alloy-boringcrypto-linux-amd64 run --server.http.listen-addr=0.0.0.0:12345 --storage.path=/home/vcap/app/alloy-data /home/vcap/app/plg/alloy/alloy.config &
 
     echo "Starting the Celery Exporter"
     curl -L https://github.com/danihodovic/celery-exporter/releases/download/latest/celery-exporter -o ./celery-exporter

tdrs-backend/plg/alloy/alloy.config

@@ -0,0 +1,42 @@
+local.file_match "system" {
+	path_targets = [{
+		__address__ = "localhost",
+		__path__    = "/var/log/*log",
+		job         = sys.env("ALLOY_SYSTEM_NAME"),
+	}]
+}
+
+loki.source.file "system" {
+	targets               = local.file_match.system.targets
+	forward_to            = [loki.write.default.receiver]
+	legacy_positions_file = "/tmp/positions.yaml"
+}
+
+local.file_match "backend" {
+	path_targets = [{
+		__address__ = "localhost",
+		__path__    = "/tmp/django.log",
+		job         = sys.env("ALLOY_BACKEND_NAME"),
+	}]
+}
+
+loki.process "backend_process" {
+	forward_to = [loki.write.default.receiver]
+
+	stage.regex {
+		expression = "^(?P<time>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3}) (?P<level>\\w+) (?P<logger>\\S+) (?P<message>.*)$"
+	}
+}
+
+loki.source.file "backend" {
+	targets               = local.file_match.backend.targets
+	forward_to            = [loki.process.backend_process.receiver]
+	legacy_positions_file = "/tmp/positions.yaml"
+}
+
+loki.write "default" {
+	endpoint {
+		url = "http://loki.apps.internal:8080/loki/api/v1/push"
+	}
+	external_labels = {}
+}

tdrs-backend/plg/alloy/alloy.local.config

@@ -0,0 +1,61 @@
+local.file_match "system" {
+	path_targets = [{
+		__address__ = "localhost",
+		__path__    = "/var/log/*log",
+		job         = "varlogs-local",
+	}]
+}
+
+loki.source.file "system" {
+	targets               = local.file_match.system.targets
+	forward_to            = [loki.write.default.receiver]
+	legacy_positions_file = "/tmp/positions.yaml ?? not in tmp"
+}
+
+local.file_match "backend" {
+	path_targets = [{
+		__address__ = "localhost",
+		__path__    = "/logs/django.log",
+		job         = "backend-local",
+	}]
+}
+
+loki.process "backend_process" {
+	forward_to = [loki.write.default.receiver]
+
+	stage.regex {
+		expression = "^(?P<time>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3}) (?P<level>\\w+) (?P<logger>\\S+) (?P<message>.*)$"
+	}
+}
+
+loki.source.file "backend" {
+	targets               = local.file_match.backend.targets
+	forward_to            = [loki.process.backend_process.receiver]
+	legacy_positions_file = "/tmp/positions.yaml"
+}
+local.file_match "frontend" {
+	path_targets = [{
+		__address__ = "localhost",
+		__path__    = "/var/log/nginx/access_log.log",
+		job         = "frontend-local",
+		level       = "DEBUG",
+	}, {
+		__address__ = "localhost",
+		__path__    = "/var/log/nginx/error_log.log",
+		job         = "frontend-local",
+		level       = "ERROR",
+	}]
+}
+
+loki.source.file "frontend" {
+	targets               = local.file_match.frontend.targets
+	forward_to            = [loki.write.default.receiver]
+	legacy_positions_file = "/tmp/positions.yaml"
+}
+
+loki.write "default" {
+	endpoint {
+		url = "http://loki:3100/loki/api/v1/push"
+	}
+	external_labels = {}
+}