Backport alloy v0.22.18

.github/workflows/oci-artifact.yaml

@@ -1,15 +1,16 @@
 name: Publish OCI Artifact
 
 on:
-  pull_request:
-    branches:
-      - master
+  # pull_request:
+  #   branches:
+  #     - master
   release:
     types:
       - published
   push:
     branches:
       - master
+      - backport-alloy-v0.22.18
 
 env:
   REGISTRY: ghcr.io

partition/roles/alloy/README.md

@@ -42,6 +42,7 @@ If your needs are more custom (e.g. you have a non-standard log source, or want
 | alloy_journal_legacy_positions_file |                                        | `/var/log/promtail-positions.yaml` | Path to the legacy promtail positions file. Used by `journal-file` when `alloy_migrate_from_promtail` is `true`.                                                                                                                                                                          |
 | alloy_journal_legacy_position_name  | yes (migration)                        |                                    | Job name from the old promtail journal scrape_config. Must match `job_name` in your old promtail config. Required when `alloy_migrate_from_promtail` is `true` and `journal-file` is used.                                                                                                |
 | alloy_config_raw                    |                                        |                                    | Full Alloy River config as a string. When set, bypasses snippet assembly entirely — `alloy_loki_write_endpoints` and `alloy_config_snippets` are ignored.                                                                                                                                 |
+| alloy_docker_network                |                                        | `host`                             | The docker network to launch the alloy container in. Host is used per default, as bridges with masquerading on switches are usually not possible.                                                                                                                                         |
 | alloy_docker_security_opts          |                                        |                                    | Allows passing additional security opts to the docker container.                                                                                                                                                                                                                          |
 | promtail_migrate_stop               |                                        | `false`                            | Stop and disable the promtail systemd service. Use during alloy cutover to stop promtail without removing its files. Implied by `promtail_migrate_cleanup`.                                                                                                                               |
 | promtail_migrate_cleanup            |                                        | `false`                            | Remove all promtail remnants: stops and disables the service, removes the systemd unit file, deletes `promtail_config_host_dir` and the legacy positions files. Only set this once migration to alloy is fully complete.                                                                  |

partition/roles/alloy/defaults/main.yaml

@@ -64,6 +64,9 @@ promtail_migrate_stop: false
 # the legacy positions files. Only set once migration to alloy is fully complete.
 promtail_migrate_cleanup: false
 
+# The docker network to launch the alloy container in.
+alloy_docker_network: host
+
 # Allows passing additional security opts to the docker container.
 # This might be required on some older switches to run alloy.
 alloy_docker_security_opts: []

partition/roles/alloy/tasks/main.yaml

@@ -85,6 +85,7 @@
     systemd_service_after: docker.service
     systemd_service_requires: docker.service
     systemd_docker_security_opts: "{{ alloy_docker_security_opts }}"
+    systemd_docker_network: "{{ alloy_docker_network }}"
     systemd_docker_ports:
       - host_port: "{{ alloy_port }}"
         target_port: "{{ alloy_port }}"