Merge pull request #247 from carverauto/updates/k8s_demo

updated renaming from mfreeman451 to carverauto, fixed sweeper test a…

.github/.testcoverage.yml

@@ -9,7 +9,7 @@ profile: cover.out
 
 # (optional; but recommended to set)
 # When specified reported file paths will not contain local prefix in the output
-local-prefix: "github.com/mfreeman451/serviceradar"
+local-prefix: "github.com/carverauto/serviceradar"
 
 # Holds coverage thresholds percentages, values should be in range [0-100]
 threshold:

.gitignore

@@ -186,3 +186,6 @@ serviceradar-snmp-checker_*
 tls/client.csr
 tls/root.csr
 tls/server.csr
+
+# Ko build system for Go
+.kodata

.goreleaser.yml

@@ -62,7 +62,7 @@ nfpms:
     builds:
       - agent
     vendor: ServiceRadar
-    homepage: https://github.com/mfreeman451/serviceradar
+    homepage: https://github.com/carverauto/serviceradar
     maintainer: Michael Freeman <[email protected]>
     description: ServiceRadar Agent Component
     license: MIT
@@ -86,7 +86,7 @@ nfpms:
     builds:
       - poller
     vendor: ServiceRadar
-    homepage: https://github.com/mfreeman451/serviceradar
+    homepage: https://github.com/carverauto/serviceradar
     maintainer: Michael Freeman <[email protected]>
     description: ServiceRadar Poller Component
     license: MIT
@@ -110,7 +110,7 @@ nfpms:
     builds:
       - serviceradar-cloud
     vendor: ServiceRadar
-    homepage: https://github.com/mfreeman451/serviceradar
+    homepage: https://github.com/carverauto/serviceradar
     maintainer: Michael Freeman <[email protected]>
     description: ServiceRadar Cloud Component
     license: MIT
@@ -139,7 +139,7 @@ nfpms:
     builds:
       - dusk-checker
     vendor: ServiceRadar
-    homepage: https://github.com/mfreeman451/serviceradar
+    homepage: https://github.com/carverauto/serviceradar
     maintainer: Michael Freeman <[email protected]>
     description: ServiceRadar Dusk Checker Component
     license: MIT

Makefile

@@ -107,10 +107,15 @@ kodata-prep: build-web ## Prepare kodata directories
 
 .PHONY: container-build
 container-build: kodata-prep ## Build container images with ko
-	@echo "$(COLOR_BOLD)Building container images with ko (broken on arm64)$(COLOR_RESET)"
+	@echo "$(COLOR_BOLD)Building container images with ko$(COLOR_RESET)"
 	@cd cmd/agent && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-agent GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION) --bare .
 	@cd cmd/poller && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-poller GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION) --bare .
-	@cd cmd/cloud && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-cloud GOFLAGS="-tags=containers" CGO_ENABLED=1 ko build --platform=$(PLATFORMS) --tags=$(VERSION) --bare --builder=docker .
+	@echo "$(COLOR_BOLD)Building cloud container with CGO using Docker (amd64 only)$(COLOR_RESET)"
+	@docker buildx build --platform=linux/amd64 -f Dockerfile.build \
+		-t $(KO_DOCKER_REPO)/serviceradar-cloud:$(VERSION) \
+		--build-arg VERSION=$(VERSION) \
+		--build-arg BUILD_TAGS=containers \
+		--push .
 	@cd cmd/checkers/dusk && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-dusk-checker GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION) --bare .
 	@cd cmd/checkers/snmp && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-snmp-checker GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION) --bare .
 
@@ -119,7 +124,13 @@ container-push: kodata-prep ## Build and push container images with ko
 	@echo "$(COLOR_BOLD)Building and pushing container images with ko$(COLOR_RESET)"
 	@cd cmd/agent && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-agent GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION),latest --bare .
 	@cd cmd/poller && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-poller GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION),latest --bare .
