diff --git a/.github/workflows/_build-host.yml b/.github/workflows/build-host.yml similarity index 100% rename from .github/workflows/_build-host.yml rename to .github/workflows/build-host.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c17f32..4b94f62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,14 +89,14 @@ jobs: run: nix build .#checks.x86_64-linux.${{ matrix.check }} --print-build-logs build-server: needs: parse-flake - uses: ./.github/workflows/_build-host.yml + uses: ./.github/workflows/build-host.yml with: hosts: ${{ needs.parse-flake.outputs.servers }} secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} build-workstation: needs: parse-flake - uses: ./.github/workflows/_build-host.yml + uses: ./.github/workflows/build-host.yml with: hosts: ${{ needs.parse-flake.outputs.workstations }} secrets: diff --git a/modules/nixos/services/alertmanager.nix b/modules/nixos/services/alertmanager.nix index 77e04fe..a610b90 100644 --- a/modules/nixos/services/alertmanager.nix +++ b/modules/nixos/services/alertmanager.nix @@ -83,10 +83,7 @@ in notification = { topic = "splitleaf"; priority = "default"; - templates = { - title = ''{{ if eq .Status "firing" }}{{ index .Annotations "summary" }}{{ else }}{{ index .Annotations "summary_resolved" }}{{ end }}''; - description = ''{{ if eq .Status "firing" }}{{ index .Annotations "description" }}{{ else }}{{ index .Annotations "description_resolved" }}{{ end }}''; - }; + templates.title = ''{{ if eq .Status "firing" }}{{ index .Annotations "summary" }}{{ else }}{{ index .Annotations "summary_resolved" }}{{ end }}''; tags = [ { condition = ''status == "resolved"''; diff --git a/modules/nixos/services/prometheus.nix b/modules/nixos/services/prometheus.nix index f7cb64d..17f887d 100644 --- a/modules/nixos/services/prometheus.nix +++ b/modules/nixos/services/prometheus.nix @@ -98,8 +98,6 @@ in annotations = { summary = "${hostName} is DOWN"; summary_resolved = "${hostName} is up again"; - description = "No metrics received for over 2 minutes."; - description_resolved = "Metrics are being received again."; }; }) ) @@ -109,10 +107,8 @@ in expr = ''up{job=~"prometheus|alertmanager"} == 0''; for = "2m"; annotations = { - summary = "{{ $labels.job | title }} on {{ $labels.instance }} is DOWN"; - summary_resolved = "{{ $labels.job | title }} on {{ $labels.instance }} is up again"; - description = "Unresponsive for over 2 minutes."; - description_resolved = "Responding normally."; + summary = "{{ $labels.job }} on {{ $labels.instance }} is DOWN"; + summary_resolved = "{{ $labels.job }} on {{ $labels.instance }} is up again"; }; } { @@ -121,8 +117,6 @@ in annotations = { summary = "{{ $labels.instance }} deployment failed"; summary_resolved = "{{ $labels.instance }} deployment recovered"; - description = "Deployment is not reaching \"done\" status."; - description_resolved = "Deployment completed successfully."; }; } { @@ -132,8 +126,6 @@ in annotations = { summary = "Hosts are running different commits"; summary_resolved = "All hosts are running the same commit again"; - description = "Possibly a failed deployment or incompatible configurations."; - description_resolved = "All hosts are in sync."; }; } ];