Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

burrow_kafka_consumer_partition_lag and burrow_kafka_consumer_current_offset add owner #655

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

burrow_kafka_consumer_partition_lag and burrow_kafka_consumer_current_offset add owner #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions core/internal/httpserver/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package httpserver
import (
"net/http"
"strconv"
"strings"

"github.com/prometheus/client_golang/prometheus"

Expand Down Expand Up @@ -34,15 +35,15 @@ var (
Name: "burrow_kafka_consumer_current_offset",
Help: "Latest offset that Burrow is storing for this partition",
},
[]string{"cluster", "consumer_group", "topic", "partition"},
[]string{"cluster", "consumer_group", "topic", "partition", "owner"},
)

consumerPartitionLagGauge = promauto.NewGaugeVec(
prometheus.GaugeOpts{
Name: "burrow_kafka_consumer_partition_lag",
Help: "Number of messages the consumer group is behind by for a partition as reported by Burrow",
},
[]string{"cluster", "consumer_group", "topic", "partition"},
[]string{"cluster", "consumer_group", "topic", "partition", "owner"},
)

topicPartitionOffsetGauge = promauto.NewGaugeVec(
Expand Down Expand Up @@ -86,6 +87,7 @@ func (hc *Coordinator) handlePrometheusMetrics() http.HandlerFunc {
"consumer_group": consumer,
"topic": partition.Topic,
"partition": strconv.FormatInt(int64(partition.Partition), 10),
"owner": strings.Replace(partition.Owner, "/", "", -1),
}

consumerPartitionCurrentOffset.With(labels).Set(float64(partition.End.Offset))
Expand Down
16 changes: 10 additions & 6 deletions core/internal/httpserver/prometheus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func TestHttpServer_handlePrometheusMetrics(t *testing.T) {
End: &protocol.ConsumerOffset{
Offset: 22663,
},
Owner: "/1.1.1.1",
},
{
Topic: "testtopic",
Expand All @@ -82,6 +83,7 @@ func TestHttpServer_handlePrometheusMetrics(t *testing.T) {
End: &protocol.ConsumerOffset{
Offset: 2488,
},
Owner: "/1.1.1.1",
},
{
Topic: "testtopic1",
Expand All @@ -92,6 +94,7 @@ func TestHttpServer_handlePrometheusMetrics(t *testing.T) {
End: &protocol.ConsumerOffset{
Offset: 99888,
},
Owner: "/1.1.1.1",
},
{
Topic: "incomplete",
Expand All @@ -102,6 +105,7 @@ func TestHttpServer_handlePrometheusMetrics(t *testing.T) {
End: &protocol.ConsumerOffset{
Offset: 5335,
},
Owner: "/1.1.1.1",
},
},
TotalPartitions: 2134,
Expand Down Expand Up @@ -139,13 +143,13 @@ func TestHttpServer_handlePrometheusMetrics(t *testing.T) {
assert.Contains(t, promExp, `burrow_kafka_consumer_status{cluster="testcluster",consumer_group="testgroup"} 1`)
assert.Contains(t, promExp, `burrow_kafka_consumer_lag_total{cluster="testcluster",consumer_group="testgroup"} 2345`)

assert.Contains(t, promExp, `burrow_kafka_consumer_partition_lag{cluster="testcluster",consumer_group="testgroup",partition="0",topic="testtopic"} 100`)
assert.Contains(t, promExp, `burrow_kafka_consumer_partition_lag{cluster="testcluster",consumer_group="testgroup",partition="1",topic="testtopic"} 10`)
assert.Contains(t, promExp, `burrow_kafka_consumer_partition_lag{cluster="testcluster",consumer_group="testgroup",partition="0",topic="testtopic1"} 50`)
assert.Contains(t, promExp, `burrow_kafka_consumer_partition_lag{cluster="testcluster",consumer_group="testgroup",owner="1.1.1.1",partition="0",topic="testtopic"} 100`)
assert.Contains(t, promExp, `burrow_kafka_consumer_partition_lag{cluster="testcluster",consumer_group="testgroup",owner="1.1.1.1",partition="1",topic="testtopic"} 10`)
assert.Contains(t, promExp, `burrow_kafka_consumer_partition_lag{cluster="testcluster",consumer_group="testgroup",owner="1.1.1.1",partition="0",topic="testtopic1"} 50`)

assert.Contains(t, promExp, `burrow_kafka_consumer_current_offset{cluster="testcluster",consumer_group="testgroup",partition="0",topic="testtopic"} 22663`)
assert.Contains(t, promExp, `burrow_kafka_consumer_current_offset{cluster="testcluster",consumer_group="testgroup",partition="1",topic="testtopic"} 2488`)
assert.Contains(t, promExp, `burrow_kafka_consumer_current_offset{cluster="testcluster",consumer_group="testgroup",partition="0",topic="testtopic1"} 99888`)
assert.Contains(t, promExp, `burrow_kafka_consumer_current_offset{cluster="testcluster",consumer_group="testgroup",owner="1.1.1.1",partition="0",topic="testtopic"} 22663`)
assert.Contains(t, promExp, `burrow_kafka_consumer_current_offset{cluster="testcluster",consumer_group="testgroup",owner="1.1.1.1",partition="1",topic="testtopic"} 2488`)
assert.Contains(t, promExp, `burrow_kafka_consumer_current_offset{cluster="testcluster",consumer_group="testgroup",owner="1.1.1.1",partition="0",topic="testtopic1"} 99888`)

assert.Contains(t, promExp, `burrow_kafka_topic_partition_offset{cluster="testcluster",partition="0",topic="testtopic"} 6556`)
assert.Contains(t, promExp, `burrow_kafka_topic_partition_offset{cluster="testcluster",partition="1",topic="testtopic"} 5566`)
Expand Down