-	@cd cmd/cloud && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-cloud GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION),latest --bare .
+	@echo "$(COLOR_BOLD)Building and pushing cloud container with CGO using Docker (amd64 only)$(COLOR_RESET)"
+	@docker buildx build --platform=linux/amd64 -f Dockerfile.build \
+		-t $(KO_DOCKER_REPO)/serviceradar-cloud:$(VERSION) \
+		-t $(KO_DOCKER_REPO)/serviceradar-cloud:latest \
+		--build-arg VERSION=$(VERSION) \
+		--build-arg BUILD_TAGS=containers \
+		--push .
 	@cd cmd/checkers/dusk && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-dusk-checker GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION),latest --bare .
 	@cd cmd/checkers/snmp && KO_DOCKER_REPO=$(KO_DOCKER_REPO)/serviceradar-snmp-checker GOFLAGS="-tags=containers" ko build --platform=$(PLATFORMS) --tags=$(VERSION),latest --bare .
 

README.md

@@ -1,10 +1,10 @@
 # ServiceRadar
 
-[![releases](https://github.com/mfreeman451/serviceradar/actions/workflows/release.yml/badge.svg)](https://github.com/mfreeman451/serviceradar/actions/workflows/release.yml)
-[![linter](https://github.com/mfreeman451/serviceradar/actions/workflows/golangci-lint.yml/badge.svg)](https://github.com/mfreeman451/serviceradar/actions/workflows/golangci-lint.yml)
-[![tests](https://github.com/mfreeman451/serviceradar/actions/workflows/tests.yml/badge.svg)](https://github.com/mfreeman451/serviceradar/actions/workflows/tests.yml)
-[![coverage](https://github.com/mfreeman451/serviceradar/actions/workflows/go-coverage.yml/badge.svg)](https://github.com/mfreeman451/serviceradar/actions/workflows/go-coverage.yml)
-<a href="https://cla-assistant.io/mfreeman451/serviceradar"><img src="https://cla-assistant.io/readme/badge/mfreeman451/serviceradar" alt="CLA assistant" /></a>
+[![releases](https://github.com/carverauto/serviceradar/actions/workflows/release.yml/badge.svg)](https://github.com/carverauto/serviceradar/actions/workflows/release.yml)
+[![linter](https://github.com/carverauto/serviceradar/actions/workflows/golangci-lint.yml/badge.svg)](https://github.com/carverauto/serviceradar/actions/workflows/golangci-lint.yml)
+[![tests](https://github.com/carverauto/serviceradar/actions/workflows/tests.yml/badge.svg)](https://github.com/carverauto/serviceradar/actions/workflows/tests.yml)
+[![coverage](https://github.com/carverauto/serviceradar/actions/workflows/go-coverage.yml/badge.svg)](https://github.com/carverauto/serviceradar/actions/workflows/go-coverage.yml)
+<a href="https://cla-assistant.io/carverauto/serviceradar"><img src="https://cla-assistant.io/readme/badge/carverauto/serviceradar" alt="CLA assistant" /></a>
 
 ServiceRadar is a distributed network monitoring system designed for infrastructure and services in hard to reach places or constrained environments. 
 It provides real-time monitoring of internal services, with cloud-based alerting capabilities to ensure you stay informed even during network or power outages.
@@ -47,30 +47,30 @@ ServiceRadar can be installed via direct downloads from GitHub releases.
 Install these components on your monitored host:
 ```bash
 # Download and install core components
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb \
-     -O https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-poller_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb \
+     -O https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-poller_1.0.19.deb
 
 sudo dpkg -i serviceradar-agent_1.0.19.deb serviceradar-poller_1.0.19.deb
 ```
 
 On a separate machine (recommended) or the same host:
 ```bash
 # Download and install cloud service
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-cloud_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-cloud_1.0.19.deb
 sudo dpkg -i serviceradar-cloud_1.0.19.deb
 ```
 
 #### Optional: SNMP Polling
 Download and install the SNMP checker to collect and visualize metrics:
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-snmp-checker_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-snmp-checker_1.0.19.deb
 sudo dpkg -i serviceradar-snmp-checker_1.0.19.deb
 ```
 
 #### Optional: Dusk Node Monitoring
 If you're running a [Dusk](https://dusk.network/) node and want specialized monitoring:
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-dusk-checker_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-dusk-checker_1.0.19.deb
 sudo dpkg -i serviceradar-dusk-checker_1.0.19.deb
 ```
 
@@ -79,19 +79,19 @@ For larger deployments where components run on different hosts:
 
 1. On monitored hosts:
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb
 sudo dpkg -i serviceradar-agent_1.0.19.deb
 ```
 
 2. On monitoring host:
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-poller_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-poller_1.0.19.deb
 sudo dpkg -i serviceradar-poller_1.0.19.deb
 ```
 
 3. On cloud host:
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-cloud_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-cloud_1.0.19.deb
 sudo dpkg -i serviceradar-cloud_1.0.19.deb
 ```
 
@@ -170,7 +170,7 @@ ServiceRadar components are distributed as Debian packages. Each component has i
 
 1. Clone the repository:
 ```bash
-git clone https://github.com/mfreeman451/serviceradar.git
+git clone https://github.com/carverauto/serviceradar.git
 cd serviceradar
 ```
 

cmd/agent/main.go

@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mfreeman451/serviceradar/pkg/agent"
-	"github.com/mfreeman451/serviceradar/pkg/config"
-	"github.com/mfreeman451/serviceradar/pkg/grpc"
-	"github.com/mfreeman451/serviceradar/pkg/lifecycle"
-	"github.com/mfreeman451/serviceradar/proto"
+	"github.com/carverauto/serviceradar/pkg/agent"
+	"github.com/carverauto/serviceradar/pkg/config"
+	"github.com/carverauto/serviceradar/pkg/grpc"
+	"github.com/carverauto/serviceradar/pkg/lifecycle"
+	"github.com/carverauto/serviceradar/proto"
 )
 
 func main() {

cmd/checkers/dusk/main.go

@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/mfreeman451/serviceradar/pkg/checker/dusk"
-	"github.com/mfreeman451/serviceradar/pkg/config"
-	"github.com/mfreeman451/serviceradar/pkg/grpc"
-	"github.com/mfreeman451/serviceradar/pkg/lifecycle"
-	"github.com/mfreeman451/serviceradar/proto"
+	"github.com/carverauto/serviceradar/pkg/checker/dusk"
+	"github.com/carverauto/serviceradar/pkg/config"
+	"github.com/carverauto/serviceradar/pkg/grpc"
+	"github.com/carverauto/serviceradar/pkg/lifecycle"
+	"github.com/carverauto/serviceradar/proto"
 )
 
 var (

cmd/checkers/snmp/main.go

@@ -7,11 +7,11 @@ import (
 	"log"
 	"time"
 
-	"github.com/mfreeman451/serviceradar/pkg/checker/snmp"
-	"github.com/mfreeman451/serviceradar/pkg/config"
-	"github.com/mfreeman451/serviceradar/pkg/grpc"
-	"github.com/mfreeman451/serviceradar/pkg/lifecycle"
-	"github.com/mfreeman451/serviceradar/proto"
+	"github.com/carverauto/serviceradar/pkg/checker/snmp"
+	"github.com/carverauto/serviceradar/pkg/config"
+	"github.com/carverauto/serviceradar/pkg/grpc"
+	"github.com/carverauto/serviceradar/pkg/lifecycle"
+	"github.com/carverauto/serviceradar/proto"
 )
 
 const (

cmd/cloud/main.go

@@ -5,11 +5,11 @@ import (
 	"flag"
 	"log"
 
-	"github.com/mfreeman451/serviceradar/pkg/cloud"
-	"github.com/mfreeman451/serviceradar/pkg/cloud/api"
-	"github.com/mfreeman451/serviceradar/pkg/grpc"
-	"github.com/mfreeman451/serviceradar/pkg/lifecycle"
-	"github.com/mfreeman451/serviceradar/proto"
+	"github.com/carverauto/serviceradar/pkg/cloud"
+	"github.com/carverauto/serviceradar/pkg/cloud/api"
+	"github.com/carverauto/serviceradar/pkg/grpc"
+	"github.com/carverauto/serviceradar/pkg/lifecycle"
+	"github.com/carverauto/serviceradar/proto"
 )
 
 func main() {

cmd/poller/main.go

@@ -5,11 +5,11 @@ import (
 	"flag"
 	"log"
 
-	"github.com/mfreeman451/serviceradar/pkg/config"
-	"github.com/mfreeman451/serviceradar/pkg/grpc"
-	"github.com/mfreeman451/serviceradar/pkg/lifecycle"
-	"github.com/mfreeman451/serviceradar/pkg/poller"
-	"github.com/mfreeman451/serviceradar/proto"
+	"github.com/carverauto/serviceradar/pkg/config"
+	"github.com/carverauto/serviceradar/pkg/grpc"
+	"github.com/carverauto/serviceradar/pkg/lifecycle"
+	"github.com/carverauto/serviceradar/pkg/poller"
+	"github.com/carverauto/serviceradar/proto"
 )
 
 func main() {

docs/docs/installation.md

@@ -13,15 +13,15 @@ Install these components on your monitored host:
 
 ```bash
 # Download and install core components
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-poller_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-poller_1.0.19.deb
 sudo dpkg -i serviceradar-agent_1.0.19.deb serviceradar-poller_1.0.19.deb
 ```
 
 On a separate machine (recommended) or the same host for the cloud service:
 
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-cloud_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-cloud_1.0.19.deb
 sudo dpkg -i serviceradar-cloud_1.0.19.deb
 ```
 
@@ -32,7 +32,7 @@ sudo dpkg -i serviceradar-cloud_1.0.19.deb
 For collecting and visualizing metrics:
 
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-snmp-checker_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-snmp-checker_1.0.19.deb
 sudo dpkg -i serviceradar-snmp-checker_1.0.19.deb
 ```
 
@@ -41,7 +41,7 @@ sudo dpkg -i serviceradar-snmp-checker_1.0.19.deb
 For specialized monitoring of Dusk nodes:
 
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb
 sudo dpkg -i serviceradar-agent_1.0.19.deb
 ```
 
@@ -52,20 +52,20 @@ For larger deployments, install components on separate hosts:
 1. On monitored hosts:
 
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-agent_1.0.19.deb
 sudo dpkg -i serviceradar-agent_1.0.19.deb
 ```
 
 2. On monitoring host:
 
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-poller_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-poller_1.0.19.deb
 sudo dpkg -i serviceradar-poller_1.0.19.deb
 ```
 
 3. On cloud host:
 
 ```bash
-curl -LO https://github.com/mfreeman451/serviceradar/releases/download/1.0.19/serviceradar-cloud_1.0.19.deb
+curl -LO https://github.com/carverauto/serviceradar/releases/download/1.0.19/serviceradar-cloud_1.0.19.deb
 sudo dpkg -i serviceradar-cloud_1.0.19.deb
 ```

go.mod

@@ -1,4 +1,4 @@
-module github.com/mfreeman451/serviceradar
+module github.com/carverauto/serviceradar
 
 go 1.24
 

k8s/demo/base/configmap.yaml

@@ -128,7 +128,12 @@ data:
       "timeout": "10s"
     } 
 
-  snmp-checker.json: |
+  external.json: |
+    {
+      "enabled": true
+    }
+
+  snmp.json: |
     {
       "node_address": "localhost:50051",
       "listen_addr": ":50054",