From 4e69d10ff7976674abcaba7f1177471a80a31407 Mon Sep 17 00:00:00 2001 From: Arkady Emelyanov Date: Wed, 13 Jun 2018 23:05:27 +0300 Subject: [PATCH] Add owner tag on partitions in burrow input (#4281) --- plugins/inputs/burrow/README.md | 1 + plugins/inputs/burrow/burrow.go | 2 ++ plugins/inputs/burrow/burrow_test.go | 6 +++--- .../testdata/v3_kafka_clustername1_consumer_group1_lag.json | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/plugins/inputs/burrow/README.md b/plugins/inputs/burrow/README.md index fe0b078ba..19073a6ef 100644 --- a/plugins/inputs/burrow/README.md +++ b/plugins/inputs/burrow/README.md @@ -92,6 +92,7 @@ Supported Burrow version: `1.x` - group (string) - topic (string) - partition (int) + - owner (string) * `burrow_topic` - cluster (string) diff --git a/plugins/inputs/burrow/burrow.go b/plugins/inputs/burrow/burrow.go index 88fdb4b7f..91e3ffe15 100644 --- a/plugins/inputs/burrow/burrow.go +++ b/plugins/inputs/burrow/burrow.go @@ -116,6 +116,7 @@ type ( Start apiStatusResponseLagItem `json:"start"` End apiStatusResponseLagItem `json:"end"` CurrentLag int64 `json:"current_lag"` + Owner string `json:"owner"` } // response: lag field item @@ -447,6 +448,7 @@ func (b *burrow) genGroupLagMetrics(r *apiResponse, cluster, group string, acc t "group": group, "topic": partition.Topic, "partition": strconv.FormatInt(int64(partition.Partition), 10), + "owner": partition.Owner, }, ) } diff --git a/plugins/inputs/burrow/burrow_test.go b/plugins/inputs/burrow/burrow_test.go index 9b3f4a0a9..5ea85798a 100644 --- a/plugins/inputs/burrow/burrow_test.go +++ b/plugins/inputs/burrow/burrow_test.go @@ -129,9 +129,9 @@ func TestBurrowPartition(t *testing.T) { }, } tags := []map[string]string{ - {"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "0"}, - {"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "1"}, - {"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "2"}, + {"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "0", "owner": "kafka1"}, + {"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "1", "owner": "kafka2"}, + {"cluster": "clustername1", "group": "group1", "topic": "topicA", "partition": "2", "owner": "kafka3"}, } require.Empty(t, acc.Errors) diff --git a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json index 21205a663..79d18cd66 100644 --- a/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json +++ b/plugins/inputs/burrow/testdata/v3_kafka_clustername1_consumer_group1_lag.json @@ -10,7 +10,7 @@ { "topic": "topicA", "partition": 0, - "owner": "kafka", + "owner": "kafka1", "status": "OK", "start": { "offset": 431323195, @@ -28,7 +28,7 @@ { "topic": "topicA", "partition": 1, - "owner": "kafka", + "owner": "kafka2", "status": "OK", "start": { "offset": 431322962, @@ -46,7 +46,7 @@ { "topic": "topicA", "partition": 2, - "owner": "kafka", + "owner": "kafka3", "status": "OK", "start": { "offset": 428636563,