From 95b9b272c3a5a7a26284a4c2e1cd1698dfb2489f Mon Sep 17 00:00:00 2001
From: Bartek Tofel <tofel.b@gmail.com>
Date: Wed, 9 Sep 2026 10:56:10 +0200
Subject: [PATCH 1/2] chore: address code review comments

---
 .../cmd/grafana-alertcheck/check.go           | 13 +++++--
 .../cmd/grafana-alertcheck/watch.go           |  8 +++++
 grafana-alertcheck/internal/gate/classify.go  |  2 +-
 grafana-alertcheck/internal/gate/coverage.go  |  2 +-
 .../internal/gate/parse_ruler.go              |  2 +-
 .../internal/gate/parse_state_test.go         |  4 ---
 grafana-alertcheck/internal/gate/schedule.go  | 15 +++++---
 grafana-alertcheck/internal/gate/source.go    | 34 ++++++++-----------
 8 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/check.go b/grafana-alertcheck/cmd/grafana-alertcheck/check.go
index 5493ed747..e95fce376 100644
--- a/grafana-alertcheck/cmd/grafana-alertcheck/check.go
+++ b/grafana-alertcheck/cmd/grafana-alertcheck/check.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -40,6 +41,13 @@ func runCheck(args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 	output := fs.String("output", "", `"json" writes the machine-readable Result to stdout in addition to the table; default is the table alone`)
 
 	if err := fs.Parse(args); err != nil {
+		if errors.Is(err, flag.ErrHelp) {
+			return 0
+		}
+		return 2
+	}
+	if fs.NArg() != 0 {
+		fmt.Fprintf(stderr, "check: unexpected arguments %v\n", fs.Args())
 		return 2
 	}
 	if *output != "" && *output != "json" {
@@ -113,11 +121,10 @@ func runCheck(args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 
 	result, checkErr := gate.Check(ctx, cfg)
 
-	if err := renderTable(stderr, result); err != nil {
-		fmt.Fprintln(stderr, err)
-	}
 	if checkErr != nil {
 		fmt.Fprintln(stderr, checkErr)
+	} else if err := renderTable(stderr, result); err != nil {
+		fmt.Fprintln(stderr, err)
 	}
 	if *output == "json" {
 		enc := json.NewEncoder(stdout)
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/watch.go b/grafana-alertcheck/cmd/grafana-alertcheck/watch.go
index d6db86672..69b585298 100644
--- a/grafana-alertcheck/cmd/grafana-alertcheck/watch.go
+++ b/grafana-alertcheck/cmd/grafana-alertcheck/watch.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -49,6 +50,13 @@ func runWatch(args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 	readyFD := fs.Int(gate.ReadyFDFlag[2:], 0, "")
 
 	if err := fs.Parse(args); err != nil {
+		if errors.Is(err, flag.ErrHelp) {
+			return 0
+		}
+		return 2
+	}
+	if fs.NArg() != 0 {
+		fmt.Fprintf(stderr, "watch: unexpected arguments %v\n", fs.Args())
 		return 2
 	}
 
diff --git a/grafana-alertcheck/internal/gate/classify.go b/grafana-alertcheck/internal/gate/classify.go
index d5d9c8e12..d8d058a34 100644
--- a/grafana-alertcheck/internal/gate/classify.go
+++ b/grafana-alertcheck/internal/gate/classify.go
@@ -476,7 +476,7 @@ func decide(h Header, polls []Poll, sentinel *time.Time, defs []Definition,
 		Thresholds:     make(map[string]RuleThresholds),
 		Global: GlobalThresholds{
 			TransitionGrace: gt.transitionGrace,
-			GraceSource:     gt.graceSource,
+			GraceSource:     graceSourceOrNone(gt.graceSource),
 			DrainTimeout:    gt.drainTimeout,
 		},
 	}
diff --git a/grafana-alertcheck/internal/gate/coverage.go b/grafana-alertcheck/internal/gate/coverage.go
index 535af07d2..603a7f7d8 100644
--- a/grafana-alertcheck/internal/gate/coverage.go
+++ b/grafana-alertcheck/internal/gate/coverage.go
@@ -146,7 +146,7 @@ func proveCoverage(h Header, polls []Poll, sentinel *time.Time, t ruleTimings, d
 		// corrupted or hand-edited data (ReadLog does no field validation);
 		// GrafanaNow-LastEvaluation would go negative and silently read as
 		// fresh — fail-open. Treat it as unobservable instead.
-		if p.LastEvaluation.After(p.GrafanaNow) {
+		if p.LastEvaluation.Truncate(time.Second).After(p.GrafanaNow) {
 			fail(ReasonFutureEvaluation, fmt.Sprintf(
 				"lastEvaluation %s is after grafana_now %s (corrupted poll)",
 				p.LastEvaluation.Format(time.RFC3339), p.GrafanaNow.Format(time.RFC3339)))
diff --git a/grafana-alertcheck/internal/gate/parse_ruler.go b/grafana-alertcheck/internal/gate/parse_ruler.go
index ae878d4c9..5517fcce2 100644
--- a/grafana-alertcheck/internal/gate/parse_ruler.go
+++ b/grafana-alertcheck/internal/gate/parse_ruler.go
@@ -84,7 +84,7 @@ func ParseDefinitions(body []byte) ([]Definition, error) {
 func parseDefinition(raw json.RawMessage, folder, group string) (Definition, error) {
 	var m map[string]json.RawMessage
 	if err := json.Unmarshal(raw, &m); err != nil {
-		return Definition{}, fmt.Errorf("%w", err)
+		return Definition{}, err
 	}
 
 	var forStr string
diff --git a/grafana-alertcheck/internal/gate/parse_state_test.go b/grafana-alertcheck/internal/gate/parse_state_test.go
index 9e2ed899c..f55c10185 100644
--- a/grafana-alertcheck/internal/gate/parse_state_test.go
+++ b/grafana-alertcheck/internal/gate/parse_state_test.go
@@ -217,10 +217,6 @@ func TestInstanceKey(t *testing.T) {
 	require.Equal(t, "null", instanceKey(nil), "instanceKey(nil) should be \"null\"")
 }
 
-<<<<<<< HEAD
-// Label values may contain "\n" or "="; the JSON encoding must keep them distinct.
-=======
->>>>>>> c276546b (chore: use testify's require in tests)
 func TestInstanceKey_NoCollision(t *testing.T) {
 	require.NotEqual(t, instanceKey(map[string]string{"a": "1\nb=2"}), instanceKey(map[string]string{"a": "1", "b": "2"}), "instanceKey should not collide for sets {a:1\\nb=2} and {a:1,b:2}")
 
diff --git a/grafana-alertcheck/internal/gate/schedule.go b/grafana-alertcheck/internal/gate/schedule.go
index ae366baf4..c2fe6e1c5 100644
--- a/grafana-alertcheck/internal/gate/schedule.go
+++ b/grafana-alertcheck/internal/gate/schedule.go
@@ -339,6 +339,16 @@ func CheckBudget(t map[string]ruleTimings, measured map[string]time.Duration, co
 	return fmt.Errorf("%s", b.String())
 }
 
+// graceSourceOrNone is the single "none" default for the grace-source field:
+// an empty source means no rule contributed a transitionGrace. Applied here so
+// StartupSummary and the human table print the same thing.
+func graceSourceOrNone(source string) string {
+	if source == "" {
+		return "none"
+	}
+	return source
+}
+
 // StartupSummary formats the pre-run print an operator sees before the wait:
 // the total planned run time and the rule (with its `for` value) that set
 // transitionGrace, plus a warning when the grace eats more than
@@ -347,10 +357,7 @@ func CheckBudget(t map[string]ruleTimings, measured map[string]time.Duration, co
 func StartupSummary(from, to time.Time, global globalTimings) (summary, warning string) {
 	window := to.Sub(from)
 	total := window + global.transitionGrace + global.drainTimeout
-	source := global.graceSource
-	if source == "" {
-		source = "none"
-	}
+	source := graceSourceOrNone(global.graceSource)
 	summary = fmt.Sprintf(
 		"planned run time: %s\n  window %s + transitionGrace %s + drainTimeout %s\n  transitionGrace source: %s",
 		total, window, global.transitionGrace, global.drainTimeout, source)
diff --git a/grafana-alertcheck/internal/gate/source.go b/grafana-alertcheck/internal/gate/source.go
index bebb1839e..721151e21 100644
--- a/grafana-alertcheck/internal/gate/source.go
+++ b/grafana-alertcheck/internal/gate/source.go
@@ -44,9 +44,10 @@ type Observation struct {
 	Latency    time.Duration // t_send through the full body read — see requestResult.Latency
 }
 
-// TransportError marks a failure worth retrying: a non-2xx response, a network
-// failure, or a body that failed to parse. Not a deleted rule (an authoritative
-// 2xx) and not a clock problem (a hard error — see doRequest).
+// TransportError marks a failure worth retrying: a 5xx/429 response, a network
+// failure, or a body that failed to parse. Not a 4xx (wrong auth, missing
+// resource), not a deleted rule (an authoritative 2xx) and not a clock problem
+// (a hard error — see doRequest).
 type TransportError struct {
 	Err    error
 	Status int // 0 when the failure never got a status (network/transport failure)
@@ -111,17 +112,7 @@ func parseGrafanaVersion(s string) (grafanaVersion, error) {
 	var v grafanaVersion
 	fields := [3]*int{&v.major, &v.minor, &v.patch}
 	for i, field := range fields {
-		// Trim any trailing non-digit suffix (prerelease/build metadata, e.g.
-		// "0+security") rather than requiring an exact numeric match.
-		digits := parts[i]
-		j := 0
-		for j < len(digits) && digits[j] >= '0' && digits[j] <= '9' {
-			j++
-		}
-		if j == 0 {
-			return grafanaVersion{}, fmt.Errorf("unparseable version %q", s)
-		}
-		n, err := strconv.Atoi(digits[:j])
+		n, err := strconv.Atoi(parts[i])
 		if err != nil {
 			return grafanaVersion{}, fmt.Errorf("unparseable version %q: %w", s, err)
 		}
@@ -259,10 +250,11 @@ type requestResult struct {
 	Latency time.Duration
 }
 
-// doRequest performs one HTTP GET and classifies the outcome: network failure,
-// non-2xx, or body-read failure is retryable (*TransportError); a missing or
-// unparseable Date header or a skew beyond SkewHardLimit is a hard error —
-// retrying can never fix either, so neither enters the backoff loop.
+// doRequest performs one HTTP GET and classifies the outcome: a 5xx/429, a
+// network failure, or a body-read failure is retryable (*TransportError); a
+// 4xx (wrong auth, missing resource — retrying cannot fix it), a missing or
+// unparseable Date header, or a skew beyond SkewHardLimit is a hard error, so
+// none of those enters the backoff loop.
 //
 // The Date/skew check runs on every endpoint (even /api/health): a skew only
 // noticed once RuleState starts polling has already masked earlier reads, so it
@@ -298,7 +290,11 @@ func (s *httpSource) doRequest(ctx context.Context, path string) (requestResult,
 	latency := tBodyRead.Sub(tSend)
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return requestResult{}, &TransportError{Err: fmt.Errorf("unexpected status %d", resp.StatusCode), Status: resp.StatusCode}
+		err := fmt.Errorf("unexpected status %d", resp.StatusCode)
+		if resp.StatusCode >= 400 && resp.StatusCode < 500 && resp.StatusCode != http.StatusTooManyRequests {
+			return requestResult{}, err
+		}
+		return requestResult{}, &TransportError{Err: err, Status: resp.StatusCode}
 	}
 
 	dateHeader := resp.Header.Get("Date")

From c8d0cc5dc8c1efdf0dad4d476e49b1af3a22a439 Mon Sep 17 00:00:00 2001
From: Bartek Tofel <tofel.b@gmail.com>
Date: Wed, 9 Sep 2026 11:09:59 +0200
Subject: [PATCH 2/2] chore: get rid of goreleaser

---
 .../workflows/grafana-alertcheck-release.yml  | 34 -------------------
 grafana-alertcheck/.goreleaser.yaml           | 33 ------------------
 .../cmd/{grafana-alertcheck => }/check.go     |  0
 .../{grafana-alertcheck => }/check_test.go    |  0
 .../cmd/{grafana-alertcheck => }/common.go    |  0
 .../cmd/{grafana-alertcheck => }/env.go       |  0
 .../cmd/grafana-alertcheck/version.go         | 29 ----------------
 .../cmd/grafana-alertcheck/version_test.go    | 25 --------------
 .../cmd/{grafana-alertcheck => }/list.go      |  0
 .../cmd/{grafana-alertcheck => }/list_test.go |  0
 .../cmd/{grafana-alertcheck => }/main.go      |  4 +--
 .../cmd/{grafana-alertcheck => }/main_test.go |  0
 .../cmd/{grafana-alertcheck => }/style.go     |  0
 .../cmd/{grafana-alertcheck => }/table.go     |  0
 .../{grafana-alertcheck => }/table_test.go    |  0
 .../cmd/{grafana-alertcheck => }/watch.go     |  0
 .../{grafana-alertcheck => }/watch_test.go    |  0
 grafana-alertcheck/docs/index.md              |  2 +-
 18 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 .github/workflows/grafana-alertcheck-release.yml
 delete mode 100644 grafana-alertcheck/.goreleaser.yaml
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/check.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/check_test.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/common.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/env.go (100%)
 delete mode 100644 grafana-alertcheck/cmd/grafana-alertcheck/version.go
 delete mode 100644 grafana-alertcheck/cmd/grafana-alertcheck/version_test.go
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/list.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/list_test.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/main.go (91%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/main_test.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/style.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/table.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/table_test.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/watch.go (100%)
 rename grafana-alertcheck/cmd/{grafana-alertcheck => }/watch_test.go (100%)

diff --git a/.github/workflows/grafana-alertcheck-release.yml b/.github/workflows/grafana-alertcheck-release.yml
deleted file mode 100644
index 4f946b18f..000000000
--- a/.github/workflows/grafana-alertcheck-release.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Grafana Alertcheck Release
-
-on:
-  push:
-    tags:
-      - grafana-alertcheck/v*
-
-jobs:
-  release:
-    name: Build and Release
-    runs-on: ubuntu-latest
-    environment: integration
-    permissions:
-      id-token: write
-      contents: write
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v7
-        with:
-          go-version-file: ./grafana-alertcheck/go.mod
-          cache-dependency-path: ./grafana-alertcheck/go.mod
-      - name: Goreleaser Release
-        uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7.2.3
-        with:
-          distribution: goreleaser-pro
-          version: "~> v2"
-          args: release --clean -f ./grafana-alertcheck/.goreleaser.yaml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
diff --git a/grafana-alertcheck/.goreleaser.yaml b/grafana-alertcheck/.goreleaser.yaml
deleted file mode 100644
index 0890d9f82..000000000
--- a/grafana-alertcheck/.goreleaser.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
-version: 2
-project_name: grafana-alertcheck
-
-dist: grafana-alertcheck/dist
-
-monorepo:
-  tag_prefix: grafana-alertcheck/
-  dir: grafana-alertcheck
-
-builds:
-  - id: grafana-alertcheck
-    main: ./cmd/grafana-alertcheck/main.go
-    ldflags:
-      - -s
-      - -w
-      - -X github.com/smartcontractkit/chainlink-testing-framework/grafana-alertcheck/cmd/grafana-alertcheck.version={{.Version}}
-      - -X github.com/smartcontractkit/chainlink-testing-framework/grafana-alertcheck/cmd/grafana-alertcheck.commit={{.ShortCommit}}
-      - -X github.com/smartcontractkit/chainlink-testing-framework/grafana-alertcheck/cmd/grafana-alertcheck.date={{.CommitDate}}
-      - -X github.com/smartcontractkit/chainlink-testing-framework/grafana-alertcheck/cmd/grafana-alertcheck.builtBy=goreleaser
-    goos:
-      - linux
-      - darwin
-    goarch:
-      - amd64
-      - arm64
-    binary: grafana-alertcheck
-    env:
-      - CGO_ENABLED=0
-
-before:
-  hooks:
-    - sh -c "cd grafana-alertcheck && go mod tidy"
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/check.go b/grafana-alertcheck/cmd/check.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/check.go
rename to grafana-alertcheck/cmd/check.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/check_test.go b/grafana-alertcheck/cmd/check_test.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/check_test.go
rename to grafana-alertcheck/cmd/check_test.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/common.go b/grafana-alertcheck/cmd/common.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/common.go
rename to grafana-alertcheck/cmd/common.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/env.go b/grafana-alertcheck/cmd/env.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/env.go
rename to grafana-alertcheck/cmd/env.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/version.go b/grafana-alertcheck/cmd/grafana-alertcheck/version.go
deleted file mode 100644
index 5cf68b6af..000000000
--- a/grafana-alertcheck/cmd/grafana-alertcheck/version.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-)
-
-// Build metadata. These are package-level variables so goreleaser's ldflags
-// (-X) can stamp them at build time; left unstamped they fall back to the
-// "dev" defaults below, which is what a plain `go build` produces.
-var (
-	version = "dev"
-	commit  = "unknown"
-	date    = "unknown"
-	builtBy = "unknown"
-)
-
-// runVersion prints the build metadata to stdout. Unlike list/watch/check it
-// needs no Grafana connection, so it never touches the environment or the
-// network; it exists purely so operators can answer "what am I running?"
-// against a deployed binary.
-func runVersion(args []string, stdout, stderr io.Writer) int {
-	if len(args) != 0 {
-		fmt.Fprintf(stderr, "version takes no arguments, got %v\n", args)
-		return 2
-	}
-	fmt.Fprintf(stdout, "version: %s\ncommit:  %s\ndate:    %s\nbuiltBy: %s\n", version, commit, date, builtBy)
-	return 0
-}
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/version_test.go b/grafana-alertcheck/cmd/grafana-alertcheck/version_test.go
deleted file mode 100644
index 9463e990c..000000000
--- a/grafana-alertcheck/cmd/grafana-alertcheck/version_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestRunVersion(t *testing.T) {
-	var stdout, stderr bytes.Buffer
-	code := run([]string{"version"}, &stdout, &stderr)
-	require.Equal(t, 0, code)
-	out := stdout.String()
-	for _, want := range []string{"version:", "commit:", "date:", "builtBy:"} {
-		require.Contains(t, out, want)
-	}
-	require.Empty(t, stderr.String())
-}
-
-func TestRunVersion_RejectsArgs(t *testing.T) {
-	var stdout, stderr bytes.Buffer
-	code := run([]string{"version", "extra"}, &stdout, &stderr)
-	require.Equal(t, 2, code)
-}
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/list.go b/grafana-alertcheck/cmd/list.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/list.go
rename to grafana-alertcheck/cmd/list.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/list_test.go b/grafana-alertcheck/cmd/list_test.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/list_test.go
rename to grafana-alertcheck/cmd/list_test.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/main.go b/grafana-alertcheck/cmd/main.go
similarity index 91%
rename from grafana-alertcheck/cmd/grafana-alertcheck/main.go
rename to grafana-alertcheck/cmd/main.go
index 2672de1a3..7ab5d6397 100644
--- a/grafana-alertcheck/cmd/grafana-alertcheck/main.go
+++ b/grafana-alertcheck/cmd/main.go
@@ -12,7 +12,7 @@ func main() {
 	os.Exit(run(os.Args[1:], os.Stdout, os.Stderr))
 }
 
-const usage = "usage: grafana-alertcheck <list|watch|check|version>"
+const usage = "usage: grafana-alertcheck <list|watch|check>"
 
 // run is the whole of main's testable surface: parse the subcommand, dispatch,
 // return the process exit code. Exit codes below 2 (pass/violations) belong to
@@ -37,8 +37,6 @@ func run(args []string, stdout, stderr io.Writer) int {
 		return runWatch(args[1:], os.Stdin, stdout, stderr)
 	case "check":
 		return runCheck(args[1:], os.Stdin, stdout, stderr)
-	case "version":
-		return runVersion(args[1:], stdout, stderr)
 	case "-h", "-help", "--help":
 		fmt.Fprintln(stdout, usage)
 		return 0
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/main_test.go b/grafana-alertcheck/cmd/main_test.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/main_test.go
rename to grafana-alertcheck/cmd/main_test.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/style.go b/grafana-alertcheck/cmd/style.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/style.go
rename to grafana-alertcheck/cmd/style.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/table.go b/grafana-alertcheck/cmd/table.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/table.go
rename to grafana-alertcheck/cmd/table.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/table_test.go b/grafana-alertcheck/cmd/table_test.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/table_test.go
rename to grafana-alertcheck/cmd/table_test.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/watch.go b/grafana-alertcheck/cmd/watch.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/watch.go
rename to grafana-alertcheck/cmd/watch.go
diff --git a/grafana-alertcheck/cmd/grafana-alertcheck/watch_test.go b/grafana-alertcheck/cmd/watch_test.go
similarity index 100%
rename from grafana-alertcheck/cmd/grafana-alertcheck/watch_test.go
rename to grafana-alertcheck/cmd/watch_test.go
diff --git a/grafana-alertcheck/docs/index.md b/grafana-alertcheck/docs/index.md
index e8289a664..95d413772 100644
--- a/grafana-alertcheck/docs/index.md
+++ b/grafana-alertcheck/docs/index.md
@@ -23,7 +23,7 @@ It **fails closed**: if it cannot get an answer, it stops the release. It never
 ## Install
 
 ```bash
-go install github.com/smartcontractkit/chainlink-testing-framework/grafana-alertcheck/cmd/grafana-alertcheck@latest
+go install github.com/smartcontractkit/chainlink-testing-framework/grafana-alertcheck/cmd@latest
 ```
 
 Connection details come from the environment — the token is env-only, never a flag: