Set alert_every to 0 for mdstat_raid monitor to prevent repeated alerts

.drone.yml

@@ -1,100 +1,53 @@
----
 kind: pipeline
-name: test
+type: kubernetes
+name: default
 
-steps:
-  - name: test
-    image: golang:1.26
-    environment:
-      VERSION: ${DRONE_TAG:-${DRONE_COMMIT}}
-    commands:
-      - make test
-
-  - name: check
-    image: iamthefij/drone-pre-commit:personal
-
----
-kind: pipeline
-name: publish
-
-depends_on:
-  - test
+node_selector:
+  zone: dev
 
 trigger:
   event:
     - push
     - tag
-  refs:
-    - refs/heads/master
-    - refs/tags/v*
+
+workspace:
+  path: /drone/src
 
 steps:
-  - name: build all binaries
-    image: golang:1.26
-    environment:
-      VERSION: ${DRONE_TAG:-${DRONE_COMMIT}}
-    commands:
-      - make all
-
-  - name: compress binaries for release
-    image: ubuntu
-    commands:
-      - find ./dist -type f -executable -execdir tar -czvf {}.tar.gz {} \;
-    when:
-      event: tag
-
-  - name: upload gitea release
-    image: plugins/gitea-release
+  - name: pull image to dockerhub
+    image: docker.io/owncloudci/drone-docker-buildx:4
+    privileged: true
     settings:
