From b7de3504ec9b3e085e3f4cb278890dce630c6b60 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Fri, 24 Apr 2026 14:15:29 +0700 Subject: [PATCH 1/8] Rename project path. --- .github/workflows/ci.yaml | 7 ++++++- README.md | 8 ++++---- cmd/sloth/commands/commands.go | 2 +- cmd/sloth/commands/generate.go | 18 +++++++++--------- cmd/sloth/commands/helpers.go | 4 ++-- cmd/sloth/commands/k8scontroller.go | 16 ++++++++-------- cmd/sloth/commands/validate.go | 10 +++++----- cmd/sloth/commands/version.go | 2 +- cmd/sloth/main.go | 8 ++++---- deploy/kubernetes/helm/sloth/Chart.yaml | 2 +- deploy/kubernetes/helm/sloth/tests/go.mod | 2 +- docker/dev/Dockerfile | 2 +- docker/prod/Dockerfile | 4 ++-- examples/_gen/getting-started.yml | 2 +- examples/_gen/home-wifi.yml | 2 +- examples/_gen/k8s-getting-started.yml | 2 +- examples/_gen/k8s-home-wifi.yml | 2 +- examples/_gen/k8s-multifile.yml | 4 ++-- examples/_gen/kubernetes-apiserver.yml | 2 +- examples/_gen/multifile.yml | 4 ++-- examples/_gen/no-alerts.yml | 2 +- examples/_gen/openslo-getting-started.yml | 2 +- examples/_gen/openslo-kubernetes-apiserver.yml | 4 ++-- examples/_gen/plugin-getting-started.yml | 2 +- examples/_gen/plugin-k8s-getting-started.yml | 2 +- examples/_gen/raw-home-wifi.yml | 2 +- go.mod | 2 +- internal/alert/alert_test.go | 2 +- internal/alert/window.go | 4 ++-- internal/app/generate/noop.go | 6 +++--- internal/app/generate/prometheus.go | 8 ++++---- internal/app/generate/prometheus_test.go | 8 ++++---- internal/app/kubecontroller/handler.go | 10 +++++----- internal/app/kubecontroller/retriever.go | 2 +- internal/k8sprometheus/kubernetes.go | 8 ++++---- internal/k8sprometheus/model.go | 2 +- internal/k8sprometheus/model_test.go | 4 ++-- internal/k8sprometheus/spec.go | 8 ++++---- internal/k8sprometheus/spec_test.go | 4 ++-- internal/k8sprometheus/storage.go | 8 ++++---- internal/k8sprometheus/storage_test.go | 16 ++++++++-------- internal/log/logrus/logrus.go | 2 +- internal/openslo/spec.go | 2 +- internal/openslo/spec_test.go | 4 ++-- internal/prometheus/alert_rules.go | 2 +- internal/prometheus/alert_rules_test.go | 4 ++-- internal/prometheus/helpers.go | 2 +- internal/prometheus/model_test.go | 2 +- internal/prometheus/recording_rules.go | 4 ++-- internal/prometheus/recording_rules_test.go | 6 +++--- internal/prometheus/sli_plugin.go | 6 +++--- internal/prometheus/sli_plugin_test.go | 4 ++-- internal/prometheus/spec.go | 4 ++-- internal/prometheus/spec_test.go | 2 +- internal/prometheus/storage.go | 6 +++--- internal/prometheus/storage_test.go | 12 ++++++------ pkg/kubernetes/api/sloth/v1/README.md | 2 +- pkg/kubernetes/api/sloth/v1/register.go | 2 +- .../gen/clientset/versioned/clientset.go | 2 +- .../versioned/fake/clientset_generated.go | 6 +++--- .../gen/clientset/versioned/fake/register.go | 2 +- .../gen/clientset/versioned/scheme/register.go | 2 +- .../v1/fake/fake_prometheusservicelevel.go | 2 +- .../typed/sloth/v1/fake/fake_sloth_client.go | 2 +- .../typed/sloth/v1/prometheusservicelevel.go | 4 ++-- .../versioned/typed/sloth/v1/sloth_client.go | 4 ++-- pkg/prometheus/alertwindows/v1/README.md | 2 +- pkg/prometheus/api/v1/README.md | 2 +- scripts/build/bin/build-raw.sh | 2 +- scripts/kubegen.sh | 2 +- .../integration/k8scontroller/exp_base_test.go | 2 +- .../k8scontroller/exp_plugin_test.go | 2 +- test/integration/k8scontroller/helpers.go | 4 ++-- .../k8scontroller/k8scontroller_test.go | 6 +++--- test/integration/prometheus/generate_test.go | 4 ++-- test/integration/prometheus/helpers.go | 2 +- .../prometheus/testdata/out-base-28d.yaml.tpl | 2 +- .../out-base-custom-windows-7d.yaml.tpl | 2 +- .../testdata/out-base-extra-labels.yaml.tpl | 2 +- .../prometheus/testdata/out-base-k8s.yaml.tpl | 2 +- .../testdata/out-base-no-alerts.yaml.tpl | 2 +- .../testdata/out-base-no-recordings.yaml.tpl | 2 +- .../prometheus/testdata/out-base.yaml.tpl | 2 +- .../testdata/out-multifile-k8s.yaml.tpl | 4 ++-- .../prometheus/testdata/out-multifile.yaml.tpl | 4 ++-- .../prometheus/testdata/out-openslo.yaml.tpl | 2 +- .../prometheus/testdata/out-plugin.yaml.tpl | 2 +- test/integration/prometheus/validate_test.go | 2 +- 88 files changed, 180 insertions(+), 175 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f26736d0..d381c2c6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -135,7 +135,7 @@ jobs: env: TAG_IMAGE_LATEST: "true" REF_NAME: "${{ github.ref_name }}" - PROD_IMAGE_NAME: ghcr.io/${GITHUB_REPOSITORY} + #PROD_IMAGE_NAME: ghcr.io/${GITHUB_REPOSITORY} # needs: [check, unit-test, integration-test-cli, integration-test-k8s, helm-chart-test] needs: [check, unit-test, integration-test-cli, helm-chart-test] name: Tagged release images @@ -143,6 +143,11 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Downcase REPO name + run: | + echo "PROD_IMAGE_NAME=ghcr.io/${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV + id: downcase_repo + - name: Extract tag shell: bash run: echo "tag=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/tags/}}" >> $GITHUB_OUTPUT diff --git a/README.md b/README.md index b497c125..51bae5a9 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@

