.drone.yml

@@ -60,15 +60,51 @@ steps:
     when:
       event: tag
 
-  - name: Build and publish docker images
+  - name: push image - arm
-    image: thegeeklab/drone-docker-buildx
+    image: plugins/docker
     settings:
       repo: iamthefij/minitor-go
       auto_tag: true
-      platforms:
+      auto_tag_suffix: linux-arm
-        - linux/amd64
+      username:
-        - linux/arm64
+        from_secret: docker_username
-        - linux/arm
+      password:
+        from_secret: docker_password
+      build_args:
+        - ARCH=arm
+        - REPO=arm32v7
+
+  - name: push image - arm64
+    image: plugins/docker
+    settings:
+      repo: iamthefij/minitor-go
+      auto_tag: true
+      auto_tag_suffix: linux-arm64
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      build_args:
+        - ARCH=arm64
+        - REPO=arm64v8
+
+  - name: push image - amd64
+    image: plugins/docker
+    settings:
+      repo: iamthefij/minitor-go
+      auto_tag: true
+      auto_tag_suffix: linux-amd64
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+
+  - name: publish manifest
+    image: plugins/manifest
+    settings:
+      spec: manifest.tmpl
+      auto_tag: true
+      ignore_missing: true
       username:
         from_secret: docker_username
       password:

Dockerfile

@@ -1,10 +1,11 @@
-FROM alpine:3.18
+ARG REPO=library
+FROM ${REPO}/alpine:3.18
 
 RUN mkdir /app
 WORKDIR /app/
 
 # Add common checking tools
-RUN apk --no-cache add bash=~5 curl=~8 jq=~1 bind-tools=~9 tzdata~=2024a
+RUN apk --no-cache add bash=~5 curl=~8 jq=~1 bind-tools=~9 tzdata~=2023c
 
 # Add minitor user for running as non-root
 RUN addgroup -S minitor && adduser -S minitor -G minitor
@@ -14,9 +15,8 @@ COPY ./scripts /app/scripts
 RUN chmod -R 755 /app/scripts
 
 # Copy minitor in
-ARG TARGETOS
+ARG ARCH=amd64
-ARG TARGETARCH
+COPY ./dist/minitor-linux-${ARCH} ./minitor
-COPY ./dist/minitor-${TARGETOS}-${TARGETARCH} ./minitor
 
 # Drop to non-root user
 USER minitor

Dockerfile.multi-stage

@@ -1,3 +1,4 @@
+ARG REPO=library
 FROM golang:1.20 AS builder
 
 RUN mkdir /app
