Skip to content

Commit d5ce63e

Browse files
benclivetrevorwhitney
authored andcommitted
fix(kafka): Set namespace for Loki kafka metrics (#14426)
1 parent 103e020 commit d5ce63e

File tree

2 files changed

+24
-14
lines changed

2 files changed

+24
-14
lines changed

pkg/distributor/distributor.go

+12-8
Original file line numberDiff line numberDiff line change
@@ -279,25 +279,29 @@ func New(
279279
Help: "Total number of times the distributor has sharded streams",
280280
}),
281281
kafkaAppends: promauto.With(registerer).NewCounterVec(prometheus.CounterOpts{
282-
Name: "kafka_appends_total",
283-
Help: "The total number of appends sent to kafka ingest path.",
282+
Namespace: constants.Loki,
283+
Name: "distributor_kafka_appends_total",
284+
Help: "The total number of appends sent to kafka ingest path.",
284285
}, []string{"partition", "status"}),
285286
kafkaWriteLatency: promauto.With(registerer).NewHistogram(prometheus.HistogramOpts{
286-
Name: "kafka_latency_seconds",
287+
Namespace: constants.Loki,
288+
Name: "distributor_kafka_latency_seconds",
287289
Help: "Latency to write an incoming request to the ingest storage.",
288290
NativeHistogramBucketFactor: 1.1,
289291
NativeHistogramMinResetDuration: 1 * time.Hour,
290292
NativeHistogramMaxBucketNumber: 100,
291293
Buckets: prometheus.DefBuckets,
292294
}),
293295
kafkaWriteBytesTotal: promauto.With(registerer).NewCounter(prometheus.CounterOpts{
294-
Name: "kafka_sent_bytes_total",
295-
Help: "Total number of bytes sent to the ingest storage.",
296+
Namespace: constants.Loki,
297+
Name: "distributor_kafka_sent_bytes_total",
298+
Help: "Total number of bytes sent to the ingest storage.",
296299
}),
297300
kafkaRecordsPerRequest: promauto.With(registerer).NewHistogram(prometheus.HistogramOpts{
298-
Name: "kafka_records_per_write_request",
299-
Help: "The number of records a single per-partition write request has been split into.",
300-
Buckets: prometheus.ExponentialBuckets(1, 2, 8),
301+
Namespace: constants.Loki,
302+
Name: "distributor_kafka_records_per_write_request",
303+
Help: "The number of records a single per-partition write request has been split into.",
304+
Buckets: prometheus.ExponentialBuckets(1, 2, 8),
301305
}),
302306
writeFailuresManager: writefailures.NewManager(logger, registerer, cfg.WriteFailuresLogging, configs, "distributor"),
303307
kafkaWriter: kafkaWriter,

pkg/kafka/writer_client.go

+12-6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"go.opentelemetry.io/otel/propagation"
1919
"go.opentelemetry.io/otel/trace"
2020
"go.uber.org/atomic"
21+
22+
"github.com/grafana/loki/v3/pkg/util/constants"
2123
)
2224

2325
// NewWriterClient returns the kgo.Client that should be used by the Writer.
@@ -189,6 +191,7 @@ func NewProducer(client *kgo.Client, maxBufferedBytes int64, reg prometheus.Regi
189191
// Metrics.
190192
bufferedProduceBytes: promauto.With(reg).NewSummary(
191193
prometheus.SummaryOpts{
194+
Namespace: constants.Loki,
192195
Name: "buffered_produce_bytes",
193196
Help: "The buffered produce records in bytes. Quantile buckets keep track of buffered records size over the last 60s.",
194197
Objectives: map[float64]float64{0.5: 0.05, 0.99: 0.001, 1: 0.001},
@@ -197,16 +200,19 @@ func NewProducer(client *kgo.Client, maxBufferedBytes int64, reg prometheus.Regi
197200
}),
198201
bufferedProduceBytesLimit: promauto.With(reg).NewGauge(
199202
prometheus.GaugeOpts{
200-
Name: "buffered_produce_bytes_limit",
201-
Help: "The bytes limit on buffered produce records. Produce requests fail once this limit is reached.",
203+
Namespace: constants.Loki,
204+
Name: "buffered_produce_bytes_limit",
205+
Help: "The bytes limit on buffered produce records. Produce requests fail once this limit is reached.",
202206
}),
203207
produceRequestsTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
204-
Name: "produce_requests_total",
205-
Help: "Total number of produce requests issued to Kafka.",
208+
Namespace: constants.Loki,
209+
Name: "produce_requests_total",
210+
Help: "Total number of produce requests issued to Kafka.",
206211
}),
207212
produceFailuresTotal: promauto.With(reg).NewCounterVec(prometheus.CounterOpts{
208-
Name: "produce_failures_total",
209-
Help: "Total number of failed produce requests issued to Kafka.",
213+
Namespace: constants.Loki,
214+
Name: "produce_failures_total",
215+
Help: "Total number of failed produce requests issued to Kafka.",
210216
}, []string{"reason"}),
211217
}
212218

0 commit comments

Comments
 (0)