# Sloth -[![Apache 2 licensed](https://img.shields.io/badge/license-Apache2-blue.svg)](https://raw.githubusercontent.com/ostrovok-tech/sloth/main/LICENSE) -[![CI](https://github.com/ostrovok-tech/sloth/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/ostrovok-tech/sloth/actions/workflows/ci.yaml) -[![Go Report Card](https://goreportcard.com/badge/github.com/ostrovok-tech/sloth)](https://goreportcard.com/report/github.com/ostrovok-tech/sloth) -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/ostrovok-tech/sloth)](https://github.com/ostrovok-tech/sloth/releases/latest) +[![Apache 2 licensed](https://img.shields.io/badge/license-Apache2-blue.svg)](https://raw.githubusercontent.com/emergingtravel/sloth/main/LICENSE) +[![CI](https://github.com/emergingtravel/sloth/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/emergingtravel/sloth/actions/workflows/ci.yaml) +[![Go Report Card](https://goreportcard.com/badge/github.com/emergingtravel/sloth)](https://goreportcard.com/report/github.com/emergingtravel/sloth) +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/emergingtravel/sloth)](https://github.com/emergingtravel/sloth/releases/latest) [![OpenSLO](https://img.shields.io/badge/OpenSLO-v1alpha-green?color=4974EA&style=flat)](https://github.com/OpenSLO/OpenSLO#slo) diff --git a/cmd/sloth/commands/commands.go b/cmd/sloth/commands/commands.go index 89d708f7..07b3d698 100644 --- a/cmd/sloth/commands/commands.go +++ b/cmd/sloth/commands/commands.go @@ -6,7 +6,7 @@ import ( "gopkg.in/alecthomas/kingpin.v2" - "github.com/ostrovok-tech/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/log" ) const ( diff --git a/cmd/sloth/commands/generate.go b/cmd/sloth/commands/generate.go index 1799d088..a9bb63f2 100644 --- a/cmd/sloth/commands/generate.go +++ b/cmd/sloth/commands/generate.go @@ -16,15 +16,15 @@ import ( prometheusmodel "github.com/prometheus/common/model" "gopkg.in/alecthomas/kingpin.v2" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/app/generate" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/k8sprometheus" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/internal/openslo" - "github.com/ostrovok-tech/sloth/internal/prometheus" - kubernetesv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" - prometheusv1 "github.com/ostrovok-tech/sloth/pkg/prometheus/api/v1" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/app/generate" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/k8sprometheus" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/openslo" + "github.com/emergingtravel/sloth/internal/prometheus" + kubernetesv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" + prometheusv1 "github.com/emergingtravel/sloth/pkg/prometheus/api/v1" ) type generateCommand struct { diff --git a/cmd/sloth/commands/helpers.go b/cmd/sloth/commands/helpers.go index d2847091..ec07fc7f 100644 --- a/cmd/sloth/commands/helpers.go +++ b/cmd/sloth/commands/helpers.go @@ -9,8 +9,8 @@ import ( "regexp" "strings" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/prometheus" ) var ( diff --git a/cmd/sloth/commands/k8scontroller.go b/cmd/sloth/commands/k8scontroller.go index 017d07d8..9b553080 100644 --- a/cmd/sloth/commands/k8scontroller.go +++ b/cmd/sloth/commands/k8scontroller.go @@ -30,14 +30,14 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/app/generate" - "github.com/ostrovok-tech/sloth/internal/app/kubecontroller" - "github.com/ostrovok-tech/sloth/internal/k8sprometheus" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/internal/prometheus" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" - slothclientset "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/app/generate" + "github.com/emergingtravel/sloth/internal/app/kubecontroller" + "github.com/emergingtravel/sloth/internal/k8sprometheus" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/prometheus" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" + slothclientset "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned" ) var controllerModes = []string{controllerModeDefault, controllerModeDryRun, controllerModeFake} diff --git a/cmd/sloth/commands/validate.go b/cmd/sloth/commands/validate.go index 2bc928e6..4fdc37b5 100644 --- a/cmd/sloth/commands/validate.go +++ b/cmd/sloth/commands/validate.go @@ -12,11 +12,11 @@ import ( prometheusmodel "github.com/prometheus/common/model" "gopkg.in/alecthomas/kingpin.v2" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/k8sprometheus" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/internal/openslo" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/k8sprometheus" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/openslo" + "github.com/emergingtravel/sloth/internal/prometheus" ) type validateCommand struct { diff --git a/cmd/sloth/commands/version.go b/cmd/sloth/commands/version.go index 4d58c9c8..d9c8a04f 100644 --- a/cmd/sloth/commands/version.go +++ b/cmd/sloth/commands/version.go @@ -6,7 +6,7 @@ import ( "gopkg.in/alecthomas/kingpin.v2" - "github.com/ostrovok-tech/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/info" ) type versionCommand struct{} diff --git a/cmd/sloth/main.go b/cmd/sloth/main.go index f7dd4851..95305c12 100644 --- a/cmd/sloth/main.go +++ b/cmd/sloth/main.go @@ -9,10 +9,10 @@ import ( "github.com/sirupsen/logrus" "gopkg.in/alecthomas/kingpin.v2" - "github.com/ostrovok-tech/sloth/cmd/sloth/commands" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/log" - loglogrus "github.com/ostrovok-tech/sloth/internal/log/logrus" + "github.com/emergingtravel/sloth/cmd/sloth/commands" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/log" + loglogrus "github.com/emergingtravel/sloth/internal/log/logrus" ) // Run runs the main application. diff --git a/deploy/kubernetes/helm/sloth/Chart.yaml b/deploy/kubernetes/helm/sloth/Chart.yaml index 28379fad..023b0a61 100644 --- a/deploy/kubernetes/helm/sloth/Chart.yaml +++ b/deploy/kubernetes/helm/sloth/Chart.yaml @@ -2,6 +2,6 @@ apiVersion: v2 name: sloth description: Base chart for Sloth. type: application -home: https://github.com/ostrovok-tech/sloth +home: https://github.com/emergingtravel/sloth kubeVersion: ">= 1.19.0-0" version: 0.8.2 diff --git a/deploy/kubernetes/helm/sloth/tests/go.mod b/deploy/kubernetes/helm/sloth/tests/go.mod index 40a9e8fd..610ad886 100644 --- a/deploy/kubernetes/helm/sloth/tests/go.mod +++ b/deploy/kubernetes/helm/sloth/tests/go.mod @@ -1,4 +1,4 @@ -module github.com/ostrovok-tech/sloth/helm +module github.com/emergingtravel/sloth/helm go 1.25.0 diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 39d63d48..83d1da25 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.24.1 -LABEL org.opencontainers.image.source https://github.com/ostrovok-tech/sloth +LABEL org.opencontainers.image.source https://github.com/emergingtravel/sloth ARG GOLANGCI_LINT_VERSION="1.60.3" ARG MOCKERY_VERSION="2.45.0" diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index 9b8c534b..e0a15442 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -26,8 +26,8 @@ FROM ${ALPINE_ARCH}/alpine:3.14 ARG REF_NAME -LABEL org.opencontainers.image.source="https://github.com/ostrovok-tech/sloth" -LABEL org.opencontainers.image.description="Images of Sloth fork from https://github.com/ostrovok-tech/sloth" +LABEL org.opencontainers.image.source="https://github.com/emergingtravel/sloth" +LABEL org.opencontainers.image.description="Images of Sloth fork from https://github.com/emergingtravel/sloth" LABEL org.opencontainers.image.licenses="Apache-2.0" LABEL org.opencontainers.image.ref.name="${REF_NAME}" diff --git a/examples/_gen/getting-started.yml b/examples/_gen/getting-started.yml index bcb3921a..40356e36 100644 --- a/examples/_gen/getting-started.yml +++ b/examples/_gen/getting-started.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/examples/_gen/home-wifi.yml b/examples/_gen/home-wifi.yml index 49f50fa4..fccd652e 100644 --- a/examples/_gen/home-wifi.yml +++ b/examples/_gen/home-wifi.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/examples/_gen/k8s-getting-started.yml b/examples/_gen/k8s-getting-started.yml index dc5416c5..5bb126da 100644 --- a/examples/_gen/k8s-getting-started.yml +++ b/examples/_gen/k8s-getting-started.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 diff --git a/examples/_gen/k8s-home-wifi.yml b/examples/_gen/k8s-home-wifi.yml index edb9cb68..22c6fa36 100644 --- a/examples/_gen/k8s-home-wifi.yml +++ b/examples/_gen/k8s-home-wifi.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 diff --git a/examples/_gen/k8s-multifile.yml b/examples/_gen/k8s-multifile.yml index 8e90f23b..eb0091ef 100644 --- a/examples/_gen/k8s-multifile.yml +++ b/examples/_gen/k8s-multifile.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 @@ -265,7 +265,7 @@ spec: sloth_severity: ticket --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 diff --git a/examples/_gen/kubernetes-apiserver.yml b/examples/_gen/kubernetes-apiserver.yml index 1e9d086b..53fea211 100644 --- a/examples/_gen/kubernetes-apiserver.yml +++ b/examples/_gen/kubernetes-apiserver.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/examples/_gen/multifile.yml b/examples/_gen/multifile.yml index 671e0da1..ff6345c8 100644 --- a/examples/_gen/multifile.yml +++ b/examples/_gen/multifile.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: @@ -255,7 +255,7 @@ groups: runbook: --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/examples/_gen/no-alerts.yml b/examples/_gen/no-alerts.yml index 63eb121d..d7eb3f23 100644 --- a/examples/_gen/no-alerts.yml +++ b/examples/_gen/no-alerts.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/examples/_gen/openslo-getting-started.yml b/examples/_gen/openslo-getting-started.yml index ae5dce7a..a1f6a038 100644 --- a/examples/_gen/openslo-getting-started.yml +++ b/examples/_gen/openslo-getting-started.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/examples/_gen/openslo-kubernetes-apiserver.yml b/examples/_gen/openslo-kubernetes-apiserver.yml index 45474e15..0f479f04 100644 --- a/examples/_gen/openslo-kubernetes-apiserver.yml +++ b/examples/_gen/openslo-kubernetes-apiserver.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: @@ -214,7 +214,7 @@ groups: sloth_version: dev --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/examples/_gen/plugin-getting-started.yml b/examples/_gen/plugin-getting-started.yml index c2e3e9d0..57b72799 100644 --- a/examples/_gen/plugin-getting-started.yml +++ b/examples/_gen/plugin-getting-started.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/examples/_gen/plugin-k8s-getting-started.yml b/examples/_gen/plugin-k8s-getting-started.yml index cb5d5b2c..32267add 100644 --- a/examples/_gen/plugin-k8s-getting-started.yml +++ b/examples/_gen/plugin-k8s-getting-started.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 diff --git a/examples/_gen/raw-home-wifi.yml b/examples/_gen/raw-home-wifi.yml index 50d2fc93..d417ed9e 100644 --- a/examples/_gen/raw-home-wifi.yml +++ b/examples/_gen/raw-home-wifi.yml @@ -1,6 +1,6 @@ --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/go.mod b/go.mod index df52a674..216a0c92 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ostrovok-tech/sloth +module github.com/emergingtravel/sloth go 1.24.1 diff --git a/internal/alert/alert_test.go b/internal/alert/alert_test.go index 59947316..5a3d9280 100644 --- a/internal/alert/alert_test.go +++ b/internal/alert/alert_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ostrovok-tech/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/alert" ) func TestGenerateMWMBAlerts(t *testing.T) { diff --git a/internal/alert/window.go b/internal/alert/window.go index c0a39797..35a77d61 100644 --- a/internal/alert/window.go +++ b/internal/alert/window.go @@ -11,8 +11,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/ostrovok-tech/sloth/internal/log" - alertwindowsv1 "github.com/ostrovok-tech/sloth/pkg/prometheus/alertwindows/v1" + "github.com/emergingtravel/sloth/internal/log" + alertwindowsv1 "github.com/emergingtravel/sloth/pkg/prometheus/alertwindows/v1" ) var ( diff --git a/internal/app/generate/noop.go b/internal/app/generate/noop.go index b8fead38..537f1a68 100644 --- a/internal/app/generate/noop.go +++ b/internal/app/generate/noop.go @@ -3,9 +3,9 @@ package generate import ( "context" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/prometheus" "github.com/prometheus/prometheus/model/rulefmt" ) diff --git a/internal/app/generate/prometheus.go b/internal/app/generate/prometheus.go index 77a7b1f5..c609a90b 100644 --- a/internal/app/generate/prometheus.go +++ b/internal/app/generate/prometheus.go @@ -6,10 +6,10 @@ import ( "github.com/prometheus/prometheus/model/rulefmt" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/prometheus" ) // ServiceConfig is the application service configuration. diff --git a/internal/app/generate/prometheus_test.go b/internal/app/generate/prometheus_test.go index 8008cc2d..8647fa1a 100644 --- a/internal/app/generate/prometheus_test.go +++ b/internal/app/generate/prometheus_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/app/generate" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/app/generate" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/prometheus" ) func TestIntegrationAppServiceGenerate(t *testing.T) { diff --git a/internal/app/kubecontroller/handler.go b/internal/app/kubecontroller/handler.go index d7e7d66a..1a394c4a 100644 --- a/internal/app/kubecontroller/handler.go +++ b/internal/app/kubecontroller/handler.go @@ -8,11 +8,11 @@ import ( "github.com/spotahome/kooper/v2/controller" "k8s.io/apimachinery/pkg/runtime" - "github.com/ostrovok-tech/sloth/internal/app/generate" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/k8sprometheus" - "github.com/ostrovok-tech/sloth/internal/log" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" + "github.com/emergingtravel/sloth/internal/app/generate" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/k8sprometheus" + "github.com/emergingtravel/sloth/internal/log" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" ) // SpecLoader Knows how to load a Kubernetes Spec into an app model. diff --git a/internal/app/kubecontroller/retriever.go b/internal/app/kubecontroller/retriever.go index e7946642..5d1df98d 100644 --- a/internal/app/kubecontroller/retriever.go +++ b/internal/app/kubecontroller/retriever.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" ) // RetrieverKubernetesRepository is the service to manage k8s resources by the Kubernetes controller retrievers. diff --git a/internal/k8sprometheus/kubernetes.go b/internal/k8sprometheus/kubernetes.go index 9e6a69d9..ef3fcb4e 100644 --- a/internal/k8sprometheus/kubernetes.go +++ b/internal/k8sprometheus/kubernetes.go @@ -12,10 +12,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - "github.com/ostrovok-tech/sloth/internal/log" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" - slothclientset "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned" - slothclientsetfake "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned/fake" + "github.com/emergingtravel/sloth/internal/log" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" + slothclientset "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned" + slothclientsetfake "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned/fake" ) type KubernetesService struct { diff --git a/internal/k8sprometheus/model.go b/internal/k8sprometheus/model.go index 2d4aaea3..8de85c87 100644 --- a/internal/k8sprometheus/model.go +++ b/internal/k8sprometheus/model.go @@ -3,7 +3,7 @@ package k8sprometheus import ( "github.com/go-playground/validator/v10" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/prometheus" ) // K8sMeta is the Kubernetes metadata simplified. diff --git a/internal/k8sprometheus/model_test.go b/internal/k8sprometheus/model_test.go index 2bcebdc5..c14f7e42 100644 --- a/internal/k8sprometheus/model_test.go +++ b/internal/k8sprometheus/model_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/internal/k8sprometheus" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/k8sprometheus" + "github.com/emergingtravel/sloth/internal/prometheus" ) func getGoodSLOGroup() k8sprometheus.SLOGroup { diff --git a/internal/k8sprometheus/spec.go b/internal/k8sprometheus/spec.go index 939f5081..d5cc2372 100644 --- a/internal/k8sprometheus/spec.go +++ b/internal/k8sprometheus/spec.go @@ -8,10 +8,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" - "github.com/ostrovok-tech/sloth/internal/prometheus" - k8sprometheusv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" - "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned/scheme" - prometheuspluginv1 "github.com/ostrovok-tech/sloth/pkg/prometheus/plugin/v1" + "github.com/emergingtravel/sloth/internal/prometheus" + k8sprometheusv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" + "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned/scheme" + prometheuspluginv1 "github.com/emergingtravel/sloth/pkg/prometheus/plugin/v1" ) type SLIPluginRepo interface { diff --git a/internal/k8sprometheus/spec_test.go b/internal/k8sprometheus/spec_test.go index 23841f6d..5fdcd191 100644 --- a/internal/k8sprometheus/spec_test.go +++ b/internal/k8sprometheus/spec_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/internal/k8sprometheus" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/k8sprometheus" + "github.com/emergingtravel/sloth/internal/prometheus" ) type testMemPluginsRepo map[string]prometheus.SLIPlugin diff --git a/internal/k8sprometheus/storage.go b/internal/k8sprometheus/storage.go index 3fc8e949..735038fb 100644 --- a/internal/k8sprometheus/storage.go +++ b/internal/k8sprometheus/storage.go @@ -14,9 +14,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/prometheus" ) var ( @@ -156,7 +156,7 @@ func writeTopDisclaimer(bs []byte) []byte { var disclaimer = fmt.Sprintf(` --- -# Code generated by Sloth (%s): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (%s): https://github.com/emergingtravel/sloth. # DO NOT EDIT. `, info.Version) diff --git a/internal/k8sprometheus/storage_test.go b/internal/k8sprometheus/storage_test.go index 52dc33eb..c2bcf91e 100644 --- a/internal/k8sprometheus/storage_test.go +++ b/internal/k8sprometheus/storage_test.go @@ -14,10 +14,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/ostrovok-tech/sloth/internal/k8sprometheus" - "github.com/ostrovok-tech/sloth/internal/k8sprometheus/k8sprometheusmock" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/k8sprometheus" + "github.com/emergingtravel/sloth/internal/k8sprometheus/k8sprometheusmock" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/prometheus" ) func TestIOWriterPrometheusOperatorYAMLRepo(t *testing.T) { @@ -64,7 +64,7 @@ func TestIOWriterPrometheusOperatorYAMLRepo(t *testing.T) { }, expYAML: ` --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 @@ -113,7 +113,7 @@ spec: }, expYAML: ` --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 @@ -163,7 +163,7 @@ spec: }, expYAML: ` --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 @@ -273,7 +273,7 @@ spec: }, expYAML: ` --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 diff --git a/internal/log/logrus/logrus.go b/internal/log/logrus/logrus.go index 3b7ce3b3..fc4aa97a 100644 --- a/internal/log/logrus/logrus.go +++ b/internal/log/logrus/logrus.go @@ -5,7 +5,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/ostrovok-tech/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/log" ) type logger struct { diff --git a/internal/openslo/spec.go b/internal/openslo/spec.go index 09b8d664..cd774dc0 100644 --- a/internal/openslo/spec.go +++ b/internal/openslo/spec.go @@ -12,7 +12,7 @@ import ( openslov1alpha "github.com/OpenSLO/oslo/pkg/manifest/v1alpha" "gopkg.in/yaml.v2" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/prometheus" ) type YAMLSpecLoader struct { diff --git a/internal/openslo/spec_test.go b/internal/openslo/spec_test.go index b2de1e9a..9f691730 100644 --- a/internal/openslo/spec_test.go +++ b/internal/openslo/spec_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/internal/openslo" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/openslo" + "github.com/emergingtravel/sloth/internal/prometheus" ) func TestYAMLoadSpec(t *testing.T) { diff --git a/internal/prometheus/alert_rules.go b/internal/prometheus/alert_rules.go index f0e4bda2..21c3e384 100644 --- a/internal/prometheus/alert_rules.go +++ b/internal/prometheus/alert_rules.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/prometheus/model/rulefmt" - "github.com/ostrovok-tech/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/alert" ) // genFunc knows how to generate an SLI recording rule for a specific time window. diff --git a/internal/prometheus/alert_rules_test.go b/internal/prometheus/alert_rules_test.go index d71c663e..9256aa14 100644 --- a/internal/prometheus/alert_rules_test.go +++ b/internal/prometheus/alert_rules_test.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/prometheus/model/rulefmt" "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/prometheus" ) func getSLOAlertGroup() alert.MWMBAlertGroup { diff --git a/internal/prometheus/helpers.go b/internal/prometheus/helpers.go index d51436ee..d9e43bc5 100644 --- a/internal/prometheus/helpers.go +++ b/internal/prometheus/helpers.go @@ -6,7 +6,7 @@ import ( prommodel "github.com/prometheus/common/model" - "github.com/ostrovok-tech/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/alert" ) func mergeLabels(ms ...map[string]string) map[string]string { diff --git a/internal/prometheus/model_test.go b/internal/prometheus/model_test.go index bd9fd124..719d435b 100644 --- a/internal/prometheus/model_test.go +++ b/internal/prometheus/model_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/prometheus" ) func getGoodSLOGroup() prometheus.SLOGroup { diff --git a/internal/prometheus/recording_rules.go b/internal/prometheus/recording_rules.go index a67f7ece..e1a0a479 100644 --- a/internal/prometheus/recording_rules.go +++ b/internal/prometheus/recording_rules.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/prometheus/model/rulefmt" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/info" ) // sliRulesgenFunc knows how to generate an SLI recording rule for a specific time window. diff --git a/internal/prometheus/recording_rules_test.go b/internal/prometheus/recording_rules_test.go index e19204d2..5da29231 100644 --- a/internal/prometheus/recording_rules_test.go +++ b/internal/prometheus/recording_rules_test.go @@ -8,9 +8,9 @@ import ( "github.com/prometheus/prometheus/model/rulefmt" "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/internal/alert" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/alert" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/prometheus" ) func getAlertGroup() alert.MWMBAlertGroup { diff --git a/internal/prometheus/sli_plugin.go b/internal/prometheus/sli_plugin.go index b12bdc12..85d46016 100644 --- a/internal/prometheus/sli_plugin.go +++ b/internal/prometheus/sli_plugin.go @@ -12,9 +12,9 @@ import ( "github.com/traefik/yaegi/interp" "github.com/traefik/yaegi/stdlib" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/pkg/prometheus/plugin/v1" - pluginv1 "github.com/ostrovok-tech/sloth/pkg/prometheus/plugin/v1" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/pkg/prometheus/plugin/v1" + pluginv1 "github.com/emergingtravel/sloth/pkg/prometheus/plugin/v1" ) // FileManager knows how to manage files. diff --git a/internal/prometheus/sli_plugin_test.go b/internal/prometheus/sli_plugin_test.go index c0e56f11..d96d3c07 100644 --- a/internal/prometheus/sli_plugin_test.go +++ b/internal/prometheus/sli_plugin_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/ostrovok-tech/sloth/internal/prometheus" - "github.com/ostrovok-tech/sloth/internal/prometheus/prometheusmock" + "github.com/emergingtravel/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/prometheus/prometheusmock" ) func TestSLIPluginLoader(t *testing.T) { diff --git a/internal/prometheus/spec.go b/internal/prometheus/spec.go index 7b5652b9..a7e59532 100644 --- a/internal/prometheus/spec.go +++ b/internal/prometheus/spec.go @@ -8,8 +8,8 @@ import ( "gopkg.in/yaml.v2" - prometheusv1 "github.com/ostrovok-tech/sloth/pkg/prometheus/api/v1" - prometheuspluginv1 "github.com/ostrovok-tech/sloth/pkg/prometheus/plugin/v1" + prometheusv1 "github.com/emergingtravel/sloth/pkg/prometheus/api/v1" + prometheuspluginv1 "github.com/emergingtravel/sloth/pkg/prometheus/plugin/v1" ) type SLIPluginRepo interface { diff --git a/internal/prometheus/spec_test.go b/internal/prometheus/spec_test.go index b1fda357..02ab401a 100644 --- a/internal/prometheus/spec_test.go +++ b/internal/prometheus/spec_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/prometheus" ) type testMemPluginsRepo map[string]prometheus.SLIPlugin diff --git a/internal/prometheus/storage.go b/internal/prometheus/storage.go index ed53d627..30937023 100644 --- a/internal/prometheus/storage.go +++ b/internal/prometheus/storage.go @@ -9,8 +9,8 @@ import ( "github.com/prometheus/prometheus/model/rulefmt" "gopkg.in/yaml.v2" - "github.com/ostrovok-tech/sloth/internal/info" - "github.com/ostrovok-tech/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/info" + "github.com/emergingtravel/sloth/internal/log" ) var ( @@ -96,7 +96,7 @@ func (i IOWriterGroupedRulesYAMLRepo) StoreSLOs(ctx context.Context, slos []Stor var disclaimer = fmt.Sprintf(` --- -# Code generated by Sloth (%s): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (%s): https://github.com/emergingtravel/sloth. # DO NOT EDIT. `, info.Version) diff --git a/internal/prometheus/storage_test.go b/internal/prometheus/storage_test.go index 29deeca4..0d593345 100644 --- a/internal/prometheus/storage_test.go +++ b/internal/prometheus/storage_test.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/prometheus/model/rulefmt" "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/internal/log" - "github.com/ostrovok-tech/sloth/internal/prometheus" + "github.com/emergingtravel/sloth/internal/log" + "github.com/emergingtravel/sloth/internal/prometheus" ) func TestIOWriterGroupedRulesYAMLRepoStore(t *testing.T) { @@ -47,7 +47,7 @@ func TestIOWriterGroupedRulesYAMLRepoStore(t *testing.T) { }, expYAML: ` --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: @@ -76,7 +76,7 @@ groups: }, expYAML: ` --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: @@ -106,7 +106,7 @@ groups: }, expYAML: ` --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: @@ -196,7 +196,7 @@ groups: }, expYAML: ` --- -# Code generated by Sloth (dev): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth (dev): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/pkg/kubernetes/api/sloth/v1/README.md b/pkg/kubernetes/api/sloth/v1/README.md index dc60cd5c..022d580e 100755 --- a/pkg/kubernetes/api/sloth/v1/README.md +++ b/pkg/kubernetes/api/sloth/v1/README.md @@ -3,7 +3,7 @@ # v1 ```go -import "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" +import "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" ``` ## Index diff --git a/pkg/kubernetes/api/sloth/v1/register.go b/pkg/kubernetes/api/sloth/v1/register.go index cd229e8e..d5f4c5d5 100644 --- a/pkg/kubernetes/api/sloth/v1/register.go +++ b/pkg/kubernetes/api/sloth/v1/register.go @@ -5,7 +5,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth" + "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth" ) const ( diff --git a/pkg/kubernetes/gen/clientset/versioned/clientset.go b/pkg/kubernetes/gen/clientset/versioned/clientset.go index 19a0df0d..e69ab321 100644 --- a/pkg/kubernetes/gen/clientset/versioned/clientset.go +++ b/pkg/kubernetes/gen/clientset/versioned/clientset.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/kubernetes/gen/clientset/versioned/fake/clientset_generated.go b/pkg/kubernetes/gen/clientset/versioned/fake/clientset_generated.go index 0c2d16b6..5756cdce 100644 --- a/pkg/kubernetes/gen/clientset/versioned/fake/clientset_generated.go +++ b/pkg/kubernetes/gen/clientset/versioned/fake/clientset_generated.go @@ -3,9 +3,9 @@ package fake import ( - clientset "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1" - fakeslothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake" + clientset "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1" + fakeslothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/kubernetes/gen/clientset/versioned/fake/register.go b/pkg/kubernetes/gen/clientset/versioned/fake/register.go index ccd05d39..7474f265 100644 --- a/pkg/kubernetes/gen/clientset/versioned/fake/register.go +++ b/pkg/kubernetes/gen/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kubernetes/gen/clientset/versioned/scheme/register.go b/pkg/kubernetes/gen/clientset/versioned/scheme/register.go index 2e8c52db..b5a29d92 100644 --- a/pkg/kubernetes/gen/clientset/versioned/scheme/register.go +++ b/pkg/kubernetes/gen/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake/fake_prometheusservicelevel.go b/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake/fake_prometheusservicelevel.go index bb73ffb0..8fd02be4 100644 --- a/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake/fake_prometheusservicelevel.go +++ b/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake/fake_prometheusservicelevel.go @@ -5,7 +5,7 @@ package fake import ( "context" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake/fake_sloth_client.go b/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake/fake_sloth_client.go index d862373f..55cd6b9d 100644 --- a/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake/fake_sloth_client.go +++ b/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/fake/fake_sloth_client.go @@ -3,7 +3,7 @@ package fake import ( - v1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1" + v1 "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/prometheusservicelevel.go b/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/prometheusservicelevel.go index 68889e19..7499545d 100644 --- a/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/prometheusservicelevel.go +++ b/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/prometheusservicelevel.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" - scheme "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned/scheme" + v1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" + scheme "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/sloth_client.go b/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/sloth_client.go index e2dd05dd..301f1f88 100644 --- a/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/sloth_client.go +++ b/pkg/kubernetes/gen/clientset/versioned/typed/sloth/v1/sloth_client.go @@ -5,8 +5,8 @@ package v1 import ( "net/http" - v1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" - "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned/scheme" + v1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" + "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/prometheus/alertwindows/v1/README.md b/pkg/prometheus/alertwindows/v1/README.md index e09b3180..aacca71d 100755 --- a/pkg/prometheus/alertwindows/v1/README.md +++ b/pkg/prometheus/alertwindows/v1/README.md @@ -3,7 +3,7 @@ # v1 ```go -import "github.com/ostrovok-tech/sloth/pkg/prometheus/alertwindows/v1" +import "github.com/emergingtravel/sloth/pkg/prometheus/alertwindows/v1" ``` ## Index diff --git a/pkg/prometheus/api/v1/README.md b/pkg/prometheus/api/v1/README.md index a2de614c..dece99da 100755 --- a/pkg/prometheus/api/v1/README.md +++ b/pkg/prometheus/api/v1/README.md @@ -3,7 +3,7 @@ # v1 ```go -import "github.com/ostrovok-tech/sloth/pkg/prometheus/api/v1" +import "github.com/emergingtravel/sloth/pkg/prometheus/api/v1" ``` ### Package v1 diff --git a/scripts/build/bin/build-raw.sh b/scripts/build/bin/build-raw.sh index 49e5dfb3..df8f8a3b 100755 --- a/scripts/build/bin/build-raw.sh +++ b/scripts/build/bin/build-raw.sh @@ -10,7 +10,7 @@ set -o nounset # - GOARCH: Arch compiling target. # - GOARM: ARM version. -version_path="github.com/ostrovok-tech/sloth/internal/info.Version" +version_path="github.com/emergingtravel/sloth/internal/info.Version" src=./cmd/sloth out=./bin/sloth diff --git a/scripts/kubegen.sh b/scripts/kubegen.sh index 781dc68b..7e559145 100755 --- a/scripts/kubegen.sh +++ b/scripts/kubegen.sh @@ -6,7 +6,7 @@ set -o nounset IMAGE_CLI_GEN=quay.io/slok/kube-code-generator:v1.25.0 IMAGE_CRD_GEN=quay.io/slok/kube-code-generator:v1.25.0 ROOT_DIRECTORY=$(dirname "$(readlink -f "$0")")/../ -PROJECT_PACKAGE="github.com/ostrovok-tech/sloth" +PROJECT_PACKAGE="github.com/emergingtravel/sloth" GEN_DIRECTORY="pkg/kubernetes/gen" echo "Cleaning gen directory" diff --git a/test/integration/k8scontroller/exp_base_test.go b/test/integration/k8scontroller/exp_base_test.go index 3dc49f70..fecc3629 100644 --- a/test/integration/k8scontroller/exp_base_test.go +++ b/test/integration/k8scontroller/exp_base_test.go @@ -5,7 +5,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" ) func getBasePrometheusServiceLevel() *slothv1.PrometheusServiceLevel { diff --git a/test/integration/k8scontroller/exp_plugin_test.go b/test/integration/k8scontroller/exp_plugin_test.go index beafd11e..d2e7e266 100644 --- a/test/integration/k8scontroller/exp_plugin_test.go +++ b/test/integration/k8scontroller/exp_plugin_test.go @@ -5,7 +5,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" ) func getPluginPrometheusServiceLevel() *slothv1.PrometheusServiceLevel { diff --git a/test/integration/k8scontroller/helpers.go b/test/integration/k8scontroller/helpers.go index 549d34ff..79cc9c66 100644 --- a/test/integration/k8scontroller/helpers.go +++ b/test/integration/k8scontroller/helpers.go @@ -15,8 +15,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - slothclientset "github.com/ostrovok-tech/sloth/pkg/kubernetes/gen/clientset/versioned" - "github.com/ostrovok-tech/sloth/test/integration/testutils" + slothclientset "github.com/emergingtravel/sloth/pkg/kubernetes/gen/clientset/versioned" + "github.com/emergingtravel/sloth/test/integration/testutils" ) type Config struct { diff --git a/test/integration/k8scontroller/k8scontroller_test.go b/test/integration/k8scontroller/k8scontroller_test.go index f5bfe7fe..41e6836b 100644 --- a/test/integration/k8scontroller/k8scontroller_test.go +++ b/test/integration/k8scontroller/k8scontroller_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - slothv1 "github.com/ostrovok-tech/sloth/pkg/kubernetes/api/sloth/v1" - "github.com/ostrovok-tech/sloth/test/integration/k8scontroller" - "github.com/ostrovok-tech/sloth/test/integration/testutils" + slothv1 "github.com/emergingtravel/sloth/pkg/kubernetes/api/sloth/v1" + "github.com/emergingtravel/sloth/test/integration/k8scontroller" + "github.com/emergingtravel/sloth/test/integration/testutils" ) // sanitizePrometheusRule will remove all the dynamic fields on a monitoringv1.PrometheusRule object diff --git a/test/integration/prometheus/generate_test.go b/test/integration/prometheus/generate_test.go index 08ee09cf..6cf17300 100644 --- a/test/integration/prometheus/generate_test.go +++ b/test/integration/prometheus/generate_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ostrovok-tech/sloth/test/integration/prometheus" - "github.com/ostrovok-tech/sloth/test/integration/testutils" + "github.com/emergingtravel/sloth/test/integration/prometheus" + "github.com/emergingtravel/sloth/test/integration/testutils" ) type expecteOutLoader struct { diff --git a/test/integration/prometheus/helpers.go b/test/integration/prometheus/helpers.go index 9605a291..9692aff3 100644 --- a/test/integration/prometheus/helpers.go +++ b/test/integration/prometheus/helpers.go @@ -7,7 +7,7 @@ import ( "os/exec" "testing" - "github.com/ostrovok-tech/sloth/test/integration/testutils" + "github.com/emergingtravel/sloth/test/integration/testutils" ) type Config struct { diff --git a/test/integration/prometheus/testdata/out-base-28d.yaml.tpl b/test/integration/prometheus/testdata/out-base-28d.yaml.tpl index d57e558f..c83c02eb 100644 --- a/test/integration/prometheus/testdata/out-base-28d.yaml.tpl +++ b/test/integration/prometheus/testdata/out-base-28d.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/testdata/out-base-custom-windows-7d.yaml.tpl b/test/integration/prometheus/testdata/out-base-custom-windows-7d.yaml.tpl index d7826c8a..49432b9b 100644 --- a/test/integration/prometheus/testdata/out-base-custom-windows-7d.yaml.tpl +++ b/test/integration/prometheus/testdata/out-base-custom-windows-7d.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/testdata/out-base-extra-labels.yaml.tpl b/test/integration/prometheus/testdata/out-base-extra-labels.yaml.tpl index 2179cc66..c1cb25cf 100644 --- a/test/integration/prometheus/testdata/out-base-extra-labels.yaml.tpl +++ b/test/integration/prometheus/testdata/out-base-extra-labels.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/testdata/out-base-k8s.yaml.tpl b/test/integration/prometheus/testdata/out-base-k8s.yaml.tpl index 64c93a49..a83e2e59 100644 --- a/test/integration/prometheus/testdata/out-base-k8s.yaml.tpl +++ b/test/integration/prometheus/testdata/out-base-k8s.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 diff --git a/test/integration/prometheus/testdata/out-base-no-alerts.yaml.tpl b/test/integration/prometheus/testdata/out-base-no-alerts.yaml.tpl index cff38eb6..05e09afe 100644 --- a/test/integration/prometheus/testdata/out-base-no-alerts.yaml.tpl +++ b/test/integration/prometheus/testdata/out-base-no-alerts.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/testdata/out-base-no-recordings.yaml.tpl b/test/integration/prometheus/testdata/out-base-no-recordings.yaml.tpl index 1dc473a4..4b198808 100644 --- a/test/integration/prometheus/testdata/out-base-no-recordings.yaml.tpl +++ b/test/integration/prometheus/testdata/out-base-no-recordings.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/testdata/out-base.yaml.tpl b/test/integration/prometheus/testdata/out-base.yaml.tpl index 69d519d0..3413fcca 100644 --- a/test/integration/prometheus/testdata/out-base.yaml.tpl +++ b/test/integration/prometheus/testdata/out-base.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/testdata/out-multifile-k8s.yaml.tpl b/test/integration/prometheus/testdata/out-multifile-k8s.yaml.tpl index ab102a0c..c1bad2e0 100644 --- a/test/integration/prometheus/testdata/out-multifile-k8s.yaml.tpl +++ b/test/integration/prometheus/testdata/out-multifile-k8s.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 @@ -411,7 +411,7 @@ spec: record: sloth_slo_info --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. apiVersion: monitoring.coreos.com/v1 diff --git a/test/integration/prometheus/testdata/out-multifile.yaml.tpl b/test/integration/prometheus/testdata/out-multifile.yaml.tpl index ebcb46ae..98023017 100644 --- a/test/integration/prometheus/testdata/out-multifile.yaml.tpl +++ b/test/integration/prometheus/testdata/out-multifile.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: @@ -401,7 +401,7 @@ groups: sloth_version: {{ .version }} --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/testdata/out-openslo.yaml.tpl b/test/integration/prometheus/testdata/out-openslo.yaml.tpl index f7127f78..1672d740 100644 --- a/test/integration/prometheus/testdata/out-openslo.yaml.tpl +++ b/test/integration/prometheus/testdata/out-openslo.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/testdata/out-plugin.yaml.tpl b/test/integration/prometheus/testdata/out-plugin.yaml.tpl index eaa91808..20599d64 100644 --- a/test/integration/prometheus/testdata/out-plugin.yaml.tpl +++ b/test/integration/prometheus/testdata/out-plugin.yaml.tpl @@ -1,6 +1,6 @@ --- -# Code generated by Sloth ({{ .version }}): https://github.com/ostrovok-tech/sloth. +# Code generated by Sloth ({{ .version }}): https://github.com/emergingtravel/sloth. # DO NOT EDIT. groups: diff --git a/test/integration/prometheus/validate_test.go b/test/integration/prometheus/validate_test.go index 0710d226..fec46530 100644 --- a/test/integration/prometheus/validate_test.go +++ b/test/integration/prometheus/validate_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ostrovok-tech/sloth/test/integration/prometheus" + "github.com/emergingtravel/sloth/test/integration/prometheus" ) func TestPrometheusValidate(t *testing.T) { From 3397a64b0f5abe1ed0cf705c14042f81162819ef Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Fri, 24 Apr 2026 14:15:38 +0700 Subject: [PATCH 2/8] Fix pipeline error. --- .golangci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index e3693114..2e8b195d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -27,7 +27,7 @@ linters-settings: - github.com/VictoriaMetrics/metricsql - github.com/go-playground/validator - github.com/oklog/run - - github.com/ostrovok-tech + - github.com/emergingtravel - github.com/prometheus - github.com/sirupsen/logrus - github.com/slok/reload From b802364e661d12e305a928b6de2e538d353c449d Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Fri, 24 Apr 2026 14:15:46 +0700 Subject: [PATCH 3/8] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5d56b05..878a5a57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [0.18.0] - 2025-04-24 +### Changed +- All mentions of `ostrovok-tech` were changed to `emergingtravel`. + +### Fixed +- Pipeline error if repo name is not lowercased. ## [0.17.0] - 2025-12-03 ### Added @@ -73,7 +79,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Update to **Go 1.23**. - `docker/dev/Dockerfile` Update **golangci** to **1.60.3**, **mokery** to **2.45.0**, **gomarkdoc** to **1.1.0**. -- Retarget URLs and imports from [slok/sloth](https://github.com/slok/sloth/tree/main) to [ostrovok-tech/sloth](https://github.com/ostrovok-tech/sloth) repository. +- Retarget URLs and imports from [slok/sloth](https://github.com/slok/sloth/tree/main) to [emergingtravel/sloth](https://github.com/emergingtravel/sloth) repository. - `CI` actions updated, docker build version changed. ## [v0.11.0] - 2022-10-22 From 8564a069785a4e3ed54de8bbd87d21184ecc97dd Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Fri, 24 Apr 2026 16:05:19 +0700 Subject: [PATCH 4/8] Update Go up to 1.25.0. --- CHANGELOG.md | 3 +++ docker/dev/Dockerfile | 2 +- docker/prod/Dockerfile | 2 +- go.mod | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 878a5a57..1e454163 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [0.18.0] - 2025-04-24 ### Changed +- Update to **Go 1.25.0**. +- `docker/dev/Dockerfile` update **golang** to **1.25.0**. +- `docker/prod/Dockerfile` update **golang** to **1.25.0-alpine**. - All mentions of `ostrovok-tech` were changed to `emergingtravel`. ### Fixed diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 83d1da25..1a5a4d0c 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.1 +FROM golang:1.25.0 LABEL org.opencontainers.image.source https://github.com/emergingtravel/sloth diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index e0a15442..6b16ddba 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -1,7 +1,7 @@ # Set also `ALPINE_ARCH` ARG here so we can use it on all the `FROM`s. ARG ALPINE_ARCH -FROM golang:1.24.1-alpine as build-stage +FROM golang:1.25.0-alpine as build-stage # hadolint global ignore=DL3018 RUN apk --no-cache add g++ git make curl bash tree diff --git a/go.mod b/go.mod index 216a0c92..cf3c924a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/emergingtravel/sloth -go 1.24.1 +go 1.25.0 require ( github.com/OpenSLO/oslo v0.12.0 From b224e70240fe8429182d0fb2a1f79f057b1b3a00 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Fri, 24 Apr 2026 16:23:41 +0700 Subject: [PATCH 5/8] Update golint version. --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d381c2c6..4b39f792 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: check: name: Check runs-on: ubuntu-latest - container: golangci/golangci-lint:v1.64.8 + container: golangci/golangci-lint:v2.11.4 steps: - uses: actions/checkout@v4 From bee944fa3da07866a0e6ef59cc3521c16e327abf Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Fri, 24 Apr 2026 16:28:54 +0700 Subject: [PATCH 6/8] Add lint version. --- .golangci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.golangci.yml b/.golangci.yml index 2e8b195d..6c1bf161 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,4 +1,6 @@ --- +version: 2 + run: timeout: 3m build-tags: From dfec2251e18d4c689c5385431a56b7f739e1bcc3 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Fri, 24 Apr 2026 16:55:58 +0700 Subject: [PATCH 7/8] Remove unnecessary linters. --- .golangci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 6c1bf161..a37940dc 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -9,9 +9,7 @@ run: linters: enable: - misspell - - goimports - revive - - gofmt - depguard - godot From 2da7f834051479a0707f26410b853d1cacbb60b1 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Wed, 29 Apr 2026 12:57:35 +0700 Subject: [PATCH 8/8] Update linter. --- .golangci.yml | 29 ---------------------------- CHANGELOG.md | 3 +++ cmd/sloth/commands/generate.go | 28 +++++++++++++++++++++++---- cmd/sloth/commands/k8scontroller.go | 2 +- cmd/sloth/commands/validate.go | 12 ++++++------ cmd/sloth/commands/version.go | 5 ++++- internal/k8sprometheus/kubernetes.go | 2 +- internal/k8sprometheus/storage.go | 2 +- internal/log/logrus/logrus.go | 2 +- internal/prometheus/sli_plugin.go | 9 ++++----- 10 files changed, 45 insertions(+), 49 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index a37940dc..31aa37ca 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -9,33 +9,4 @@ run: linters: enable: - misspell - - revive - - depguard - godot - -linters-settings: - depguard: - rules: - main: - #list-mode: lax # allow unless explicitely denied - files: - - $all - - "!$test" - allow: - - $gostd - - github.com/OpenSLO/oslo - - github.com/VictoriaMetrics/metricsql - - github.com/go-playground/validator - - github.com/oklog/run - - github.com/emergingtravel - - github.com/prometheus - - github.com/sirupsen/logrus - - github.com/slok/reload - - github.com/spotahome/kooper - - github.com/traefik - - k8s.io/api/core/v1 - - k8s.io/apimachinery - - k8s.io/client-go - - gopkg.in/yaml.v2 - - gopkg.in/alecthomas/kingpin.v2 - deny: [] diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e454163..2acf5063 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - `docker/dev/Dockerfile` update **golang** to **1.25.0**. - `docker/prod/Dockerfile` update **golang** to **1.25.0-alpine**. - All mentions of `ostrovok-tech` were changed to `emergingtravel`. +- Update `golangci-lint` up to `2.11.4`. +- Disable `revive` and `depguard` linters. ### Fixed - Pipeline error if repo name is not lowercased. +- Fix appeared linter issues. ## [0.17.0] - 2025-12-03 ### Added diff --git a/cmd/sloth/commands/generate.go b/cmd/sloth/commands/generate.go index a9bb63f2..73e12eb3 100644 --- a/cmd/sloth/commands/generate.go +++ b/cmd/sloth/commands/generate.go @@ -150,7 +150,12 @@ func (g generateCommand) Run(ctx context.Context, config RootConfig) error { if err != nil { return fmt.Errorf("could not open SLOs spec file: %w", err) } - defer f.Close() + defer func(f *os.File) { + err := f.Close() + if err != nil { + logger.Errorf("could not close SLOs spec file: %w", err) + } + }(f) slxData, err := io.ReadAll(f) if err != nil { @@ -167,7 +172,12 @@ func (g generateCommand) Run(ctx context.Context, config RootConfig) error { if err != nil { return fmt.Errorf("could not create out file: %w", err) } - defer f.Close() + defer func(f *os.File) { + err := f.Close() + if err != nil { + logger.Errorf("could not close out file: %w", err) + } + }(f) out = outFile } for _, s := range splittedSLOsData { @@ -208,7 +218,12 @@ func (g generateCommand) Run(ctx context.Context, config RootConfig) error { if err != nil { return fmt.Errorf("could not open SLOs spec file: %w", err) } - defer f.Close() + defer func(f *os.File) { + err := f.Close() + if err != nil { + logger.Errorf("could not close SLOs spec file: %w", err) + } + }(f) slxData, err := io.ReadAll(f) if err != nil { @@ -230,7 +245,12 @@ func (g generateCommand) Run(ctx context.Context, config RootConfig) error { if err != nil { return fmt.Errorf("could not create out file: %w", err) } - defer outFile.Close() + defer func(outFile *os.File) { + err := outFile.Close() + if err != nil { + logger.Errorf("could not close out file: %w", err) + } + }(outFile) // Split YAMLs in case we have multiple yaml files in a single file. splittedSLOsData := splitYAML(slxData) diff --git a/cmd/sloth/commands/k8scontroller.go b/cmd/sloth/commands/k8scontroller.go index 9b553080..d57ce608 100644 --- a/cmd/sloth/commands/k8scontroller.go +++ b/cmd/sloth/commands/k8scontroller.go @@ -464,7 +464,7 @@ type kooperlogger struct { } func (k kooperlogger) WithKV(kv kooperlog.KV) kooperlog.Logger { - return kooperlogger{Logger: k.Logger.WithValues(log.Kv(kv))} + return kooperlogger{Logger: k.WithValues(log.Kv(kv))} } // generatorLogger is app service generator logger that will set the info messages as debug, diff --git a/cmd/sloth/commands/validate.go b/cmd/sloth/commands/validate.go index 4fdc37b5..9ad57ff0 100644 --- a/cmd/sloth/commands/validate.go +++ b/cmd/sloth/commands/validate.go @@ -152,12 +152,12 @@ func (v validateCommand) Run(ctx context.Context, config RootConfig) error { if promErr == nil { err := gen.GeneratePrometheus(ctx, *slos, io.Discard) if err != nil { - validation.Errs = []error{fmt.Errorf("Could not generate Prometheus format rules: %w", err)} + validation.Errs = []error{fmt.Errorf("could not generate Prometheus format rules: %w", err)} } continue } - validation.Errs = []error{fmt.Errorf("Tried loading raw prometheus SLOs spec, it couldn't: %w", promErr)} + validation.Errs = []error{fmt.Errorf("tried loading raw prometheus SLOs spec, it couldn't: %w", promErr)} case kubeYAMLLoader.IsSpecType(ctx, dataB): sloGroup, k8sErr := kubeYAMLLoader.LoadSpec(ctx, dataB) @@ -169,22 +169,22 @@ func (v validateCommand) Run(ctx context.Context, config RootConfig) error { continue } - validation.Errs = []error{fmt.Errorf("Tried loading Kubernetes prometheus SLOs spec, it couldn't: %w", k8sErr)} + validation.Errs = []error{fmt.Errorf("tried loading Kubernetes prometheus SLOs spec, it couldn't: %w", k8sErr)} case openSLOYAMLLoader.IsSpecType(ctx, dataB): slos, openSLOErr := openSLOYAMLLoader.LoadSpec(ctx, dataB) if openSLOErr == nil { err := gen.GenerateOpenSLO(ctx, *slos, io.Discard) if err != nil { - validation.Errs = []error{fmt.Errorf("Could not generate OpenSLO format rules: %w", err)} + validation.Errs = []error{fmt.Errorf("could not generate OpenSLO format rules: %w", err)} } continue } - validation.Errs = []error{fmt.Errorf("Tried loading OpenSLO SLOs spec, it couldn't: %s", openSLOErr)} + validation.Errs = []error{fmt.Errorf("tried loading OpenSLO SLOs spec, it couldn't: %s", openSLOErr)} default: - validation.Errs = []error{fmt.Errorf("Unknown spec type")} + validation.Errs = []error{fmt.Errorf("unknown spec type")} } } diff --git a/cmd/sloth/commands/version.go b/cmd/sloth/commands/version.go index d9c8a04f..b6a75aca 100644 --- a/cmd/sloth/commands/version.go +++ b/cmd/sloth/commands/version.go @@ -24,6 +24,9 @@ func (versionCommand) Name() string { } func (versionCommand) Run(_ context.Context, config RootConfig) error { - fmt.Fprintf(config.Stdout, "%s\n", info.Version) + _, err := fmt.Fprintf(config.Stdout, "%s\n", info.Version) + if err != nil { + return err + } return nil } diff --git a/internal/k8sprometheus/kubernetes.go b/internal/k8sprometheus/kubernetes.go index ef3fcb4e..4ea639ce 100644 --- a/internal/k8sprometheus/kubernetes.go +++ b/internal/k8sprometheus/kubernetes.go @@ -59,7 +59,7 @@ func (k KubernetesService) EnsurePrometheusRule(ctx context.Context, pr *monitor } // Force overwrite. - pr.ObjectMeta.ResourceVersion = stored.ResourceVersion + pr.ResourceVersion = stored.ResourceVersion _, err = k.monitoringCli.MonitoringV1().PrometheusRules(pr.Namespace).Update(ctx, pr, metav1.UpdateOptions{}) if err != nil { return err diff --git a/internal/k8sprometheus/storage.go b/internal/k8sprometheus/storage.go index 735038fb..d99b0786 100644 --- a/internal/k8sprometheus/storage.go +++ b/internal/k8sprometheus/storage.go @@ -189,7 +189,7 @@ func (p PrometheusOperatorCRDRepo) StoreSLOs(ctx context.Context, kmeta K8sMeta, } // Add object reference. - rule.ObjectMeta.OwnerReferences = append(rule.ObjectMeta.OwnerReferences, metav1.OwnerReference{ + rule.OwnerReferences = append(rule.OwnerReferences, metav1.OwnerReference{ Kind: kmeta.Kind, APIVersion: kmeta.APIVersion, Name: kmeta.Name, diff --git a/internal/log/logrus/logrus.go b/internal/log/logrus/logrus.go index fc4aa97a..de5b9f3b 100644 --- a/internal/log/logrus/logrus.go +++ b/internal/log/logrus/logrus.go @@ -18,7 +18,7 @@ func NewLogrus(l *logrus.Entry) log.Logger { } func (l logger) WithValues(kv log.Kv) log.Logger { - newLogger := l.Entry.WithFields(kv) + newLogger := l.WithFields(kv) return NewLogrus(newLogger) } diff --git a/internal/prometheus/sli_plugin.go b/internal/prometheus/sli_plugin.go index 85d46016..50066986 100644 --- a/internal/prometheus/sli_plugin.go +++ b/internal/prometheus/sli_plugin.go @@ -14,7 +14,6 @@ import ( "github.com/emergingtravel/sloth/internal/log" "github.com/emergingtravel/sloth/pkg/prometheus/plugin/v1" - pluginv1 "github.com/emergingtravel/sloth/pkg/prometheus/plugin/v1" ) // FileManager knows how to manage files. @@ -232,8 +231,8 @@ func (s sliPluginLoader) LoadRawSLIPlugin(ctx context.Context, src string) (*SLI return nil, fmt.Errorf("could not get plugin version: %w", err) } - pluginVer, ok := pluginVerTmp.Interface().(pluginv1.SLIPluginVersion) - if !ok || (pluginVer != pluginv1.Version) { + pluginVer, ok := pluginVerTmp.Interface().(plugin.SLIPluginVersion) + if !ok || (pluginVer != plugin.Version) { return nil, fmt.Errorf("unsuported plugin version: %s", pluginVer) } @@ -243,7 +242,7 @@ func (s sliPluginLoader) LoadRawSLIPlugin(ctx context.Context, src string) (*SLI return nil, fmt.Errorf("could not get plugin ID: %w", err) } - pluginID, ok := pluginIDTmp.Interface().(pluginv1.SLIPluginID) + pluginID, ok := pluginIDTmp.Interface().(plugin.SLIPluginID) if !ok { return nil, fmt.Errorf("invalid SLI plugin ID type") } @@ -254,7 +253,7 @@ func (s sliPluginLoader) LoadRawSLIPlugin(ctx context.Context, src string) (*SLI return nil, fmt.Errorf("could not get plugin: %w", err) } - pluginFunc, ok := pluginFuncTmp.Interface().(pluginv1.SLIPlugin) + pluginFunc, ok := pluginFuncTmp.Interface().(plugin.SLIPlugin) if !ok { return nil, fmt.Errorf("invalid SLI plugin type") }