diff --git a/.goreleaser-ci.yaml b/.goreleaser-ci.yaml index bda07c53..152207f5 100644 --- a/.goreleaser-ci.yaml +++ b/.goreleaser-ci.yaml @@ -13,14 +13,14 @@ builds: - arm64 dockers: - image_templates: - - "ghcr.io/caas-team/sparrow:{{ .Version }}" + - "ghcr.io/telekom/sparrow:{{ .Version }}" - "mtr.devops.telekom.de/sparrow/sparrow:{{ .Version }}" dockerfile: Dockerfile build_flag_templates: - --label=org.opencontainers.image.title={{ .ProjectName }} - --label=org.opencontainers.image.description="This is a pre-release version. Do not use this in production!" - --label=org.opencontainers.image.url=https://caas.telekom.de - - --label=org.opencontainers.image.source=https://github.com/caas-team/sparrow + - --label=org.opencontainers.image.source=https://github.com/telekom/sparrow - --label=org.opencontainers.image.version={{ .Version }} - --label=org.opencontainers.image.created={{ .Timestamp }} - --label=org.opencontainers.image.revision={{ .FullCommit }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 359b91fd..e96c30d4 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -11,10 +11,10 @@ builds: - arm64 dockers: - image_templates: - - "ghcr.io/caas-team/sparrow:latest" - - "ghcr.io/caas-team/sparrow:{{ .Tag }}" - - "ghcr.io/caas-team/sparrow:v{{ .Major }}.{{ .Minor }}" - - "ghcr.io/caas-team/sparrow:v{{ .Major }}" + - "ghcr.io/telekom/sparrow:latest" + - "ghcr.io/telekom/sparrow:{{ .Tag }}" + - "ghcr.io/telekom/sparrow:v{{ .Major }}.{{ .Minor }}" + - "ghcr.io/telekom/sparrow:v{{ .Major }}" - "mtr.devops.telekom.de/sparrow/sparrow:latest" - "mtr.devops.telekom.de/sparrow/sparrow:{{ .Tag }}" - "mtr.devops.telekom.de/sparrow/sparrow:v{{ .Major }}.{{ .Minor }}" @@ -24,7 +24,7 @@ dockers: - --label=org.opencontainers.image.title={{ .ProjectName }} - --label=org.opencontainers.image.description={{ .ProjectName }} - --label=org.opencontainers.image.url=https://caas.telekom.de - - --label=org.opencontainers.image.source=https://github.com/caas-team/sparrow + - --label=org.opencontainers.image.source=https://github.com/telekom/sparrow - --label=org.opencontainers.image.version={{ .Version }} - --label=org.opencontainers.image.created={{ .Timestamp }} - --label=org.opencontainers.image.revision={{ .FullCommit }} @@ -33,7 +33,7 @@ nfpms: - maintainer: CaaS description: |- Monitoring tool to gather infrastructure network information - homepage: https://github.com/caas-team + homepage: https://github.com/telekom license: Apache 2.0 formats: - deb diff --git a/README.md b/README.md index 89aaf7c7..97c09720 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@

- Last Commit - Open Issues + Last Commit + Open Issues License