@@ -8,13 +9,12 @@ RUN go mod download
 
 COPY ./*.go /app/
 
-ARG TARGETOS
+ARG ARCH=amd64
-ARG TARGETARCH
 ARG VERSION=dev
-ENV CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=${TARGETARCH}
+ENV CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH}
 RUN go build -ldflags "-X main.version=${VERSION}" -a -installsuffix nocgo -o minitor .
 
-FROM alpine:3.18
+FROM ${REPO}/alpine:3.18
 RUN mkdir /app
 WORKDIR /app/
 
@@ -22,7 +22,7 @@ WORKDIR /app/
 COPY --from=builder /app/minitor .
 
 # Add common checking tools
-RUN apk --no-cache add bash=~5 curl=~8 jq=~1 bind-tools=~9 tzdata~=2024a
+RUN apk --no-cache add bash=~5 curl=~8 jq=~1 bind-tools=~9 tzdata~=2023c
 
 # Add minitor user for running as non-root
 RUN addgroup -S minitor && adduser -S minitor -G minitor

Makefile

@@ -79,11 +79,11 @@ $(TARGET_ALIAS):
 # Arch specific docker build targets
 .PHONY: docker-build-arm
 docker-build-arm: dist/minitor-linux-arm
-	docker build --platform linux/arm . -t ${DOCKER_TAG}-linux-arm
+	docker build --build-arg REPO=arm32v7 --build-arg ARCH=arm . -t ${DOCKER_TAG}-linux-arm
 
 .PHONY: docker-build-arm64
 docker-build-arm64: dist/minitor-linux-arm64
-	docker build  --platform linux/arm64 . -t ${DOCKER_TAG}-linux-arm64
+	docker build --build-arg REPO=arm64v8 --build-arg ARCH=arm64 . -t ${DOCKER_TAG}-linux-arm64
 
 # Cross run on host architechture
 .PHONY: docker-run-arm

README.md

@@ -118,16 +118,6 @@ To provide flexible formatting, the following non-standard functions are availab
 
 For more information, check out the [Go documentation for the time module](https://pkg.go.dev/time@go1.20.7#pkg-constants).
 
-#### Running alerts on startup
-
-It's not the best feeling to find out your alerts are broken when you're expecting to be alerted about another failure. To avoid this and provide early insight into broken alerts, it is possible to specify a list of alerts to run when Minitor starts up. This can be done using the command line flag `-startup-alerts`. This flag accepts a comma separated list of strings and will run a test of each of those alerts. Minitor will then respond as it typically does for any failed alert. This can be used to allow you time to correct when initially launching, and to allow schedulers to more easily detect a failed deployment of Minitor.
-
-Eg.
-
-```bash
-minitor -startup-alerts=log_down,log_up -config ./config.yml
-```
-
 ### Metrics
 
 Minitor supports exporting metrics for [Prometheus](https://prometheus.io/). Prometheus is an open source tool for reading and querying metrics from different sources. Combined with another tool, [Grafana](https://grafana.com/), it allows building of charts and dashboards. You could also opt to just use Minitor to log check results, and instead do your alerting with Grafana.

main.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"strings"
 	"time"
 
 	"git.iamthefij.com/iamthefij/slog"
@@ -92,38 +91,9 @@ func checkMonitors(config *Config) error {
 	return nil
 }
 
-func sendStartupAlerts(config *Config, alertNames []string) error {
-	for _, alertName := range alertNames {
-		var err error
-
-		alert, ok := config.Alerts[alertName]
-		if !ok {
-			err = fmt.Errorf("unknown alert %s: %w", alertName, errUnknownAlert)
-		}
-
-		if err == nil {
-			_, err = alert.Send(AlertNotice{
-				AlertCount:      0,
-				FailureCount:    0,
-				IsUp:            true,
-				LastSuccess:     time.Now(),
-				MonitorName:     fmt.Sprintf("First Run Alert Test: %s", alert.Name),
-				LastCheckOutput: "",
-			})
-		}
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 func main() {
 	showVersion := flag.Bool("version", false, "Display the version of minitor and exit")
 	configPath := flag.String("config", "config.yml", "Alternate configuration path (default: config.yml)")
-	startupAlerts := flag.String("startup-alerts", "", "List of alerts to run on startup. This can help determine unhealthy alerts early on. (default \"\")")
 
 	flag.BoolVar(&slog.DebugLevel, "debug", false, "Enables debug logs (default: false)")
 	flag.BoolVar(&ExportMetrics, "metrics", false, "Enables prometheus metrics exporting (default: false)")
@@ -138,10 +108,6 @@ func main() {
 		return
 	}
 
-	if PyCompat {
-		slog.Warningf("Python compatibility mode is enabled. This will be removed in the next major release. Please update your configuration.")
-	}
-
 	// Load configuration
 	config, err := LoadConfig(*configPath)
 	slog.OnErrFatalf(err, "Error loading config: %v", err)
@@ -153,14 +119,6 @@ func main() {
 		go ServeMetrics()
 	}
 
-	if *startupAlerts != "" {
-		alertNames := strings.Split(*startupAlerts, ",")
-
-		err = sendStartupAlerts(&config, alertNames)
-
-		slog.OnErrPanicf(err, "Error running startup alerts")
-	}
-
 	// Start main loop
 	for {
 		err = checkMonitors(&config)

main_test.go

@@ -134,64 +134,3 @@ func TestCheckMonitors(t *testing.T) {
 		}
 	}
 }
-
-func TestFirstRunAlerts(t *testing.T) {
-	cases := []struct {
-		config        Config
-		expectErr     bool
-		startupAlerts []string
-		name          string
-	}{
-		{
-			config:        Config{},
-			expectErr:     false,
-			startupAlerts: []string{},
-			name:          "Empty",
-		},
-		{
-			config:        Config{},
-			expectErr:     true,
-			startupAlerts: []string{"missing"},
-			name:          "Unknown",
-		},
-		{
-			config: Config{
-				Alerts: map[string]*Alert{
-					"good": {
-						Command: CommandOrShell{Command: []string{"true"}},
-					},
-				},
-			},
-			expectErr:     false,
-			startupAlerts: []string{"good"},
-			name:          "Successful alert",
-		},
-		{
-			config: Config{
-				Alerts: map[string]*Alert{
-					"bad": {
-						Name:    "bad",
-						Command: CommandOrShell{Command: []string{"false"}},
-					},
-				},
-			},
-			expectErr:     true,
-			startupAlerts: []string{"bad"},
-			name:          "Failed alert",
-		},
-	}
-
-	for _, c := range cases {
-		err := c.config.Init()
-		if err != nil {
-			t.Errorf("sendFirstRunAlerts(%s): unexpected error reading config: %v", c.name, err)
-		}
-
-		err = sendStartupAlerts(&c.config, c.startupAlerts)
-		if err == nil && c.expectErr {
-			t.Errorf("sendFirstRunAlerts(%s): Expected error, the code did not error", c.name)
-		} else if err != nil && !c.expectErr {
-			t.Errorf("sendFirstRunAlerts(%s): Did not expect an error, but we got one anyway: %v", c.name, err)
-		}
-	}
-}

manifest.tmpl

@@ -0,0 +1,25 @@
+image: iamthefij/minitor-go:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: iamthefij/minitor-go:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: iamthefij/minitor-go:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8
+  -
+    image: iamthefij/minitor-go:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm
+    platform:
+      architecture: arm
+      os: linux
+      variant: v7