-      title: ${DRONE_TAG}
-      files: dist/*.tar.gz
-      checksum:
-        - md5
-        - sha1
-        - sha256
-        - sha512
-      base_url:
-        from_secret: gitea_base_url
-      api_key:
-        from_secret: gitea_token
-    when:
-      event: tag
-
-  - name: Build and publish docker images
-    image: thegeeklab/drone-docker-buildx
-    settings:
-      repo: iamthefij/minitor-go
-      auto_tag: true
+      cache-from: [ "safebox/minitor" ]
+      repo: safebox/minitor
+      tags: latest
+      username:
+        from_secret: dockerhub-username
+      password: 
+        from_secret: dockerhub-password
       platforms:
         - linux/amd64
         - linux/arm64
-        - linux/arm
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
+    when:  
+      event:
+        - tag
 
----
-kind: pipeline
-name: notify
-
-depends_on:
-  - test
-  - publish
-
-trigger:
-  status:
-    - failure
-
-steps:
-
-  - name: notify
-    image: drillster/drone-email
+  - name: build multiarch from dev
+    image: docker.io/owncloudci/drone-docker-buildx:4
+    privileged: true
     settings:
-      host:
-        from_secret: SMTP_HOST  # pragma: whitelist secret
+      cache-from: [ "registry.dev.format.hu/minitor" ]
+      registry: registry.dev.format.hu
+      repo: registry.dev.format.hu/minitor
+      tags: latest
+      dockerfile: Dockerfile
       username:
-        from_secret: SMTP_USER  # pragma: whitelist secret
+        from_secret: dev-hu-registry-username
       password: 
-        from_secret: SMTP_PASS  # pragma: whitelist secret
-      from: drone@iamthefij.com
+        from_secret: dev-hu-registry-password
+      platforms:
+        - linux/amd64
+        - linux/arm64
+    when:  
+      event:
+        - push

.gitea/workflows/build.yml

@@ -1,112 +0,0 @@
-name: ci
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - "v*"
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-
-      - name: Run tests
-        run: make test
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
-
-      - name: Run pre-commit
-        uses: https://git.iamthefij.com/iamthefij/pre-commit-action@v3.1.0
-
-  release:
-    runs-on: ubuntu-latest
-    needs: test
-    if: "${{ github.event_name != 'pull_request' }}"
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-
-      - name: Build binaries
-        env:
-          VERSION: "${{ github.REF_NAME }}"
-        run: make all
-
-      # Package binaries and create release if this is a tagged build
-      - name: Compress binaries
-        if: "${{ github.ref_type == 'tag' }}"
-        run: find ./dist -type f -executable -execdir tar -czvf {}.tar.gz {} \;
-
-      - name: Upload release
-        uses: https://gitea.com/actions/gitea-release-action@v1
-        if: "${{ github.ref_type == 'tag' }}"
-        with:
-          files: |-
-            dist/*.tar.gz
-          md5sum: true
-          sha256sum: true
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v6
-        with:
-          # list of Docker images to use as base name for tags
-          images: |
-            ${{ github.REPOSITORY }}
-          # generate Docker tags based on the following events/attributes
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        if: "${{ github.event_name != 'pull_request' }}"
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-
-      - name: Build and push
-        uses: docker/build-push-action@v7
-        with:
-          # Use path context so we can access pre-compiled binaries
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: |
-            linux/amd64
-            linux/arm64
-            linux/arm/v7
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.golangci.yml

@@ -1,34 +1,52 @@
 version: "2"
 linters:
   enable:
-    - errcheck
     - errname
     - errorlint
     - exhaustive
-    - gosec
-    - govet
-    - ineffassign
+    - goprintffuncname
     - misspell
     - mnd
-    - modernize
-    - staticcheck
-    - tagalign
+    - tagliatelle
     - testpackage
     - thelper
     - tparallel
     - unconvert
-    - unused
     - wrapcheck
-    - wsl_v5
+    - wsl
+  disable:
+    - gochecknoglobals
+  settings:
+    gosec:
+      excludes:
+        - G204
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+          yaml: snake
   exclusions:
     generated: lax
     presets:
+      - comments
       - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
       - linters:
           - gosec
         path: _test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 formatters:
   enable:
     - gofumpt
     - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-merge-conflict
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.10.1
+    rev: v2.7.2
     hooks:
       - id: golangci-lint
   - repo: https://github.com/hadolint/hadolint

Dockerfile

@@ -1,8 +1,117 @@
-FROM alpine:3.23
+FROM golang:1.25 AS gomail-builder
+ARG TARGETARCH=amd64
+ARG TARGETOS=linux
+WORKDIR /gomail
+RUN { \
+    echo 'package main'; \
+    echo ''; \
+    echo 'import ('; \
+    echo '    "fmt"'; \
+    echo '    "io"'; \
+    echo '    "net/mail"'; \
+    echo '    "net/smtp"'; \
+    echo '    "os"'; \
+    echo '    "strings"'; \
+    echo ')'; \
+    echo ''; \
+    echo 'func main() {'; \
+    echo '    readHeaders := strings.Contains(strings.Join(os.Args[1:], " "), "-t")'; \
+    echo '    recipients := []string{}'; \
+    echo '    for _, arg := range os.Args[1:] {'; \
+    echo '        if !strings.HasPrefix(arg, "-") {'; \
+    echo '            recipients = append(recipients, arg)'; \
+    echo '        }'; \
+    echo '    }'; \
+    echo ''; \
+    echo '    body, err := io.ReadAll(os.Stdin)'; \
+    echo '    if err != nil {'; \
+    echo '        fmt.Fprintln(os.Stderr, err)'; \
+    echo '        os.Exit(1)'; \
+    echo '    }'; \
+    echo ''; \
+    echo '    if readHeaders {'; \
+    echo '        msg, parseErr := mail.ReadMessage(strings.NewReader(string(body)))'; \
+    echo '        if parseErr != nil {'; \
+    echo '            fmt.Fprintln(os.Stderr, parseErr)'; \
+    echo '            os.Exit(1)'; \
+    echo '        }'; \
+    echo '        for _, hdr := range []string{"To", "Cc", "Bcc"} {'; \
+    echo '            if val := msg.Header.Get(hdr); val != "" {'; \
+    echo '                addrs, addrErr := mail.ParseAddressList(val)'; \
+    echo '                if addrErr != nil {'; \
+    echo '                    fmt.Fprintln(os.Stderr, addrErr)'; \
+    echo '                    os.Exit(1)'; \
+    echo '                }'; \
+    echo '                for _, addr := range addrs {'; \
+    echo '                    recipients = append(recipients, addr.Address)'; \
+    echo '                }'; \
+    echo '            }'; \
+    echo '        }'; \
+    echo '    }'; \
+    echo ''; \
+    echo '    if len(recipients) == 0 {'; \
+    echo '        fmt.Fprintln(os.Stderr, "usage: sendmail [-t] recipient...")'; \
+    echo '        os.Exit(1)'; \
+    echo '    }'; \
+    echo ''; \
+    echo '    relay := os.Getenv("SMTP_RELAY")'; \
+    echo '    if relay == "" {'; \
+    echo '        relay = "172.17.0.2"'; \
+    echo '    }'; \
+    echo ''; \
+    echo '    port := os.Getenv("SMTP_PORT")'; \
+    echo '    if port == "" {'; \
+    echo '        port = "25"'; \
+    echo '    }'; \
+    echo ''; \
+    echo '    sender := os.Getenv("EMAIL_FROM")'; \
+    echo '    if sender == "" {'; \
+    echo '        fmt.Fprintln(os.Stderr, "[sendmail] EMAIL_FROM is not set, skipping")'; \
+    echo '        os.Exit(0)'; \
+    echo '    }'; \
+    echo ''; \
+    echo '    debug := os.Getenv("DEBUG") != ""'; \
+    echo '    if debug {'; \
+    echo '        fmt.Fprintln(os.Stderr, fmt.Sprintf("[sendmail] relay=%s port=%s sender=%s recipients=%v", relay, port, sender, recipients))'; \
+    echo '        fmt.Fprintln(os.Stderr, "[sendmail] body:")'; \
+    echo '        fmt.Fprintln(os.Stderr, string(body))'; \
+    echo '    }'; \
+    echo ''; \
+    echo '    if err = smtp.SendMail(relay+":"+port, nil, sender, recipients, body); err != nil {'; \
+    echo '        fmt.Fprintln(os.Stderr, err)'; \
+    echo '        os.Exit(1)'; \
+    echo '    }'; \
+    echo '    if debug {'; \
+    echo '        fmt.Fprintln(os.Stderr, "[sendmail] sent successfully")'; \
+    echo '    }'; \
+    echo '}'; \
+    } > main.go
+RUN go mod init gomail && \
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /usr/local/bin/sendmail .
 
+
+FROM golang:1.25 AS builder
+WORKDIR /app
+COPY ./go.mod ./go.sum /app/
+RUN go mod download
+COPY ./*.go /app/
+RUN rm -f /app/gomail.go
+
+ARG TARGETARCH=amd64
+ARG TARGETOS=linux
+ARG VERSION=dev
+RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags "-X main.version=${VERSION}" -a -installsuffix nocgo -o minitor .
+
+FROM alpine:3.23
 RUN mkdir /app
 WORKDIR /app/
 
+# Copy minitor in
+COPY --from=builder /app/minitor .
+
+# Copy sendmail (gomail) in
+COPY --from=gomail-builder /usr/local/bin/sendmail /usr/local/bin/sendmail
+
 # Add common checking tools
 # hadolint ignore=DL3018
 RUN apk --no-cache add bash=~5 curl=~8 jq=~1 bind-tools=~9 tzdata
@@ -12,13 +121,9 @@ RUN addgroup -S minitor && adduser -S minitor -G minitor
 
 # Copy scripts
 COPY ./scripts /app/scripts
+COPY default_config.hcl /app/config.hcl
 RUN chmod -R 755 /app/scripts
 
-# Copy minitor in
-ARG TARGETOS
-ARG TARGETARCH
-COPY ./dist/minitor-${TARGETOS}-${TARGETARCH} ./minitor
-
 # Drop to non-root user
 USER minitor
 

Dockerfile.multi-stage

@@ -1,39 +0,0 @@
-FROM golang:1.26 AS builder
-
-WORKDIR /app
-
-COPY ./go.mod ./go.sum /app/
-RUN go mod download
-
-COPY ./*.go /app/
-
-ARG TARGETOS
-ARG TARGETARCH
-ARG VERSION=dev
-ENV CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=${TARGETARCH}
-RUN go build -ldflags "-X main.version=${VERSION}" -a -installsuffix nocgo -o minitor .
-
-FROM alpine:3.23
-RUN mkdir /app
-WORKDIR /app/
-
-# Copy minitor in
-COPY --from=builder /app/minitor .
-
-# Add common checking tools
-# hadolint ignore=DL3018
-RUN apk --no-cache add bash=~5 curl=~8 jq=~1 bind-tools=~9 tzdata
-
-# Add minitor user for running as non-root
-RUN addgroup -S minitor && adduser -S minitor -G minitor
-
-# Copy scripts
-COPY ./scripts /app/scripts
-RUN chmod -R 755 /app/scripts
-
-# Drop to non-root user
-USER minitor
-
-ENTRYPOINT [ "./minitor" ]
-
-# vim: set filetype=dockerfile:

alert.go

@@ -8,7 +8,7 @@ import (
 	"text/template"
 	"time"
 
-	"git.iamthefij.com/iamthefij/slog/v2"
+	"git.iamthefij.com/iamthefij/slog"
 )
 
 var (

alert_test.go

@@ -22,6 +22,7 @@ func TestAlertValidate(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
@@ -76,6 +77,7 @@ func TestAlertSend(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
@@ -121,6 +123,7 @@ func TestAlertBuildTemplate(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()

config.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"git.iamthefij.com/iamthefij/slog/v2"
+	"git.iamthefij.com/iamthefij/slog"
 	"github.com/hashicorp/hcl/v2/hclsimple"
 )
 

config_test.go

@@ -24,6 +24,7 @@ func TestLoadConfig(t *testing.T) {
 		{"./test/valid-config.hcl", nil, "Valid config file"},
 	}
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
@@ -50,7 +51,7 @@ func TestDefaultConfig(t *testing.T) {
 			m.Config{
 				CheckInterval:     1 * time.Second,
 				DefaultAlertAfter: 2,
-				DefaultAlertEvery: new(0),
+				DefaultAlertEvery: Ptr(0),
 				DefaultAlertDown:  []string{"log_command"},
 			},
 			"override defaults",
@@ -60,7 +61,7 @@ func TestDefaultConfig(t *testing.T) {
 			m.Config{
 				CheckInterval:     30 * time.Second,
 				DefaultAlertAfter: 1,
-				DefaultAlertEvery: new(-1),
+				DefaultAlertEvery: Ptr(-1),
 				DefaultAlertDown:  []string{},
 			},
 			"default defaults",
@@ -68,6 +69,7 @@ func TestDefaultConfig(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()

default_config.hcl

@@ -0,0 +1,29 @@
+check_interval = "1s"
+
+monitor "mdstat_raid" {
+  command = [
+    "sh",
+    "-c",
+    "grep -q '\\[U_\\|_U\\]' /host_proc/mdstat && exit 1 || exit 0"
+  ]
+  check_interval = "30s"
+  alert_after = 1
+  alert_every = 0
+
+  alert_down = ["email_alert"]
+  alert_up   = ["email_recovery"]
+}
+alert "email_alert" {
+  command = [
+      "sh",
+          "-c",
+            "EMAIL=$EMAIL_RECIPIENT; printf 'Subject: RAID ALERT\nTo: %s\n\nRAID degraded\n' \"$EMAIL\" | /usr/local/bin/sendmail -t || true"
+                ]
+}
+alert "email_recovery" {
+  command = [
+      "sh",
+          "-c",
+              "EMAIL=$EMAIL_RECIPIENT; printf 'Subject: RAID ALERT\nTo: %s\n\nRAID clean\n' \"$EMAIL\" | /usr/local/bin/sendmail -t || true"
+                ]
+}

go.mod

@@ -1,31 +1,27 @@
 module git.iamthefij.com/iamthefij/minitor-go/v2
 
-go 1.26.0
+go 1.25.0
 
 require (
-	git.iamthefij.com/iamthefij/slog/v2 v2.0.1
-	github.com/hashicorp/hcl/v2 v2.24.0
+	git.iamthefij.com/iamthefij/slog v1.3.0
+	github.com/hashicorp/hcl/v2 v2.11.1
 	github.com/prometheus/client_golang v1.23.2
 )
 
 require (
 	github.com/agext/levenshtein v1.2.1 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
-	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.66.1 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
-	github.com/zclconf/go-cty v1.16.3 // indirect
+	github.com/zclconf/go-cty v1.8.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	golang.org/x/mod v0.26.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
 	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/text v0.28.0 // indirect
-	golang.org/x/tools v0.35.0 // indirect
 	google.golang.org/protobuf v1.36.8 // indirect
 )

go.sum

@@ -1,13 +1,11 @@
-git.iamthefij.com/iamthefij/slog/v2 v2.0.1 h1:eXf3ga0aMTkm0l6EMYOQpg34S+dQw7cN8o+W1Cg/0C0=
-git.iamthefij.com/iamthefij/slog/v2 v2.0.1/go.mod h1:VFjX1e1tfHADyQr2wJBAz0JUQT+K/5FBjzSHgUKOuu8=
+git.iamthefij.com/iamthefij/slog v1.3.0 h1:4Hu5PQvDrW5e3FrTS3q2iIXW0iPvhNY/9qJsqDR3K3I=
+git.iamthefij.com/iamthefij/slog v1.3.0/go.mod h1:1RUj4hcCompZkAxXCRfUX786tb3cM/Zpkn97dGfUfbg=
 github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
 github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
-github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
-github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -24,8 +22,6 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/hashicorp/hcl/v2 v2.11.1 h1:yTyWcXcm9XB0TEkyU/JCRU6rYy4K+mgLtzn2wlrJbcc=
 github.com/hashicorp/hcl/v2 v2.11.1/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg=
-github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=
-github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -39,8 +35,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
-github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -67,8 +61,6 @@ github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgq
 github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8=
 github.com/zclconf/go-cty v1.8.0 h1:s4AvqaeQzJIu3ndv4gVIhplVD0krU+bgrcLSVUnaWuA=
 github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
-github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=
-github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
@@ -76,15 +68,11 @@ go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
 golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -96,8 +84,6 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
 golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
-golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=

main.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"git.iamthefij.com/iamthefij/slog/v2"
+	"git.iamthefij.com/iamthefij/slog"
 )
 
 var (

main_test.go

@@ -6,6 +6,10 @@ import (
 	m "git.iamthefij.com/iamthefij/minitor-go/v2"
 )
 
+func Ptr[T any](v T) *T {
+	return &v
+}
+
 // TestCheckConfig tests the checkConfig function
 // It also tests results for potentially invalid configuration. For example, no alerts
 func TestCheckMonitors(t *testing.T) {
@@ -87,6 +91,7 @@ func TestCheckMonitors(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
@@ -166,6 +171,7 @@ func TestFirstRunAlerts(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()

monitor.go

@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"time"
 
-	"git.iamthefij.com/iamthefij/slog/v2"
+	"git.iamthefij.com/iamthefij/slog"
 )
 
 // Monitor represents a particular periodic check of a command

monitor_test.go

@@ -25,6 +25,7 @@ func TestMonitorValidate(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
@@ -102,6 +103,7 @@ func TestMonitorGetAlertNames(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
@@ -173,6 +175,7 @@ func TestMonitorFailureAlertAfter(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
@@ -201,14 +204,15 @@ func TestMonitorFailureAlertEvery(t *testing.T) {
 	}{
 		{m.Monitor{ShellCommand: "false", AlertAfter: 1}, []bool{true}, "No AlertEvery set"}, // Defaults to true because AlertAfter and AlertEvery default to nil
 		// Alert first time only, after 1
-		{m.Monitor{ShellCommand: "false", AlertAfter: 1, AlertEvery: new(0)}, []bool{true, false, false}, "Alert first time only after 1"},
+		{m.Monitor{ShellCommand: "false", AlertAfter: 1, AlertEvery: Ptr(0)}, []bool{true, false, false}, "Alert first time only after 1"},
 		// Alert every time, after 1
-		{m.Monitor{ShellCommand: "false", AlertAfter: 1, AlertEvery: new(1)}, []bool{true, true, true}, "Alert every time after 1"},
+		{m.Monitor{ShellCommand: "false", AlertAfter: 1, AlertEvery: Ptr(1)}, []bool{true, true, true}, "Alert every time after 1"},
 		// Alert every other time, after 1
-		{m.Monitor{ShellCommand: "false", AlertAfter: 1, AlertEvery: new(2)}, []bool{true, false, true, false}, "Alert every other time after 1"},
+		{m.Monitor{ShellCommand: "false", AlertAfter: 1, AlertEvery: Ptr(2)}, []bool{true, false, true, false}, "Alert every other time after 1"},
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()
@@ -297,6 +301,7 @@ func TestMonitorCheck(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(c.name, func(t *testing.T) {
 			t.Parallel()

util_test.go

@@ -24,6 +24,7 @@ func TestUtilEqualSliceString(t *testing.T) {
 	}
 
 	for _, c := range cases {
+		c := c
 
 		t.Run(fmt.Sprintf("%v %v", c.a, c.b), func(t *testing.T) {
 			t.Parallel()