diff --git a/.github/.testcoverage.yml b/.github/.testcoverage.yml index a16d4e5..f63cbad 100644 --- a/.github/.testcoverage.yml +++ b/.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: diff --git a/.gitignore b/.gitignore index 7056d1b..c868669 100644 --- a/.gitignore +++ b/.gitignore @@ -186,3 +186,6 @@ serviceradar-snmp-checker_* tls/client.csr tls/root.csr tls/server.csr + +# Ko build system for Go +.kodata diff --git a/.goreleaser.yml b/.goreleaser.yml index 3eb0cbc..f95046c 100644 --- a/.goreleaser.yml +++ b/.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 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 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 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 description: ServiceRadar Dusk Checker Component license: MIT diff --git a/Makefile b/Makefile index f37ebb8..1431406 100644 --- a/Makefile +++ b/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 . diff --git a/README.md b/README.md index 4a35a6d..f27996c 100644 --- a/README.md +++ b/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) -CLA assistant +[![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) +CLA assistant 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,8 +47,8 @@ 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 ``` @@ -56,21 +56,21 @@ 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 ``` diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 19b3a7e..1d793c6 100644 --- a/cmd/agent/main.go +++ b/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() { diff --git a/cmd/checkers/dusk/main.go b/cmd/checkers/dusk/main.go index 1d24598..7c57917 100644 --- a/cmd/checkers/dusk/main.go +++ b/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 ( diff --git a/cmd/checkers/snmp/main.go b/cmd/checkers/snmp/main.go index 20174c1..50daf08 100644 --- a/cmd/checkers/snmp/main.go +++ b/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 ( diff --git a/cmd/cloud/main.go b/cmd/cloud/main.go index f48aa7b..447e049 100644 --- a/cmd/cloud/main.go +++ b/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() { diff --git a/cmd/poller/main.go b/cmd/poller/main.go index 6a27f22..d15d187 100644 --- a/cmd/poller/main.go +++ b/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() { diff --git a/docs/docs/installation.md b/docs/docs/installation.md index 56782bb..3abddef 100644 --- a/docs/docs/installation.md +++ b/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 ``` \ No newline at end of file diff --git a/go.mod b/go.mod index e8dc4fb..b7270d5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mfreeman451/serviceradar +module github.com/carverauto/serviceradar go 1.24 diff --git a/k8s/demo/base/configmap.yaml b/k8s/demo/base/configmap.yaml index 7a35acc..618ea5d 100644 --- a/k8s/demo/base/configmap.yaml +++ b/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", diff --git a/k8s/demo/base/serviceradar-agent.yaml b/k8s/demo/base/serviceradar-agent.yaml index 8bb8f67..deb41e4 100644 --- a/k8s/demo/base/serviceradar-agent.yaml +++ b/k8s/demo/base/serviceradar-agent.yaml @@ -15,31 +15,48 @@ spec: hostNetwork: true imagePullSecrets: - name: ghcr-io-cred + initContainers: + - name: init-checkers + image: busybox:1.36 + command: ['sh', '-c', ' + mkdir -p /etc/serviceradar/checkers/sweep && + cp /config/snmp.json /etc/serviceradar/checkers/snmp.json && + cp /config/external.json /etc/serviceradar/checkers/external.json + '] + volumeMounts: + - name: serviceradar-config + mountPath: /config + - name: checkers-dir + mountPath: /etc/serviceradar/checkers containers: - - name: agent - image: ghcr.io/carverauto/serviceradar/serviceradar-agent:latest - volumeMounts: - - name: serviceradar-config - mountPath: /etc/serviceradar - env: - - name: SERVICERADAR_CONFIG_PATH - value: "/etc/serviceradar/agent.json" - - name: SERVICERADAR_POLLER_ADDR - value: "serviceradar-poller:8080" - - name: SERVICERADAR_NODE_ID - valueFrom: - fieldRef: - fieldPath: spec.nodeName - securityContext: - privileged: true - resources: - limits: - cpu: "200m" - memory: "128Mi" - requests: - cpu: "100m" - memory: "64Mi" + - name: agent + image: ghcr.io/carverauto/serviceradar/serviceradar-agent:latest + volumeMounts: + - name: serviceradar-config + mountPath: /etc/serviceradar + - name: checkers-dir + mountPath: /etc/serviceradar/checkers + env: + - name: SERVICERADAR_CONFIG_PATH + value: "/etc/serviceradar/agent.json" + - name: SERVICERADAR_POLLER_ADDR + value: "serviceradar-poller:8080" + - name: SERVICERADAR_NODE_ID + valueFrom: + fieldRef: + fieldPath: spec.nodeName + securityContext: + privileged: true + resources: + limits: + cpu: "200m" + memory: "128Mi" + requests: + cpu: "100m" + memory: "64Mi" volumes: - - name: serviceradar-config - configMap: - name: serviceradar-config + - name: serviceradar-config + configMap: + name: serviceradar-config + - name: checkers-dir + emptyDir: {} \ No newline at end of file diff --git a/pkg/agent/external_checker.go b/pkg/agent/external_checker.go index c5e8037..9603bc1 100644 --- a/pkg/agent/external_checker.go +++ b/pkg/agent/external_checker.go @@ -9,9 +9,9 @@ import ( "strings" "time" - grpcpkg "github.com/mfreeman451/serviceradar/pkg/grpc" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/proto" + grpcpkg "github.com/carverauto/serviceradar/pkg/grpc" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/proto" ) const ( diff --git a/pkg/agent/icmp_checker.go b/pkg/agent/icmp_checker.go index cd0e00a..b39731c 100644 --- a/pkg/agent/icmp_checker.go +++ b/pkg/agent/icmp_checker.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/pkg/scan" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/scan" ) type ICMPChecker struct { diff --git a/pkg/agent/interfaces.go b/pkg/agent/interfaces.go index 248f07a..8b4ff5d 100644 --- a/pkg/agent/interfaces.go +++ b/pkg/agent/interfaces.go @@ -3,10 +3,10 @@ package agent import ( "context" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/proto" ) -//go:generate mockgen -destination=mock_agent.go -package=agent github.com/mfreeman451/serviceradar/pkg/agent Service,SweepStatusProvider +//go:generate mockgen -destination=mock_agent.go -package=agent github.com/carverauto/serviceradar/pkg/agent Service,SweepStatusProvider type Service interface { Start(context.Context) error diff --git a/pkg/agent/mock_agent.go b/pkg/agent/mock_agent.go index da9f315..11a5500 100644 --- a/pkg/agent/mock_agent.go +++ b/pkg/agent/mock_agent.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/agent (interfaces: Service,SweepStatusProvider) +// Source: github.com/carverauto/serviceradar/pkg/agent (interfaces: Service,SweepStatusProvider) // // Generated by this command: // -// mockgen -destination=mock_agent.go -package=agent github.com/mfreeman451/serviceradar/pkg/agent Service,SweepStatusProvider +// mockgen -destination=mock_agent.go -package=agent github.com/carverauto/serviceradar/pkg/agent Service,SweepStatusProvider // // Package agent is a generated GoMock package. @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - proto "github.com/mfreeman451/serviceradar/proto" + proto "github.com/carverauto/serviceradar/proto" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/agent/registry.go b/pkg/agent/registry.go index 7e004b0..a324a0f 100644 --- a/pkg/agent/registry.go +++ b/pkg/agent/registry.go @@ -4,7 +4,7 @@ package agent import ( "context" - "github.com/mfreeman451/serviceradar/pkg/checker" + "github.com/carverauto/serviceradar/pkg/checker" ) func initRegistry() checker.Registry { diff --git a/pkg/agent/server.go b/pkg/agent/server.go index 25a2981..3c2a6eb 100644 --- a/pkg/agent/server.go +++ b/pkg/agent/server.go @@ -13,10 +13,10 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/checker" - "github.com/mfreeman451/serviceradar/pkg/grpc" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/pkg/checker" + "github.com/carverauto/serviceradar/pkg/grpc" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/proto" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/pkg/agent/server_test.go b/pkg/agent/server_test.go index d2fcbfe..8eaba51 100644 --- a/pkg/agent/server_test.go +++ b/pkg/agent/server_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/checker" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/pkg/checker" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/agent/snmp_checker.go b/pkg/agent/snmp_checker.go index dc44dc3..32e08ef 100644 --- a/pkg/agent/snmp_checker.go +++ b/pkg/agent/snmp_checker.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/checker" - "github.com/mfreeman451/serviceradar/pkg/checker/snmp" - "github.com/mfreeman451/serviceradar/pkg/config" - "github.com/mfreeman451/serviceradar/pkg/grpc" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/pkg/checker" + "github.com/carverauto/serviceradar/pkg/checker/snmp" + "github.com/carverauto/serviceradar/pkg/config" + "github.com/carverauto/serviceradar/pkg/grpc" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/proto" ) const ( diff --git a/pkg/agent/sweep_service.go b/pkg/agent/sweep_service.go index 4418e32..04ccf1d 100644 --- a/pkg/agent/sweep_service.go +++ b/pkg/agent/sweep_service.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/pkg/scan" - "github.com/mfreeman451/serviceradar/pkg/sweeper" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/scan" + "github.com/carverauto/serviceradar/pkg/sweeper" + "github.com/carverauto/serviceradar/proto" ) const ( diff --git a/pkg/agent/sweep_service_test.go b/pkg/agent/sweep_service_test.go index e84cd1d..6d176b6 100644 --- a/pkg/agent/sweep_service_test.go +++ b/pkg/agent/sweep_service_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/checker/dusk/config.go b/pkg/checker/dusk/config.go index 4a1cc0f..7a37b31 100644 --- a/pkg/checker/dusk/config.go +++ b/pkg/checker/dusk/config.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/mfreeman451/serviceradar/pkg/config" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/config" + "github.com/carverauto/serviceradar/pkg/models" ) // Config represents Dusk checker configuration. diff --git a/pkg/checker/dusk/dusk.go b/pkg/checker/dusk/dusk.go index 3db4bda..cc07240 100644 --- a/pkg/checker/dusk/dusk.go +++ b/pkg/checker/dusk/dusk.go @@ -12,9 +12,9 @@ import ( "sync" "time" + "github.com/carverauto/serviceradar/pkg/config" + "github.com/carverauto/serviceradar/proto" "github.com/gorilla/websocket" - "github.com/mfreeman451/serviceradar/pkg/config" - "github.com/mfreeman451/serviceradar/proto" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/pkg/checker/snmp/config.go b/pkg/checker/snmp/config.go index b1c0fb7..72dc648 100644 --- a/pkg/checker/snmp/config.go +++ b/pkg/checker/snmp/config.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/mfreeman451/serviceradar/pkg/config" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/config" + "github.com/carverauto/serviceradar/pkg/models" ) const ( diff --git a/pkg/checker/snmp/grpc_snmp.go b/pkg/checker/snmp/grpc_snmp.go index 5989c64..754505e 100644 --- a/pkg/checker/snmp/grpc_snmp.go +++ b/pkg/checker/snmp/grpc_snmp.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/status" diff --git a/pkg/checker/snmp/interfaces.go b/pkg/checker/snmp/interfaces.go index 1613b6a..9ea9e45 100644 --- a/pkg/checker/snmp/interfaces.go +++ b/pkg/checker/snmp/interfaces.go @@ -6,10 +6,10 @@ import ( "context" "time" - "github.com/mfreeman451/serviceradar/pkg/db" + "github.com/carverauto/serviceradar/pkg/db" ) -//go:generate mockgen -destination=mock_snmp.go -package=snmp github.com/mfreeman451/serviceradar/pkg/checker/snmp Collector,Aggregator,Service,CollectorFactory,AggregatorFactory,SNMPClient,SNMPManager,DataStore +//go:generate mockgen -destination=mock_snmp.go -package=snmp github.com/carverauto/serviceradar/pkg/checker/snmp Collector,Aggregator,Service,CollectorFactory,AggregatorFactory,SNMPClient,SNMPManager,DataStore // Collector defines how to collect SNMP data from a target. type Collector interface { diff --git a/pkg/checker/snmp/mock_snmp.go b/pkg/checker/snmp/mock_snmp.go index 30ac2ac..de2919d 100644 --- a/pkg/checker/snmp/mock_snmp.go +++ b/pkg/checker/snmp/mock_snmp.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/checker/snmp (interfaces: Collector,Aggregator,Service,CollectorFactory,AggregatorFactory,SNMPClient,SNMPManager,DataStore) +// Source: github.com/carverauto/serviceradar/pkg/checker/snmp (interfaces: Collector,Aggregator,Service,CollectorFactory,AggregatorFactory,SNMPClient,SNMPManager,DataStore) // // Generated by this command: // -// mockgen -destination=mock_snmp.go -package=snmp github.com/mfreeman451/serviceradar/pkg/checker/snmp Collector,Aggregator,Service,CollectorFactory,AggregatorFactory,SNMPClient,SNMPManager,DataStore +// mockgen -destination=mock_snmp.go -package=snmp github.com/carverauto/serviceradar/pkg/checker/snmp Collector,Aggregator,Service,CollectorFactory,AggregatorFactory,SNMPClient,SNMPManager,DataStore // // Package snmp is a generated GoMock package. @@ -14,7 +14,7 @@ import ( reflect "reflect" time "time" - db "github.com/mfreeman451/serviceradar/pkg/db" + db "github.com/carverauto/serviceradar/pkg/db" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/checker/snmp/service.go b/pkg/checker/snmp/service.go index c119369..be18c9a 100644 --- a/pkg/checker/snmp/service.go +++ b/pkg/checker/snmp/service.go @@ -9,7 +9,7 @@ import ( "log" "time" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/proto" ) const ( diff --git a/pkg/checker/snmp/snmp.go b/pkg/checker/snmp/snmp.go index dda246f..1d31e2e 100644 --- a/pkg/checker/snmp/snmp.go +++ b/pkg/checker/snmp/snmp.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/mfreeman451/serviceradar/pkg/db" + "github.com/carverauto/serviceradar/pkg/db" ) // SNMPMetricsManager implements the SNMPManager interface for handling SNMP metrics. diff --git a/pkg/checker/snmp/types.go b/pkg/checker/snmp/types.go index 85a849d..c6db0bd 100644 --- a/pkg/checker/snmp/types.go +++ b/pkg/checker/snmp/types.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/proto" ) // Interval represents a time interval for data aggregation. diff --git a/pkg/cloud/alerts/interfaces.go b/pkg/cloud/alerts/interfaces.go index 258789f..40ab027 100644 --- a/pkg/cloud/alerts/interfaces.go +++ b/pkg/cloud/alerts/interfaces.go @@ -1,6 +1,6 @@ // Package alerts pkg/cloud/alerts/interfaces.go -//go:generate mockgen -destination=mock_alerts.go -package=alerts github.com/mfreeman451/serviceradar/pkg/cloud/alerts AlertService +//go:generate mockgen -destination=mock_alerts.go -package=alerts github.com/carverauto/serviceradar/pkg/cloud/alerts AlertService package alerts diff --git a/pkg/cloud/alerts/mock_alerts.go b/pkg/cloud/alerts/mock_alerts.go index 2807cf1..2434b66 100644 --- a/pkg/cloud/alerts/mock_alerts.go +++ b/pkg/cloud/alerts/mock_alerts.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/cloud/alerts (interfaces: AlertService) +// Source: github.com/carverauto/serviceradar/pkg/cloud/alerts (interfaces: AlertService) // // Generated by this command: // -// mockgen -destination=mock_alerts.go -package=alerts github.com/mfreeman451/serviceradar/pkg/cloud/alerts AlertService +// mockgen -destination=mock_alerts.go -package=alerts github.com/carverauto/serviceradar/pkg/cloud/alerts AlertService // // Package alerts is a generated GoMock package. diff --git a/pkg/cloud/api/interfaces.go b/pkg/cloud/api/interfaces.go index 002661a..50f651a 100644 --- a/pkg/cloud/api/interfaces.go +++ b/pkg/cloud/api/interfaces.go @@ -1,6 +1,6 @@ package api -//go:generate mockgen -destination=mock_api_server.go -package=api github.com/mfreeman451/serviceradar/pkg/cloud/api Service +//go:generate mockgen -destination=mock_api_server.go -package=api github.com/carverauto/serviceradar/pkg/cloud/api Service // Service represents the API server functionality. type Service interface { diff --git a/pkg/cloud/api/mock_api_server.go b/pkg/cloud/api/mock_api_server.go index b533a01..6eb7250 100644 --- a/pkg/cloud/api/mock_api_server.go +++ b/pkg/cloud/api/mock_api_server.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/cloud/api (interfaces: Service) +// Source: github.com/carverauto/serviceradar/pkg/cloud/api (interfaces: Service) // // Generated by this command: // -// mockgen -destination=mock_api_server.go -package=api github.com/mfreeman451/serviceradar/pkg/cloud/api Service +// mockgen -destination=mock_api_server.go -package=api github.com/carverauto/serviceradar/pkg/cloud/api Service // // Package api is a generated GoMock package. diff --git a/pkg/cloud/api/server.go b/pkg/cloud/api/server.go index 4079265..27c0347 100644 --- a/pkg/cloud/api/server.go +++ b/pkg/cloud/api/server.go @@ -11,12 +11,12 @@ import ( "sync" "time" + "github.com/carverauto/serviceradar/pkg/checker/snmp" + "github.com/carverauto/serviceradar/pkg/db" + srHttp "github.com/carverauto/serviceradar/pkg/http" + "github.com/carverauto/serviceradar/pkg/metrics" + "github.com/carverauto/serviceradar/pkg/models" "github.com/gorilla/mux" - "github.com/mfreeman451/serviceradar/pkg/checker/snmp" - "github.com/mfreeman451/serviceradar/pkg/db" - srHttp "github.com/mfreeman451/serviceradar/pkg/http" - "github.com/mfreeman451/serviceradar/pkg/metrics" - "github.com/mfreeman451/serviceradar/pkg/models" ) type ServiceStatus struct { diff --git a/pkg/cloud/api/static_serve_container.go b/pkg/cloud/api/static_serve_container.go index c5d563e..74bf034 100644 --- a/pkg/cloud/api/static_serve_container.go +++ b/pkg/cloud/api/static_serve_container.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/mfreeman451/serviceradar/pkg/cloud/api/web" + "github.com/carverauto/serviceradar/pkg/cloud/api/web" ) // configureStaticServing sets up static file serving for container mode diff --git a/pkg/cloud/interfaces.go b/pkg/cloud/interfaces.go index 4caf88e..c594501 100644 --- a/pkg/cloud/interfaces.go +++ b/pkg/cloud/interfaces.go @@ -1,14 +1,14 @@ // Package cloud pkg/cloud/interfaces.go -//go:generate mockgen -destination=mock_server.go -package=cloud github.com/mfreeman451/serviceradar/pkg/cloud NodeService,CloudService +//go:generate mockgen -destination=mock_server.go -package=cloud github.com/carverauto/serviceradar/pkg/cloud NodeService,CloudService package cloud import ( "context" - "github.com/mfreeman451/serviceradar/pkg/cloud/api" - "github.com/mfreeman451/serviceradar/pkg/metrics" + "github.com/carverauto/serviceradar/pkg/cloud/api" + "github.com/carverauto/serviceradar/pkg/metrics" ) // NodeService represents node-related operations. diff --git a/pkg/cloud/mock_server.go b/pkg/cloud/mock_server.go index 6a086b5..ce8b4af 100644 --- a/pkg/cloud/mock_server.go +++ b/pkg/cloud/mock_server.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/cloud (interfaces: NodeService,CloudService) +// Source: github.com/carverauto/serviceradar/pkg/cloud (interfaces: NodeService,CloudService) // // Generated by this command: // -// mockgen -destination=mock_server.go -package=cloud github.com/mfreeman451/serviceradar/pkg/cloud NodeService,CloudService +// mockgen -destination=mock_server.go -package=cloud github.com/carverauto/serviceradar/pkg/cloud NodeService,CloudService // // Package cloud is a generated GoMock package. @@ -13,8 +13,8 @@ import ( context "context" reflect "reflect" - api "github.com/mfreeman451/serviceradar/pkg/cloud/api" - metrics "github.com/mfreeman451/serviceradar/pkg/metrics" + api "github.com/carverauto/serviceradar/pkg/cloud/api" + metrics "github.com/carverauto/serviceradar/pkg/metrics" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/cloud/node_recovery.go b/pkg/cloud/node_recovery.go index d93a803..397ae73 100644 --- a/pkg/cloud/node_recovery.go +++ b/pkg/cloud/node_recovery.go @@ -7,8 +7,8 @@ import ( "log" "time" - "github.com/mfreeman451/serviceradar/pkg/cloud/alerts" - "github.com/mfreeman451/serviceradar/pkg/db" + "github.com/carverauto/serviceradar/pkg/cloud/alerts" + "github.com/carverauto/serviceradar/pkg/db" ) // NodeRecoveryManager handles node recovery state transitions. diff --git a/pkg/cloud/node_recovery_test.go b/pkg/cloud/node_recovery_test.go index 47df903..45ac9a6 100644 --- a/pkg/cloud/node_recovery_test.go +++ b/pkg/cloud/node_recovery_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/cloud/alerts" - "github.com/mfreeman451/serviceradar/pkg/db" + "github.com/carverauto/serviceradar/pkg/cloud/alerts" + "github.com/carverauto/serviceradar/pkg/db" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/pkg/cloud/server.go b/pkg/cloud/server.go index 446d28b..d40e93f 100644 --- a/pkg/cloud/server.go +++ b/pkg/cloud/server.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "github.com/mfreeman451/serviceradar/pkg/checker/snmp" - "github.com/mfreeman451/serviceradar/pkg/cloud/alerts" - "github.com/mfreeman451/serviceradar/pkg/cloud/api" - "github.com/mfreeman451/serviceradar/pkg/db" - "github.com/mfreeman451/serviceradar/pkg/metrics" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/pkg/checker/snmp" + "github.com/carverauto/serviceradar/pkg/cloud/alerts" + "github.com/carverauto/serviceradar/pkg/cloud/api" + "github.com/carverauto/serviceradar/pkg/db" + "github.com/carverauto/serviceradar/pkg/metrics" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/proto" ) const ( diff --git a/pkg/cloud/server_test.go b/pkg/cloud/server_test.go index 7bebc7d..1e5bd36 100644 --- a/pkg/cloud/server_test.go +++ b/pkg/cloud/server_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/cloud/alerts" - "github.com/mfreeman451/serviceradar/pkg/cloud/api" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/pkg/cloud/alerts" + "github.com/carverauto/serviceradar/pkg/cloud/api" + "github.com/carverauto/serviceradar/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/cloud/types.go b/pkg/cloud/types.go index 6df08d8..d18f5c4 100644 --- a/pkg/cloud/types.go +++ b/pkg/cloud/types.go @@ -4,14 +4,14 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/checker/snmp" - "github.com/mfreeman451/serviceradar/pkg/cloud/alerts" - "github.com/mfreeman451/serviceradar/pkg/cloud/api" - "github.com/mfreeman451/serviceradar/pkg/db" - "github.com/mfreeman451/serviceradar/pkg/grpc" - "github.com/mfreeman451/serviceradar/pkg/metrics" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/pkg/checker/snmp" + "github.com/carverauto/serviceradar/pkg/cloud/alerts" + "github.com/carverauto/serviceradar/pkg/cloud/api" + "github.com/carverauto/serviceradar/pkg/db" + "github.com/carverauto/serviceradar/pkg/grpc" + "github.com/carverauto/serviceradar/pkg/metrics" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/proto" ) type Metrics struct { diff --git a/pkg/config/config.go b/pkg/config/config.go index 128abbc..6d98883 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) var ( diff --git a/pkg/db/interfaces.go b/pkg/db/interfaces.go index 1b3b196..2d8b329 100644 --- a/pkg/db/interfaces.go +++ b/pkg/db/interfaces.go @@ -5,7 +5,7 @@ import ( "time" ) -//go:generate mockgen -destination=mock_db.go -package=db github.com/mfreeman451/serviceradar/pkg/db Row,Result,Rows,Transaction,Service +//go:generate mockgen -destination=mock_db.go -package=db github.com/carverauto/serviceradar/pkg/db Row,Result,Rows,Transaction,Service // TimeseriesMetric represents a generic timeseries datapoint. type TimeseriesMetric struct { diff --git a/pkg/db/mock_db.go b/pkg/db/mock_db.go index 48abfc0..c36d2ac 100644 --- a/pkg/db/mock_db.go +++ b/pkg/db/mock_db.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/db (interfaces: Row,Result,Rows,Transaction,Service) +// Source: github.com/carverauto/serviceradar/pkg/db (interfaces: Row,Result,Rows,Transaction,Service) // // Generated by this command: // -// mockgen -destination=mock_db.go -package=db github.com/mfreeman451/serviceradar/pkg/db Row,Result,Rows,Transaction,Service +// mockgen -destination=mock_db.go -package=db github.com/carverauto/serviceradar/pkg/db Row,Result,Rows,Transaction,Service // // Package db is a generated GoMock package. diff --git a/pkg/grpc/cert_manager.go b/pkg/grpc/cert_manager.go index 1067fd0..f1ceac3 100644 --- a/pkg/grpc/cert_manager.go +++ b/pkg/grpc/cert_manager.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) const ( diff --git a/pkg/grpc/client.go b/pkg/grpc/client.go index 3726fb0..9fb9699 100644 --- a/pkg/grpc/client.go +++ b/pkg/grpc/client.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/keepalive" diff --git a/pkg/grpc/interfaces.go b/pkg/grpc/interfaces.go index 85f5680..222f345 100644 --- a/pkg/grpc/interfaces.go +++ b/pkg/grpc/interfaces.go @@ -6,7 +6,7 @@ import ( "google.golang.org/grpc" ) -//go:generate mockgen -destination=mock_grpc.go -package=grpc github.com/mfreeman451/serviceradar/pkg/grpc SecurityProvider +//go:generate mockgen -destination=mock_grpc.go -package=grpc github.com/carverauto/serviceradar/pkg/grpc SecurityProvider // SecurityProvider defines the interface for gRPC security providers. type SecurityProvider interface { diff --git a/pkg/grpc/mock_grpc.go b/pkg/grpc/mock_grpc.go index 6e37bc2..5158efc 100644 --- a/pkg/grpc/mock_grpc.go +++ b/pkg/grpc/mock_grpc.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/grpc (interfaces: SecurityProvider) +// Source: github.com/carverauto/serviceradar/pkg/grpc (interfaces: SecurityProvider) // // Generated by this command: // -// mockgen -destination=mock_grpc.go -package=grpc github.com/mfreeman451/serviceradar/pkg/grpc SecurityProvider +// mockgen -destination=mock_grpc.go -package=grpc github.com/carverauto/serviceradar/pkg/grpc SecurityProvider // // Package grpc is a generated GoMock package. diff --git a/pkg/grpc/security.go b/pkg/grpc/security.go index 5dd7378..fb8fa72 100644 --- a/pkg/grpc/security.go +++ b/pkg/grpc/security.go @@ -11,7 +11,7 @@ import ( "path/filepath" "sync" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/spiffe/go-spiffe/v2/spiffeid" "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" "github.com/spiffe/go-spiffe/v2/workloadapi" diff --git a/pkg/grpc/security_test.go b/pkg/grpc/security_test.go index 96f5531..f97b76c 100644 --- a/pkg/grpc/security_test.go +++ b/pkg/grpc/security_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/lifecycle/server.go b/pkg/lifecycle/server.go index 61f4c42..2800cc3 100644 --- a/pkg/lifecycle/server.go +++ b/pkg/lifecycle/server.go @@ -9,8 +9,8 @@ import ( "syscall" "time" - "github.com/mfreeman451/serviceradar/pkg/grpc" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/grpc" + "github.com/carverauto/serviceradar/pkg/models" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/pkg/metrics/buffer.go b/pkg/metrics/buffer.go index 925c016..c5b3d8f 100644 --- a/pkg/metrics/buffer.go +++ b/pkg/metrics/buffer.go @@ -5,7 +5,7 @@ import ( "sync/atomic" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) // metricPoint represents a single metric data point. diff --git a/pkg/metrics/buffer_bench_test.go b/pkg/metrics/buffer_bench_test.go index a6863f7..a5985e3 100644 --- a/pkg/metrics/buffer_bench_test.go +++ b/pkg/metrics/buffer_bench_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) // ChannelBuffer is a channel-based buffer implementation. diff --git a/pkg/metrics/buffer_test.go b/pkg/metrics/buffer_test.go index 833e002..e0a273f 100644 --- a/pkg/metrics/buffer_test.go +++ b/pkg/metrics/buffer_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "go.uber.org/mock/gomock" ) diff --git a/pkg/metrics/interfaces.go b/pkg/metrics/interfaces.go index 0ae7845..10d3453 100644 --- a/pkg/metrics/interfaces.go +++ b/pkg/metrics/interfaces.go @@ -3,10 +3,10 @@ package metrics import ( "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) -//go:generate mockgen -destination=mock_buffer.go -package=metrics github.com/mfreeman451/serviceradar/pkg/metrics MetricStore,MetricCollector +//go:generate mockgen -destination=mock_buffer.go -package=metrics github.com/carverauto/serviceradar/pkg/metrics MetricStore,MetricCollector type MetricStore interface { Add(timestamp time.Time, responseTime int64, serviceName string) diff --git a/pkg/metrics/manager.go b/pkg/metrics/manager.go index 945bb72..07558f4 100644 --- a/pkg/metrics/manager.go +++ b/pkg/metrics/manager.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) type Manager struct { diff --git a/pkg/metrics/mock_buffer.go b/pkg/metrics/mock_buffer.go index 54b61ec..292e526 100644 --- a/pkg/metrics/mock_buffer.go +++ b/pkg/metrics/mock_buffer.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/metrics (interfaces: MetricStore,MetricCollector) +// Source: github.com/carverauto/serviceradar/pkg/metrics (interfaces: MetricStore,MetricCollector) // // Generated by this command: // -// mockgen -destination=mock_buffer.go -package=metrics github.com/mfreeman451/serviceradar/pkg/metrics MetricStore,MetricCollector +// mockgen -destination=mock_buffer.go -package=metrics github.com/carverauto/serviceradar/pkg/metrics MetricStore,MetricCollector // // Package metrics is a generated GoMock package. @@ -13,7 +13,7 @@ import ( reflect "reflect" time "time" - models "github.com/mfreeman451/serviceradar/pkg/models" + models "github.com/carverauto/serviceradar/pkg/models" gomock "go.uber.org/mock/gomock" ) @@ -53,6 +53,20 @@ func (mr *MockMetricStoreMockRecorder) Add(timestamp, responseTime, serviceName return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockMetricStore)(nil).Add), timestamp, responseTime, serviceName) } +// GetLastPoint mocks base method. +func (m *MockMetricStore) GetLastPoint() *models.MetricPoint { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetLastPoint") + ret0, _ := ret[0].(*models.MetricPoint) + return ret0 +} + +// GetLastPoint indicates an expected call of GetLastPoint. +func (mr *MockMetricStoreMockRecorder) GetLastPoint() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLastPoint", reflect.TypeOf((*MockMetricStore)(nil).GetLastPoint)) +} + // GetPoints mocks base method. func (m *MockMetricStore) GetPoints() []models.MetricPoint { m.ctrl.T.Helper() @@ -105,6 +119,18 @@ func (mr *MockMetricCollectorMockRecorder) AddMetric(nodeID, timestamp, response return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddMetric", reflect.TypeOf((*MockMetricCollector)(nil).AddMetric), nodeID, timestamp, responseTime, serviceName) } +// CleanupStaleNodes mocks base method. +func (m *MockMetricCollector) CleanupStaleNodes(staleDuration time.Duration) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "CleanupStaleNodes", staleDuration) +} + +// CleanupStaleNodes indicates an expected call of CleanupStaleNodes. +func (mr *MockMetricCollectorMockRecorder) CleanupStaleNodes(staleDuration any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CleanupStaleNodes", reflect.TypeOf((*MockMetricCollector)(nil).CleanupStaleNodes), staleDuration) +} + // GetMetrics mocks base method. func (m *MockMetricCollector) GetMetrics(nodeID string) []models.MetricPoint { m.ctrl.T.Helper() diff --git a/pkg/poller/config.go b/pkg/poller/config.go index 9dd799f..9c64de3 100644 --- a/pkg/poller/config.go +++ b/pkg/poller/config.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/mfreeman451/serviceradar/pkg/config" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/config" + "github.com/carverauto/serviceradar/pkg/models" ) var ( diff --git a/pkg/poller/poller.go b/pkg/poller/poller.go index dcfa366..2ee18aa 100644 --- a/pkg/poller/poller.go +++ b/pkg/poller/poller.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/grpc" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/proto" + "github.com/carverauto/serviceradar/pkg/grpc" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/proto" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/pkg/scan/combined_scanner.go b/pkg/scan/combined_scanner.go index 8a09a97..7505308 100644 --- a/pkg/scan/combined_scanner.go +++ b/pkg/scan/combined_scanner.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) var ( diff --git a/pkg/scan/combined_scanner_test.go b/pkg/scan/combined_scanner_test.go index fd58b65..50fa3f9 100644 --- a/pkg/scan/combined_scanner_test.go +++ b/pkg/scan/combined_scanner_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/scan/icmp_scanner.go b/pkg/scan/icmp_scanner.go index 7074670..ef9943b 100644 --- a/pkg/scan/icmp_scanner.go +++ b/pkg/scan/icmp_scanner.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" "golang.org/x/time/rate" diff --git a/pkg/scan/icmp_scanner_integration_test.go b/pkg/scan/icmp_scanner_integration_test.go index e4cabbf..abdf3b0 100644 --- a/pkg/scan/icmp_scanner_integration_test.go +++ b/pkg/scan/icmp_scanner_integration_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/scan/icmp_scanner_test.go b/pkg/scan/icmp_scanner_test.go index 9b621d0..53df5e6 100644 --- a/pkg/scan/icmp_scanner_test.go +++ b/pkg/scan/icmp_scanner_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/scan/interfaces.go b/pkg/scan/interfaces.go index 6af576f..2fd96e7 100644 --- a/pkg/scan/interfaces.go +++ b/pkg/scan/interfaces.go @@ -3,10 +3,10 @@ package scan import ( "context" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) -//go:generate mockgen -destination=mock_scanner.go -package=scan github.com/mfreeman451/serviceradar/pkg/scan Scanner,ResultProcessor +//go:generate mockgen -destination=mock_scanner.go -package=scan github.com/carverauto/serviceradar/pkg/scan Scanner,ResultProcessor // Scanner defines how to perform network sweeps. type Scanner interface { diff --git a/pkg/scan/mock_scanner.go b/pkg/scan/mock_scanner.go index 2f1cfea..2649027 100644 --- a/pkg/scan/mock_scanner.go +++ b/pkg/scan/mock_scanner.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/scan (interfaces: Scanner,ResultProcessor) +// Source: github.com/carverauto/serviceradar/pkg/scan (interfaces: Scanner,ResultProcessor) // // Generated by this command: // -// mockgen -destination=mock_scanner.go -package=scan github.com/mfreeman451/serviceradar/pkg/scan Scanner,ResultProcessor +// mockgen -destination=mock_scanner.go -package=scan github.com/carverauto/serviceradar/pkg/scan Scanner,ResultProcessor // // Package scan is a generated GoMock package. @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - models "github.com/mfreeman451/serviceradar/pkg/models" + models "github.com/carverauto/serviceradar/pkg/models" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/scan/tcp_scanner.go b/pkg/scan/tcp_scanner.go index 29613e2..bd7c02a 100644 --- a/pkg/scan/tcp_scanner.go +++ b/pkg/scan/tcp_scanner.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) const ( diff --git a/pkg/scan/tcp_scanner_test.go b/pkg/scan/tcp_scanner_test.go index ea2d322..db7a614 100644 --- a/pkg/scan/tcp_scanner_test.go +++ b/pkg/scan/tcp_scanner_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/stretchr/testify/require" ) diff --git a/pkg/sweeper/base_processor.go b/pkg/sweeper/base_processor.go index 403e85f..4ffcc12 100644 --- a/pkg/sweeper/base_processor.go +++ b/pkg/sweeper/base_processor.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) const ( diff --git a/pkg/sweeper/base_processor_test.go b/pkg/sweeper/base_processor_test.go index 33d8088..a9f3cca 100644 --- a/pkg/sweeper/base_processor_test.go +++ b/pkg/sweeper/base_processor_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/sweeper/interfaces.go b/pkg/sweeper/interfaces.go index e3318fe..d6a394d 100644 --- a/pkg/sweeper/interfaces.go +++ b/pkg/sweeper/interfaces.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) -//go:generate mockgen -destination=mock_sweeper.go -package=sweeper github.com/mfreeman451/serviceradar/pkg/sweeper Sweeper,ResultProcessor,Store,Reporter,SweepService +//go:generate mockgen -destination=mock_sweeper.go -package=sweeper github.com/carverauto/serviceradar/pkg/sweeper Sweeper,ResultProcessor,Store,Reporter,SweepService // ResultProcessor defines how to process and aggregate sweep results. type ResultProcessor interface { diff --git a/pkg/sweeper/memory_store.go b/pkg/sweeper/memory_store.go index 15a310c..95c9f50 100644 --- a/pkg/sweeper/memory_store.go +++ b/pkg/sweeper/memory_store.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) const ( diff --git a/pkg/sweeper/mock_sweeper.go b/pkg/sweeper/mock_sweeper.go index b199dc2..34b12c9 100644 --- a/pkg/sweeper/mock_sweeper.go +++ b/pkg/sweeper/mock_sweeper.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/mfreeman451/serviceradar/pkg/sweeper (interfaces: Sweeper,ResultProcessor,Store,Reporter,SweepService) +// Source: github.com/carverauto/serviceradar/pkg/sweeper (interfaces: Sweeper,ResultProcessor,Store,Reporter,SweepService) // // Generated by this command: // -// mockgen -destination=mock_sweeper.go -package=sweeper github.com/mfreeman451/serviceradar/pkg/sweeper Sweeper,ResultProcessor,Store,Reporter,SweepService +// mockgen -destination=mock_sweeper.go -package=sweeper github.com/carverauto/serviceradar/pkg/sweeper Sweeper,ResultProcessor,Store,Reporter,SweepService // // Package sweeper is a generated GoMock package. @@ -14,7 +14,7 @@ import ( reflect "reflect" time "time" - models "github.com/mfreeman451/serviceradar/pkg/models" + models "github.com/carverauto/serviceradar/pkg/models" gomock "go.uber.org/mock/gomock" ) @@ -86,17 +86,17 @@ func (mr *MockSweeperMockRecorder) Start(arg0 any) *gomock.Call { } // Stop mocks base method. -func (m *MockSweeper) Stop() error { +func (m *MockSweeper) Stop(ctx context.Context) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Stop") + ret := m.ctrl.Call(m, "Stop", ctx) ret0, _ := ret[0].(error) return ret0 } // Stop indicates an expected call of Stop. -func (mr *MockSweeperMockRecorder) Stop() *gomock.Call { +func (mr *MockSweeperMockRecorder) Stop(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockSweeper)(nil).Stop)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockSweeper)(nil).Stop), ctx) } // UpdateConfig mocks base method. @@ -166,18 +166,6 @@ func (mr *MockResultProcessorMockRecorder) Process(result any) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Process", reflect.TypeOf((*MockResultProcessor)(nil).Process), result) } -// Reset mocks base method. -func (m *MockResultProcessor) Reset() { - m.ctrl.T.Helper() - m.ctrl.Call(m, "Reset") -} - -// Reset indicates an expected call of Reset. -func (mr *MockResultProcessorMockRecorder) Reset() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Reset", reflect.TypeOf((*MockResultProcessor)(nil).Reset)) -} - // MockStore is a mock of Store interface. type MockStore struct { ctrl *gomock.Controller diff --git a/pkg/sweeper/sqlite_store.go b/pkg/sweeper/sqlite_store.go index b53da3a..4dfec3d 100644 --- a/pkg/sweeper/sqlite_store.go +++ b/pkg/sweeper/sqlite_store.go @@ -8,7 +8,7 @@ import ( "log" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" ) const ( diff --git a/pkg/sweeper/sweeper.go b/pkg/sweeper/sweeper.go index 7dbeeb0..6b94889 100644 --- a/pkg/sweeper/sweeper.go +++ b/pkg/sweeper/sweeper.go @@ -13,8 +13,8 @@ import ( "sync/atomic" "time" - "github.com/mfreeman451/serviceradar/pkg/models" - "github.com/mfreeman451/serviceradar/pkg/scan" + "github.com/carverauto/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/scan" ) const ( diff --git a/pkg/sweeper/sweeper_test.go b/pkg/sweeper/sweeper_test.go index baec5be..70b14d7 100644 --- a/pkg/sweeper/sweeper_test.go +++ b/pkg/sweeper/sweeper_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mfreeman451/serviceradar/pkg/models" + "github.com/carverauto/serviceradar/pkg/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" @@ -29,10 +29,10 @@ func TestMockSweeper(t *testing.T) { // Test Stop mockSweeper.EXPECT(). - Stop(). + Stop(ctx). Return(nil) - err = mockSweeper.Stop() + err = mockSweeper.Stop(ctx) assert.NoError(t, err) }) @@ -131,13 +131,6 @@ func TestMockResultProcessor(t *testing.T) { require.NoError(t, err) assert.Equal(t, expectedSummary, summary) }) - - t.Run("Reset", func(*testing.T) { - mockProcessor.EXPECT(). - Reset() - - mockProcessor.Reset() - }) } func TestMockStore(t *testing.T) { diff --git a/proto/monitoring.proto b/proto/monitoring.proto index 1ba63bb..acae120 100644 --- a/proto/monitoring.proto +++ b/proto/monitoring.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package monitoring; -option go_package = "github.com/mfreeman451/serviceradar/proto"; +option go_package = "github.com/carverauto/serviceradar/proto"; service AgentService { rpc GetStatus(StatusRequest) returns (StatusResponse) {}