Merge remote-tracking branch 'origin/main' into fix/send-on-closed

.github/workflows/ci.yml

@@ -20,6 +20,9 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
+
+      - name: Install syft for sbom generation
+        uses: anchore/sbom-action/[email protected]
 
       - name: Build snapshot artifacts
         uses: goreleaser/goreleaser-action@v6

.github/workflows/e2e_checks.yml

@@ -44,6 +44,9 @@ jobs:
           "network_plugin": "kathara/katharanp_vde"
           }' > ~/.config/kathara.conf
 
+      - name: Install syft for sbom generation
+        uses: anchore/sbom-action/[email protected]
+
       - name: Build binary for e2e
         uses: goreleaser/goreleaser-action@v6
         with:

.github/workflows/release.yml

@@ -37,6 +37,9 @@ jobs:
           registry: mtr.devops.telekom.de
           username: ${{ secrets.MTR_USERNAME }}
           password: ${{ secrets.MTR_PASSWORD }}
+
+      - name: Install syft for sbom generation
+        uses: anchore/sbom-action/[email protected]
 
       - name: Build, push & release
         uses: goreleaser/goreleaser-action@v6

.goreleaser-ci.yaml

@@ -1,3 +1,4 @@
+version: 2
 project_name: sparrow
 snapshot:
   name_template: "commit-{{ .ShortCommit }}"
@@ -13,15 +14,17 @@ 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 }}
       - --label=org.opencontainers.image.licenses="Apache 2.0"
+sboms:
+  - artifacts: archive

.goreleaser.yaml

@@ -1,3 +1,4 @@
+version: 2
 project_name: sparrow
 builds:
   - env: [CGO_ENABLED=0]
@@ -11,10 +12,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 +25,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,9 +34,14 @@ nfpms:
   - maintainer: CaaS <[email protected]>
     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
       - rpm
       - apk
+sboms:
+  - id: archive
+    artifacts: archive
+  - id: source
+    artifacts: source

README.md

@@ -2,8 +2,8 @@
 
 <!-- markdownlint-disable MD033 -->
 <p align="center">
-  <a href="/../../commits/" title="Last Commit"><img alt="Last Commit" src="https://img.shields.io/github/last-commit/caas-team/sparrow?style=flat"></a>
-  <a href="/../../issues" title="Open Issues"><img alt="Open Issues" src="https://img.shields.io/github/issues/caas-team/sparrow?style=flat"></a>
+  <a href="/../../commits/" title="Last Commit"><img alt="Last Commit" src="https://img.shields.io/github/last-commit/telekom/sparrow?style=flat"></a>
+  <a href="/../../issues" title="Open Issues"><img alt="Open Issues" src="https://img.shields.io/github/issues/telekom/sparrow?style=flat"></a>
   <a href="./LICENSE" title="License"><img alt="License" src="https://img.shields.io/badge/License-Apache%202.0-green.svg?style=flat"></a>
 </p>
 <!-- markdownlint-enable MD033 -->
@@ -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:
 
 <!-- markdownlint-disable MD033 -->
-| Type       | Channel                                                                                                                                                             |
-| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Issues** | <a href="/../../issues/new/choose" title="General Discussion"><img alt="Issues" src="https://img.shields.io/github/issues/caas-team/sparrow?style=flat-square"></a> |
+| Type       | Channel                                                                                                                                                           |
+| ---------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Issues** | <a href="/../../issues/new/choose" title="General Discussion"><img alt="Issues" src="https://img.shields.io/github/issues/telekom/sparrow?style=flat-square"></a> |
 <!-- markdownlint-enable MD033 -->
 
 ## How to Contribute

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: [email protected]
-    url: https://www.telekom.com
   - name: y-eight
     email: [email protected]
     url: https://www.telekom.com
+  - name: puffitos
+    email: [email protected]
+    url: https://www.telekom.com
+  - name: ntreml
+    email: [email protected]
+    url: https://www.telekom.com
+  - name: lvlcn-t
+    email: [email protected]
+    url: https://www.telekom.com

chart/README.md

@@ -8,25 +8,27 @@ A Helm chart to install Sparrow
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| eumel8 | <[email protected]> | <https://www.telekom.com> |
 | y-eight | <[email protected]> | <https://www.telekom.com> |
+| puffitos | <[email protected]> | <https://www.telekom.com> |
+| ntreml | <[email protected]> | <https://www.telekom.com> |
+| lvlcn-t | <[email protected]> | <https://www.telekom.com> |
 
 ## Source Code
 
-* <https://github.com/caas-team/sparrow>
+* <https://github.com/telekom/sparrow>
 
 ## 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 | `[]` |  |
 

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

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 (

go.mod

@@ -1,10 +1,10 @@
-module github.com/caas-team/sparrow
+module github.com/telekom/sparrow
 
 go 1.23
 
 require (
 	github.com/getkin/kin-openapi v0.128.0
-	github.com/go-chi/chi/v5 v5.1.0
+	github.com/go-chi/chi/v5 v5.2.0
 	github.com/google/go-cmp v0.6.0
 	github.com/jarcoal/httpmock v1.3.1
 	github.com/prometheus/client_golang v1.20.5
@@ -17,9 +17,9 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.33.0
 	go.opentelemetry.io/otel/sdk v1.33.0
 	go.opentelemetry.io/otel/trace v1.33.0
-	golang.org/x/net v0.33.0
-	golang.org/x/sys v0.28.0
-	google.golang.org/grpc v1.69.2
+	golang.org/x/net v0.34.0
+	golang.org/x/sys v0.29.0
+	google.golang.org/grpc v1.69.4
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -14,8 +14,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/getkin/kin-openapi v0.128.0 h1:jqq3D9vC9pPq1dGcOCv7yOp1DaEe7c/T1vzcLbITSp4=
 github.com/getkin/kin-openapi v0.128.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM=
-github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
-github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0=
+github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -125,18 +125,18 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
 google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
-google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
+google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
 google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
 google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

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 {

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
 

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

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