lint

grafana · Aug 29, 2024 · 9332b5f · 9332b5f
1 parent 5fd67b0
commit 9332b5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/ingester-kafka/ingester.go b/pkg/ingester-kafka/ingester.go
@@ -233,7 +233,6 @@ func (i *Ingester) running(ctx context.Context) error {
 	// stop
 	case err := <-i.lifecyclerWatcher.Chan():
 		serviceError = fmt.Errorf("lifecycler failed: %w", err)
-		serviceError = fmt.Errorf("lifecycler failed: %w", err)
 	}
 
 	return serviceError
@@ -470,7 +469,7 @@ func (i *Ingester) handleShutdown(terminate, flush, del bool) error {
 }
 
 // Push implements logproto.Pusher.
-func (i *Ingester) Push(ctx context.Context, req *logproto.PushRequest) (*logproto.PushResponse, error) {
+func (i *Ingester) Push(_ context.Context, _ *logproto.PushRequest) (*logproto.PushResponse, error) {
 	return &logproto.PushResponse{}, nil
 }
 

diff --git a/pkg/loki/loki.go b/pkg/loki/loki.go
@@ -115,7 +115,7 @@ type Config struct {
 	Metastore           metastore.Config           `yaml:"metastore,omitempty"`
 	MetastoreClient     metastoreclient.Config     `yaml:"metastore_client"`
 	PartitionRingConfig partitionring.Config       `yaml:"partition_ring,omitempty" category:"experimental"`
-	KafkaConfig         kafka.Config               `yaml:"kafka_ingester,omitempty" category:"experimental"`
+	KafkaConfig         kafka.Config               `yaml:"kafka_config,omitempty" category:"experimental"`
 	KafkaIngester       ingesterkafka.Config       `yaml:"kafka_ingester,omitempty" category:"experimental"`
 
 	RuntimeConfig     runtimeconfig.Config `yaml:"runtime_config,omitempty"`