Skip to content

Commit

Permalink
Merge pull request grafana#338 from xperimental/remove-metrics-5.6
Browse files Browse the repository at this point in the history
operator: Remove unused telemetry implementation
  • Loading branch information
openshift-merge-bot[bot] authored Aug 7, 2024
2 parents 313a377 + b51664e commit 907fe85
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 172 deletions.
1 change: 1 addition & 0 deletions operator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Release 5.6.22

- [openshift#338](https://github.com/openshift/loki/pull/338) **xperimental**: Remove unused telemetry metrics
- [13512](https://github.com/grafana/loki/pull/13512) **xperimental**: feat(operator): Add alert for discarded samples

## Release 5.6.21
Expand Down
7 changes: 0 additions & 7 deletions operator/internal/handlers/lokistack_create_or_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"github.com/grafana/loki/operator/internal/handlers/internal/storage"
"github.com/grafana/loki/operator/internal/handlers/internal/tlsprofile"
"github.com/grafana/loki/operator/internal/manifests"
"github.com/grafana/loki/operator/internal/metrics"
"github.com/grafana/loki/operator/internal/status"
)

Expand Down Expand Up @@ -207,12 +206,6 @@ func CreateOrUpdateLokiStack(
return kverrors.New("failed to configure lokistack resources", "name", req.NamespacedName)
}

// 1x.extra-small is used only for development, so the metrics will not
// be collected.
if opts.Stack.Size != lokiv1.SizeOneXExtraSmall {
metrics.Collect(&opts.Stack, opts.Name)
}

return nil
}

Expand Down
161 changes: 0 additions & 161 deletions operator/internal/metrics/metrics.go

This file was deleted.

4 changes: 0 additions & 4 deletions operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
lokiv1beta1 "github.com/grafana/loki/operator/apis/loki/v1beta1"
lokictrl "github.com/grafana/loki/operator/controllers/loki"
"github.com/grafana/loki/operator/internal/config"
"github.com/grafana/loki/operator/internal/metrics"
"github.com/grafana/loki/operator/internal/validation"
"github.com/grafana/loki/operator/internal/validation/openshift"

Expand Down Expand Up @@ -175,9 +174,6 @@ func main() {
os.Exit(1)
}

logger.Info("registering metrics")
metrics.RegisterMetricCollectors()

logger.Info("Registering profiling endpoints.")
err = registerProfiler(mgr)
if err != nil {
Expand Down

0 comments on commit 907fe85

Please sign in to comment.