@@ -73,7 +73,7 @@ ensuring robust monitoring and quick detection of potential issues. The `sparrow` is provided as a small binary & a container image. -Please refer to the [release notes](https://github.com/caas-team/sparrow/releases) to get the latest version. +Please refer to the [release notes](https://github.com/telekom/sparrow/releases) to get the latest version. ### Binary @@ -87,8 +87,8 @@ export RELEASE_VERSION=0.5.0 Download the binary: ```sh -curl https://github.com/caas-team/sparrow/releases/download/v${RELEASE_VERSION}/sparrow_${RELEASE_VERSION}_linux_amd64.tar.gz -Lo sparrow.tar.gz -curl https://github.com/caas-team/sparrow/releases/download/v${RELEASE_VERSION}/sparrow_${RELEASE_VERSION}_checksums.txt -Lo checksums.txt +curl https://github.com/telekom/sparrow/releases/download/v${RELEASE_VERSION}/sparrow_${RELEASE_VERSION}_linux_amd64.tar.gz -Lo sparrow.tar.gz +curl https://github.com/telekom/sparrow/releases/download/v${RELEASE_VERSION}/sparrow_${RELEASE_VERSION}_checksums.txt -Lo checksums.txt ``` Extract the binary: @@ -99,15 +99,15 @@ tar -xf sparrow.tar.gz ### Container Image -The [sparrow container images](https://github.com/caas-team/sparrow/pkgs/container/sparrow) for -dedicated [release](https://github.com/caas-team/sparrow/releases) can be found in the GitHub registry. +The [sparrow container images](https://github.com/telekom/sparrow/pkgs/container/sparrow) for +dedicated [release](https://github.com/telekom/sparrow/releases) can be found in the GitHub registry. ### Helm Sparrow can be installed via Helm Chart. The chart is available in the GitHub registry: ```sh -helm -n sparrow upgrade -i sparrow oci://ghcr.io/caas-team/charts/sparrow --create-namespace +helm -n sparrow upgrade -i sparrow oci://ghcr.io/telekom/charts/sparrow --create-namespace ``` The default settings are suitable for a local configuration. With the default Helm values, the sparrow loader uses a @@ -151,12 +151,12 @@ sparrow run --sparrowName sparrow.telekom.de ### Image -Run a `sparrow` container by using e.g. `docker run ghcr.io/caas-team/sparrow`. +Run a `sparrow` container by using e.g. `docker run ghcr.io/telekom/sparrow`. -Pass the available configuration arguments to the container e.g. `docker run ghcr.io/caas-team/sparrow --help`. +Pass the available configuration arguments to the container e.g. `docker run ghcr.io/telekom/sparrow --help`. Start the instance using a mounted startup configuration file -e.g. `docker run -v /config:/config ghcr.io/caas-team/sparrow --config /config/config.yaml`. +e.g. `docker run -v /config:/config ghcr.io/telekom/sparrow --config /config/config.yaml`. ## Configuration @@ -710,9 +710,9 @@ The application itself and all end-user facing content will be made available in The following channels are available for discussions, feedback, and support requests: -| Type | Channel | -| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| **Issues** | Issues | +| Type | Channel | +| ---------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **Issues** | Issues | ## How to Contribute diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 600ef2cb..676b218a 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -6,13 +6,19 @@ keywords: - monitoring version: 0.0.4 appVersion: "v0.5.0" -icon: https://github.com/caas-team/sparrow/blob/main/docs/img/sparrow.png +icon: https://github.com/telekom/sparrow/blob/main/docs/img/sparrow.png sources: - - https://github.com/caas-team/sparrow + - https://github.com/telekom/sparrow maintainers: - - name: eumel8 - email: f.kloeker@telekom.de - url: https://www.telekom.com - name: y-eight email: maximilian.schubert@telekom.de url: https://www.telekom.com + - name: puffitos + email: bruno.bressi@telekom.de + url: https://www.telekom.com + - name: ntreml + email: niklas.treml@telekom.de + url: https://www.telekom.com + - name: lvlcn-t + email: tom.vendolsky@telekom.de + url: https://www.telekom.com diff --git a/chart/README.md b/chart/README.md index 36e13fdc..c15b3c83 100644 --- a/chart/README.md +++ b/chart/README.md @@ -8,25 +8,27 @@ A Helm chart to install Sparrow | Name | Email | Url | | ---- | ------ | --- | -| eumel8 | | | | y-eight | | | +| puffitos | | | +| ntreml | | | +| lvlcn-t | | | ## Source Code -* +* ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | | -| checksConfig | object | `{}` | Check configuration of the Sparrow read on runtime see: https://github.com/caas-team/sparrow?tab=readme-ov-file#checks | +| checksConfig | object | `{}` | Check configuration of the Sparrow read on runtime see: https://github.com/telekom/sparrow?tab=readme-ov-file#checks | | env | object | `{}` | | | envFromSecrets | list | `[]` | extra environment variables Allows you to set environment variables through secrets you defined outside of the helm chart Useful for sensitive information like the http loader token | -| extraArgs | object | `{}` | Extra command line start parameters see: https://github.com/caas-team/sparrow/blob/main/docs/sparrow_run.md | +| extraArgs | object | `{}` | Extra command line start parameters see: https://github.com/telekom/sparrow/blob/main/docs/sparrow_run.md | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.repository | string | `"ghcr.io/caas-team/sparrow"` | | +| image.repository | string | `"ghcr.io/telekom/sparrow"` | | | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. | | imagePullSecrets | list | `[]` | | | ingress.annotations | object | `{}` | | @@ -64,7 +66,7 @@ A Helm chart to install Sparrow | serviceMonitor.interval | string | `"30s"` | Sets the scrape interval | | serviceMonitor.labels | object | `{}` | Additional label added to the service Monitor | | serviceMonitor.scrapeTimeout | string | `"5s"` | Sets the scrape timeout | -| sparrowConfig | object | `{"loader":{"file":{"path":"/config/checks.yaml"},"interval":"30s","type":"file"},"name":"sparrow.com"}` | Sparrow configuration read on startup see: https://github.com/caas-team/sparrow/blob/main/docs/sparrow_run.md | +| sparrowConfig | object | `{"loader":{"file":{"path":"/config/checks.yaml"},"interval":"30s","type":"file"},"name":"sparrow.com"}` | Sparrow configuration read on startup see: https://github.com/telekom/sparrow/blob/main/docs/sparrow_run.md | | startupProbe | object | `{"enabled":false,"failureThreshold":10,"initialDelaySeconds":10,"path":"/","periodSeconds":5,"successThreshold":1,"timeoutSeconds":1}` | Specifies the configuration for a startup probe to check if the sparrow application is started. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ | | tolerations | list | `[]` | | diff --git a/chart/values.yaml b/chart/values.yaml index 21bfa8cd..6143dfcd 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: - repository: ghcr.io/caas-team/sparrow + repository: ghcr.io/telekom/sparrow pullPolicy: IfNotPresent # -- Overrides the image tag whose default is the chart appVersion. tag: "" @@ -127,7 +127,7 @@ tolerations: [] affinity: {} # -- Extra command line start parameters -# see: https://github.com/caas-team/sparrow/blob/main/docs/sparrow_run.md +# see: https://github.com/telekom/sparrow/blob/main/docs/sparrow_run.md extraArgs: {} # -- extra environment variables @@ -141,7 +141,7 @@ envFromSecrets: # key: SPARROW_LOADER_HTTP_TOKEN # -- Sparrow configuration read on startup -# see: https://github.com/caas-team/sparrow/blob/main/docs/sparrow_run.md +# see: https://github.com/telekom/sparrow/blob/main/docs/sparrow_run.md sparrowConfig: name: sparrow.com loader: @@ -176,7 +176,7 @@ sparrowConfig: # projectId: "" # -- Check configuration of the Sparrow read on runtime -# see: https://github.com/caas-team/sparrow?tab=readme-ov-file#checks +# see: https://github.com/telekom/sparrow?tab=readme-ov-file#checks checksConfig: {} # health: # interval: 15s diff --git a/cmd/run.go b/cmd/run.go index 1c1bffd0..6cea2eee 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -29,9 +29,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/config" - "github.com/caas-team/sparrow/pkg/sparrow" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/config" + "github.com/telekom/sparrow/pkg/sparrow" ) const ( diff --git a/go.mod b/go.mod index 27ab7c11..641b92ec 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/caas-team/sparrow +module github.com/telekom/sparrow go 1.23 diff --git a/internal/helper/retry.go b/internal/helper/retry.go index d1086716..53fbea20 100644 --- a/internal/helper/retry.go +++ b/internal/helper/retry.go @@ -24,7 +24,7 @@ import ( "math" "time" - "github.com/caas-team/sparrow/internal/logger" + "github.com/telekom/sparrow/internal/logger" ) type RetryConfig struct { diff --git a/main.go b/main.go index ba7422e4..a2e1b088 100644 --- a/main.go +++ b/main.go @@ -19,10 +19,10 @@ package main import ( - "github.com/caas-team/sparrow/cmd" + "github.com/telekom/sparrow/cmd" ) -// Version is the current version of sparrow +// version is the current version of sparrow // It is set at build time by using -ldflags "-X main.version=x.x.x" var version string diff --git a/pkg/api/api.go b/pkg/api/api.go index ccaac8b0..4f78f0fe 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -25,8 +25,8 @@ import ( "net/http" "time" - "github.com/caas-team/sparrow/internal/logger" "github.com/go-chi/chi/v5" + "github.com/telekom/sparrow/internal/logger" ) //go:generate moq -out api_moq.go . API diff --git a/pkg/checks/base.go b/pkg/checks/base.go index c9f45604..25062237 100644 --- a/pkg/checks/base.go +++ b/pkg/checks/base.go @@ -23,9 +23,9 @@ import ( "sync" "time" - "github.com/caas-team/sparrow/internal/helper" "github.com/getkin/kin-openapi/openapi3" "github.com/prometheus/client_golang/prometheus" + "github.com/telekom/sparrow/internal/helper" ) // DefaultRetry provides a default configuration for the retry mechanism diff --git a/pkg/checks/dns/config.go b/pkg/checks/dns/config.go index 6fc97d31..7ba9e03f 100644 --- a/pkg/checks/dns/config.go +++ b/pkg/checks/dns/config.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/pkg/checks" ) const ( diff --git a/pkg/checks/dns/dns.go b/pkg/checks/dns/dns.go index ad33ba23..fea07cb7 100644 --- a/pkg/checks/dns/dns.go +++ b/pkg/checks/dns/dns.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks" "github.com/getkin/kin-openapi/openapi3" "github.com/prometheus/client_golang/prometheus" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks" ) var ( diff --git a/pkg/checks/dns/dns_test.go b/pkg/checks/dns/dns_test.go index bcf7cc81..9bac405a 100644 --- a/pkg/checks/dns/dns_test.go +++ b/pkg/checks/dns/dns_test.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/health" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/health" "github.com/stretchr/testify/assert" ) diff --git a/pkg/checks/dns/metrics.go b/pkg/checks/dns/metrics.go index 1b5725e1..5854136d 100644 --- a/pkg/checks/dns/metrics.go +++ b/pkg/checks/dns/metrics.go @@ -19,8 +19,8 @@ package dns import ( - "github.com/caas-team/sparrow/pkg/checks" "github.com/prometheus/client_golang/prometheus" + "github.com/telekom/sparrow/pkg/checks" ) // metrics defines the metric collectors of the DNS check diff --git a/pkg/checks/health/config.go b/pkg/checks/health/config.go index d0053936..71376be4 100644 --- a/pkg/checks/health/config.go +++ b/pkg/checks/health/config.go @@ -23,8 +23,8 @@ import ( "net/url" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/pkg/checks" ) const ( diff --git a/pkg/checks/health/health.go b/pkg/checks/health/health.go index 08bcdc6a..a5baec63 100644 --- a/pkg/checks/health/health.go +++ b/pkg/checks/health/health.go @@ -29,10 +29,10 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks" "github.com/getkin/kin-openapi/openapi3" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks" ) var ( diff --git a/pkg/checks/health/health_test.go b/pkg/checks/health/health_test.go index 77c91c97..c1e6c0fd 100644 --- a/pkg/checks/health/health_test.go +++ b/pkg/checks/health/health_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/latency" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/latency" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" diff --git a/pkg/checks/health/metrics.go b/pkg/checks/health/metrics.go index 6684d3d0..ce86ad11 100644 --- a/pkg/checks/health/metrics.go +++ b/pkg/checks/health/metrics.go @@ -19,8 +19,8 @@ package health import ( - "github.com/caas-team/sparrow/pkg/checks" "github.com/prometheus/client_golang/prometheus" + "github.com/telekom/sparrow/pkg/checks" ) // metrics contains the metric collectors for the Health check diff --git a/pkg/checks/latency/config.go b/pkg/checks/latency/config.go index e0202154..cf4d4351 100644 --- a/pkg/checks/latency/config.go +++ b/pkg/checks/latency/config.go @@ -23,8 +23,8 @@ import ( "net/url" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/pkg/checks" ) const ( diff --git a/pkg/checks/latency/latency.go b/pkg/checks/latency/latency.go index da21b435..d4a9c6ca 100644 --- a/pkg/checks/latency/latency.go +++ b/pkg/checks/latency/latency.go @@ -28,10 +28,10 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks" "github.com/getkin/kin-openapi/openapi3" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks" ) var ( diff --git a/pkg/checks/latency/latency_test.go b/pkg/checks/latency/latency_test.go index 78a7a58c..cde34d3d 100644 --- a/pkg/checks/latency/latency_test.go +++ b/pkg/checks/latency/latency_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" diff --git a/pkg/checks/latency/metrics.go b/pkg/checks/latency/metrics.go index 8115e801..f7e5159c 100644 --- a/pkg/checks/latency/metrics.go +++ b/pkg/checks/latency/metrics.go @@ -19,8 +19,8 @@ package latency import ( - "github.com/caas-team/sparrow/pkg/checks" "github.com/prometheus/client_golang/prometheus" + "github.com/telekom/sparrow/pkg/checks" ) // metrics defines the metric collectors of the latency check diff --git a/pkg/checks/runtime/checks.go b/pkg/checks/runtime/checks.go index 8b432446..5a34cbca 100644 --- a/pkg/checks/runtime/checks.go +++ b/pkg/checks/runtime/checks.go @@ -21,7 +21,7 @@ package runtime import ( "sync" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" ) // Checks holds all the checks. diff --git a/pkg/checks/runtime/config.go b/pkg/checks/runtime/config.go index d922441f..bec7163e 100644 --- a/pkg/checks/runtime/config.go +++ b/pkg/checks/runtime/config.go @@ -21,11 +21,11 @@ package runtime import ( "errors" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/dns" - "github.com/caas-team/sparrow/pkg/checks/health" - "github.com/caas-team/sparrow/pkg/checks/latency" - "github.com/caas-team/sparrow/pkg/checks/traceroute" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/dns" + "github.com/telekom/sparrow/pkg/checks/health" + "github.com/telekom/sparrow/pkg/checks/latency" + "github.com/telekom/sparrow/pkg/checks/traceroute" ) // Config holds the runtime configuration diff --git a/pkg/checks/traceroute/check.go b/pkg/checks/traceroute/check.go index b6c00155..f541ab21 100644 --- a/pkg/checks/traceroute/check.go +++ b/pkg/checks/traceroute/check.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks" "github.com/getkin/kin-openapi/openapi3" "github.com/prometheus/client_golang/prometheus" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" diff --git a/pkg/checks/traceroute/check_test.go b/pkg/checks/traceroute/check_test.go index 89ff9911..d10020d6 100644 --- a/pkg/checks/traceroute/check_test.go +++ b/pkg/checks/traceroute/check_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks" "github.com/google/go-cmp/cmp" + "github.com/telekom/sparrow/pkg/checks" "go.opentelemetry.io/otel" ) diff --git a/pkg/checks/traceroute/config.go b/pkg/checks/traceroute/config.go index 9b8bb1b7..bf602cb9 100644 --- a/pkg/checks/traceroute/config.go +++ b/pkg/checks/traceroute/config.go @@ -24,8 +24,8 @@ import ( "net/url" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/pkg/checks" ) // Config is the configuration for the traceroute check diff --git a/pkg/checks/traceroute/metrics.go b/pkg/checks/traceroute/metrics.go index ddc30d8b..32dd2623 100644 --- a/pkg/checks/traceroute/metrics.go +++ b/pkg/checks/traceroute/metrics.go @@ -21,7 +21,7 @@ package traceroute import ( "time" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/checks/traceroute/traceroute.go b/pkg/checks/traceroute/traceroute.go index 7a2314f1..8243371f 100644 --- a/pkg/checks/traceroute/traceroute.go +++ b/pkg/checks/traceroute/traceroute.go @@ -34,8 +34,8 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/sys/unix" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/internal/logger" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/internal/logger" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" diff --git a/pkg/config/config.go b/pkg/config/config.go index f1c4b81c..d941a56d 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -21,11 +21,11 @@ package config import ( "time" - "github.com/caas-team/sparrow/pkg/sparrow/metrics" - "github.com/caas-team/sparrow/pkg/sparrow/targets" + "github.com/telekom/sparrow/pkg/sparrow/metrics" + "github.com/telekom/sparrow/pkg/sparrow/targets" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/pkg/api" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/pkg/api" ) type Config struct { diff --git a/pkg/config/file.go b/pkg/config/file.go index 7093c844..81efe969 100644 --- a/pkg/config/file.go +++ b/pkg/config/file.go @@ -28,8 +28,8 @@ import ( "path/filepath" "time" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks/runtime" "gopkg.in/yaml.v3" ) diff --git a/pkg/config/file_test.go b/pkg/config/file_test.go index 77b78ec1..37ffd085 100644 --- a/pkg/config/file_test.go +++ b/pkg/config/file_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks/health" - "github.com/caas-team/sparrow/pkg/checks/runtime" - "github.com/caas-team/sparrow/pkg/config/test" + "github.com/telekom/sparrow/pkg/checks/health" + "github.com/telekom/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/config/test" "gopkg.in/yaml.v3" ) diff --git a/pkg/config/http.go b/pkg/config/http.go index aeaffbd8..737a655d 100644 --- a/pkg/config/http.go +++ b/pkg/config/http.go @@ -26,9 +26,9 @@ import ( "net/http" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks/runtime" "gopkg.in/yaml.v3" ) diff --git a/pkg/config/http_test.go b/pkg/config/http_test.go index 4ab62ce7..72159817 100644 --- a/pkg/config/http_test.go +++ b/pkg/config/http_test.go @@ -29,12 +29,12 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks/health" - "github.com/caas-team/sparrow/pkg/checks/runtime" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/require" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks/health" + "github.com/telekom/sparrow/pkg/checks/runtime" "gopkg.in/yaml.v3" ) diff --git a/pkg/config/loader.go b/pkg/config/loader.go index 2583bb16..169fd768 100644 --- a/pkg/config/loader.go +++ b/pkg/config/loader.go @@ -21,7 +21,7 @@ package config import ( "context" - "github.com/caas-team/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/checks/runtime" ) //go:generate moq -out loader_moq.go . Loader diff --git a/pkg/config/validate.go b/pkg/config/validate.go index d467e0f4..99239c9f 100644 --- a/pkg/config/validate.go +++ b/pkg/config/validate.go @@ -25,7 +25,7 @@ import ( "net/url" "regexp" - "github.com/caas-team/sparrow/internal/logger" + "github.com/telekom/sparrow/internal/logger" ) // Validate validates the startup config diff --git a/pkg/config/validate_test.go b/pkg/config/validate_test.go index 398e66a9..033b714f 100644 --- a/pkg/config/validate_test.go +++ b/pkg/config/validate_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/internal/helper" - "github.com/caas-team/sparrow/pkg/api" + "github.com/telekom/sparrow/internal/helper" + "github.com/telekom/sparrow/pkg/api" ) func TestConfig_Validate(t *testing.T) { diff --git a/pkg/db/db.go b/pkg/db/db.go index 0fb0c425..f7ed4a9d 100644 --- a/pkg/db/db.go +++ b/pkg/db/db.go @@ -21,7 +21,7 @@ package db import ( "sync" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" ) type DB interface { diff --git a/pkg/db/db_test.go b/pkg/db/db_test.go index 120d0414..42d4980a 100644 --- a/pkg/db/db_test.go +++ b/pkg/db/db_test.go @@ -23,7 +23,7 @@ import ( "sync" "testing" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" ) func TestInMemory_Save(t *testing.T) { diff --git a/pkg/factory/factory.go b/pkg/factory/factory.go index 181272cb..fe83dd6d 100644 --- a/pkg/factory/factory.go +++ b/pkg/factory/factory.go @@ -21,12 +21,12 @@ package factory import ( "errors" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/dns" - "github.com/caas-team/sparrow/pkg/checks/health" - "github.com/caas-team/sparrow/pkg/checks/latency" - "github.com/caas-team/sparrow/pkg/checks/runtime" - "github.com/caas-team/sparrow/pkg/checks/traceroute" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/dns" + "github.com/telekom/sparrow/pkg/checks/health" + "github.com/telekom/sparrow/pkg/checks/latency" + "github.com/telekom/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/checks/traceroute" ) // newCheck creates a new check instance from the given name diff --git a/pkg/factory/factory_test.go b/pkg/factory/factory_test.go index ea403146..4111d9b6 100644 --- a/pkg/factory/factory_test.go +++ b/pkg/factory/factory_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/health" - "github.com/caas-team/sparrow/pkg/checks/latency" - "github.com/caas-team/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/health" + "github.com/telekom/sparrow/pkg/checks/latency" + "github.com/telekom/sparrow/pkg/checks/runtime" ) var ( diff --git a/pkg/sparrow/controller.go b/pkg/sparrow/controller.go index 461ae605..06508338 100644 --- a/pkg/sparrow/controller.go +++ b/pkg/sparrow/controller.go @@ -24,13 +24,13 @@ import ( "fmt" "net/http" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/runtime" - "github.com/caas-team/sparrow/pkg/db" - "github.com/caas-team/sparrow/pkg/factory" - "github.com/caas-team/sparrow/pkg/sparrow/metrics" "github.com/getkin/kin-openapi/openapi3" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/db" + "github.com/telekom/sparrow/pkg/factory" + "github.com/telekom/sparrow/pkg/sparrow/metrics" ) // ChecksController is responsible for managing checks. diff --git a/pkg/sparrow/controller_errors.go b/pkg/sparrow/controller_errors.go index 2dd61092..b4329c7f 100644 --- a/pkg/sparrow/controller_errors.go +++ b/pkg/sparrow/controller_errors.go @@ -21,7 +21,7 @@ package sparrow import ( "fmt" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" ) type ErrRunningCheck struct { diff --git a/pkg/sparrow/controller_test.go b/pkg/sparrow/controller_test.go index f68887db..f3b22e20 100644 --- a/pkg/sparrow/controller_test.go +++ b/pkg/sparrow/controller_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/dns" - "github.com/caas-team/sparrow/pkg/checks/health" - "github.com/caas-team/sparrow/pkg/checks/latency" - "github.com/caas-team/sparrow/pkg/checks/runtime" - "github.com/caas-team/sparrow/pkg/db" - "github.com/caas-team/sparrow/pkg/sparrow/metrics" "github.com/getkin/kin-openapi/openapi3" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/dns" + "github.com/telekom/sparrow/pkg/checks/health" + "github.com/telekom/sparrow/pkg/checks/latency" + "github.com/telekom/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/db" + "github.com/telekom/sparrow/pkg/sparrow/metrics" ) func TestRun_CheckRunError(t *testing.T) { diff --git a/pkg/sparrow/handlers.go b/pkg/sparrow/handlers.go index 8a774ef0..06a8379b 100644 --- a/pkg/sparrow/handlers.go +++ b/pkg/sparrow/handlers.go @@ -26,9 +26,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/api" "github.com/go-chi/chi/v5" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/api" "gopkg.in/yaml.v3" ) diff --git a/pkg/sparrow/handlers_test.go b/pkg/sparrow/handlers_test.go index e1f7a9c0..32793f80 100644 --- a/pkg/sparrow/handlers_test.go +++ b/pkg/sparrow/handlers_test.go @@ -29,11 +29,11 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/runtime" - "github.com/caas-team/sparrow/pkg/db" "github.com/getkin/kin-openapi/openapi3" "github.com/go-chi/chi/v5" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/db" "gopkg.in/yaml.v3" ) diff --git a/pkg/sparrow/metrics/config.go b/pkg/sparrow/metrics/config.go index bd2cb407..80a63fa9 100644 --- a/pkg/sparrow/metrics/config.go +++ b/pkg/sparrow/metrics/config.go @@ -22,7 +22,7 @@ import ( "context" "fmt" - "github.com/caas-team/sparrow/internal/logger" + "github.com/telekom/sparrow/internal/logger" ) // Config holds the configuration for OpenTelemetry diff --git a/pkg/sparrow/metrics/metrics.go b/pkg/sparrow/metrics/metrics.go index 3c42084e..bae71a61 100644 --- a/pkg/sparrow/metrics/metrics.go +++ b/pkg/sparrow/metrics/metrics.go @@ -23,9 +23,9 @@ import ( "fmt" "time" - "github.com/caas-team/sparrow/internal/logger" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" + "github.com/telekom/sparrow/internal/logger" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" diff --git a/pkg/sparrow/run.go b/pkg/sparrow/run.go index 4ef56c68..19e72a30 100644 --- a/pkg/sparrow/run.go +++ b/pkg/sparrow/run.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/api" - "github.com/caas-team/sparrow/pkg/checks/runtime" - "github.com/caas-team/sparrow/pkg/config" - "github.com/caas-team/sparrow/pkg/db" - "github.com/caas-team/sparrow/pkg/sparrow/metrics" - "github.com/caas-team/sparrow/pkg/sparrow/targets" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/api" + "github.com/telekom/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/config" + "github.com/telekom/sparrow/pkg/db" + "github.com/telekom/sparrow/pkg/sparrow/metrics" + "github.com/telekom/sparrow/pkg/sparrow/targets" ) const shutdownTimeout = time.Second * 90 diff --git a/pkg/sparrow/run_test.go b/pkg/sparrow/run_test.go index a004db2a..66fd1546 100644 --- a/pkg/sparrow/run_test.go +++ b/pkg/sparrow/run_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/api" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/checks/dns" - "github.com/caas-team/sparrow/pkg/checks/health" - "github.com/caas-team/sparrow/pkg/checks/latency" - "github.com/caas-team/sparrow/pkg/checks/runtime" - "github.com/caas-team/sparrow/pkg/config" - "github.com/caas-team/sparrow/pkg/sparrow/targets" - "github.com/caas-team/sparrow/pkg/sparrow/targets/interactor" - "github.com/caas-team/sparrow/pkg/sparrow/targets/remote/gitlab" - managermock "github.com/caas-team/sparrow/pkg/sparrow/targets/test" "github.com/stretchr/testify/assert" + "github.com/telekom/sparrow/pkg/api" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks/dns" + "github.com/telekom/sparrow/pkg/checks/health" + "github.com/telekom/sparrow/pkg/checks/latency" + "github.com/telekom/sparrow/pkg/checks/runtime" + "github.com/telekom/sparrow/pkg/config" + "github.com/telekom/sparrow/pkg/sparrow/targets" + "github.com/telekom/sparrow/pkg/sparrow/targets/interactor" + "github.com/telekom/sparrow/pkg/sparrow/targets/remote/gitlab" + managermock "github.com/telekom/sparrow/pkg/sparrow/targets/test" ) // TestSparrow_Run_FullComponentStart tests that the Run method starts the API, diff --git a/pkg/sparrow/targets/interactor/config.go b/pkg/sparrow/targets/interactor/config.go index 57a8373b..fd096acb 100644 --- a/pkg/sparrow/targets/interactor/config.go +++ b/pkg/sparrow/targets/interactor/config.go @@ -19,8 +19,8 @@ package interactor import ( - "github.com/caas-team/sparrow/pkg/sparrow/targets/remote" - "github.com/caas-team/sparrow/pkg/sparrow/targets/remote/gitlab" + "github.com/telekom/sparrow/pkg/sparrow/targets/remote" + "github.com/telekom/sparrow/pkg/sparrow/targets/remote/gitlab" ) // Config contains the configuration for the remote interactor diff --git a/pkg/sparrow/targets/manager.go b/pkg/sparrow/targets/manager.go index 67e6c01f..a11b5e71 100644 --- a/pkg/sparrow/targets/manager.go +++ b/pkg/sparrow/targets/manager.go @@ -25,12 +25,12 @@ import ( "sync" "time" - smetrics "github.com/caas-team/sparrow/pkg/sparrow/metrics" "github.com/prometheus/client_golang/prometheus" + smetrics "github.com/telekom/sparrow/pkg/sparrow/metrics" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/sparrow/targets/remote" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/sparrow/targets/remote" ) var _ TargetManager = (*manager)(nil) diff --git a/pkg/sparrow/targets/manager_test.go b/pkg/sparrow/targets/manager_test.go index 435be1bb..2608c3c2 100644 --- a/pkg/sparrow/targets/manager_test.go +++ b/pkg/sparrow/targets/manager_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" - remotemock "github.com/caas-team/sparrow/pkg/sparrow/targets/remote/test" + remotemock "github.com/telekom/sparrow/pkg/sparrow/targets/remote/test" ) const ( diff --git a/pkg/sparrow/targets/remote/gitlab/gitlab.go b/pkg/sparrow/targets/remote/gitlab/gitlab.go index 73963ee3..4e8b5f32 100644 --- a/pkg/sparrow/targets/remote/gitlab/gitlab.go +++ b/pkg/sparrow/targets/remote/gitlab/gitlab.go @@ -30,10 +30,10 @@ import ( "strings" "time" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/sparrow/targets/remote" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/sparrow/targets/remote" - "github.com/caas-team/sparrow/internal/logger" + "github.com/telekom/sparrow/internal/logger" ) // The amount of items the paginated request to gitlab should return diff --git a/pkg/sparrow/targets/remote/gitlab/gitlab_test.go b/pkg/sparrow/targets/remote/gitlab/gitlab_test.go index a99b4bac..8cc934f7 100644 --- a/pkg/sparrow/targets/remote/gitlab/gitlab_test.go +++ b/pkg/sparrow/targets/remote/gitlab/gitlab_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/sparrow/targets/remote" "github.com/jarcoal/httpmock" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/sparrow/targets/remote" ) func Test_gitlab_fetchFileList(t *testing.T) { diff --git a/pkg/sparrow/targets/remote/remote.go b/pkg/sparrow/targets/remote/remote.go index 8147d255..3e18f82e 100644 --- a/pkg/sparrow/targets/remote/remote.go +++ b/pkg/sparrow/targets/remote/remote.go @@ -25,7 +25,7 @@ import ( "encoding/json" "errors" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" ) // Interactor handles the interaction with the remote state backend diff --git a/pkg/sparrow/targets/remote/test/remotemock.go b/pkg/sparrow/targets/remote/test/remotemock.go index f3d1015d..1a8d2e64 100644 --- a/pkg/sparrow/targets/remote/test/remotemock.go +++ b/pkg/sparrow/targets/remote/test/remotemock.go @@ -22,10 +22,10 @@ import ( "context" "sync" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/sparrow/targets/remote" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/sparrow/targets/remote" - "github.com/caas-team/sparrow/internal/logger" + "github.com/telekom/sparrow/internal/logger" ) type MockClient struct { diff --git a/pkg/sparrow/targets/targetmanager.go b/pkg/sparrow/targets/targetmanager.go index 594640eb..3e32ed9c 100644 --- a/pkg/sparrow/targets/targetmanager.go +++ b/pkg/sparrow/targets/targetmanager.go @@ -22,9 +22,9 @@ import ( "context" "time" - "github.com/caas-team/sparrow/internal/logger" - "github.com/caas-team/sparrow/pkg/checks" - "github.com/caas-team/sparrow/pkg/sparrow/targets/interactor" + "github.com/telekom/sparrow/internal/logger" + "github.com/telekom/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/sparrow/targets/interactor" ) // TargetManager handles the management of globalTargets for diff --git a/pkg/sparrow/targets/test/managermock.go b/pkg/sparrow/targets/test/managermock.go index 57a89938..4e69f749 100644 --- a/pkg/sparrow/targets/test/managermock.go +++ b/pkg/sparrow/targets/test/managermock.go @@ -21,9 +21,9 @@ package managermock import ( "context" - "github.com/caas-team/sparrow/pkg/checks" + "github.com/telekom/sparrow/pkg/checks" - "github.com/caas-team/sparrow/internal/logger" + "github.com/telekom/sparrow/internal/logger" ) // MockTargetManager is a mock implementation of the TargetManager interface diff --git a/scripts/gen-docs/gen-docs.go b/scripts/gen-docs/gen-docs.go index b50eabc8..bcd85b91 100644 --- a/scripts/gen-docs/gen-docs.go +++ b/scripts/gen-docs/gen-docs.go @@ -24,9 +24,9 @@ import ( "fmt" "os" - sparrowcmd "github.com/caas-team/sparrow/cmd" "github.com/spf13/cobra" "github.com/spf13/cobra/doc" + sparrowcmd "github.com/telekom/sparrow/cmd" ) func main() {