dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add cluster name tag to elasticsearch indices (#5998)

This commit is contained in:
dupondje 2019-06-17 22:31:15 +02:00 committed by Daniel Nelson
parent 22366f2a41
commit 1775e1cdc6
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/inputs/elasticsearch/elasticsearch.go
View File

@ -50,6 +50,7 @@ type clusterHealth struct {
RelocatingShards int `json:"relocating_shards"` RelocatingShards int `json:"relocating_shards"`
InitializingShards int `json:"initializing_shards"` InitializingShards int `json:"initializing_shards"`
UnassignedShards int `json:"unassigned_shards"` UnassignedShards int `json:"unassigned_shards"`
DelayedUnassignedShards int `json:"delayed_unassigned_shards"`
NumberOfPendingTasks int `json:"number_of_pending_tasks"` NumberOfPendingTasks int `json:"number_of_pending_tasks"`
TaskMaxWaitingInQueueMillis int `json:"task_max_waiting_in_queue_millis"` TaskMaxWaitingInQueueMillis int `json:"task_max_waiting_in_queue_millis"`
ActiveShardsPercentAsNumber float64 `json:"active_shards_percent_as_number"` ActiveShardsPercentAsNumber float64 `json:"active_shards_percent_as_number"`
@ -340,6 +341,7 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator
"relocating_shards": healthStats.RelocatingShards, "relocating_shards": healthStats.RelocatingShards,
"initializing_shards": healthStats.InitializingShards, "initializing_shards": healthStats.InitializingShards,
"unassigned_shards": healthStats.UnassignedShards, "unassigned_shards": healthStats.UnassignedShards,
"delayed_unassigned_shards": healthStats.DelayedUnassignedShards,
"number_of_pending_tasks": healthStats.NumberOfPendingTasks, "number_of_pending_tasks": healthStats.NumberOfPendingTasks,
"task_max_waiting_in_queue_millis": healthStats.TaskMaxWaitingInQueueMillis, "task_max_waiting_in_queue_millis": healthStats.TaskMaxWaitingInQueueMillis,
"active_shards_percent_as_number": healthStats.ActiveShardsPercentAsNumber, "active_shards_percent_as_number": healthStats.ActiveShardsPercentAsNumber,
@ -366,7 +368,7 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc telegraf.Accumulator
acc.AddFields( acc.AddFields(
"elasticsearch_indices", "elasticsearch_indices",
indexFields, indexFields,
map[string]string{"index": name}, map[string]string{"index": name, "name": healthStats.ClusterName},
measurementTime, measurementTime,
) )
} }

4
plugins/inputs/elasticsearch/elasticsearch_test.go
View File

@ -190,11 +190,11 @@ func TestGatherClusterHealthAlsoIndicesHealth(t *testing.T) {
acc.AssertContainsTaggedFields(t, "elasticsearch_indices", acc.AssertContainsTaggedFields(t, "elasticsearch_indices",
v1IndexExpected, v1IndexExpected,
map[string]string{"index": "v1"}) map[string]string{"index": "v1", "name": "elasticsearch_telegraf"})
acc.AssertContainsTaggedFields(t, "elasticsearch_indices", acc.AssertContainsTaggedFields(t, "elasticsearch_indices",
v2IndexExpected, v2IndexExpected,
map[string]string{"index": "v2"}) map[string]string{"index": "v2", "name": "elasticsearch_telegraf"})
} }
func TestGatherClusterStatsMaster(t *testing.T) { func TestGatherClusterStatsMaster(t *testing.T) {

3
plugins/inputs/elasticsearch/testdata_test.go
View File

@ -12,6 +12,7 @@ const clusterHealthResponse = `
"relocating_shards": 0, "relocating_shards": 0,
"initializing_shards": 0, "initializing_shards": 0,
"unassigned_shards": 0, "unassigned_shards": 0,
"delayed_unassigned_shards": 0,
"number_of_pending_tasks": 0, "number_of_pending_tasks": 0,
"task_max_waiting_in_queue_millis": 0, "task_max_waiting_in_queue_millis": 0,
"active_shards_percent_as_number": 100.0 "active_shards_percent_as_number": 100.0
@ -30,6 +31,7 @@ const clusterHealthResponseWithIndices = `
"relocating_shards": 0, "relocating_shards": 0,
"initializing_shards": 0, "initializing_shards": 0,
"unassigned_shards": 0, "unassigned_shards": 0,
"delayed_unassigned_shards": 0,
"number_of_pending_tasks": 0, "number_of_pending_tasks": 0,
"task_max_waiting_in_queue_millis": 0, "task_max_waiting_in_queue_millis": 0,
"active_shards_percent_as_number": 100.0, "active_shards_percent_as_number": 100.0,
@ -69,6 +71,7 @@ var clusterHealthExpected = map[string]interface{}{
"relocating_shards": 0, "relocating_shards": 0,
"initializing_shards": 0, "initializing_shards": 0,
"unassigned_shards": 0, "unassigned_shards": 0,
"delayed_unassigned_shards": 0,
"number_of_pending_tasks": 0, "number_of_pending_tasks": 0,
"task_max_waiting_in_queue_millis": 0, "task_max_waiting_in_queue_millis": 0,
"active_shards_percent_as_number": 100.0, "active_shards_percent_as_number": 100.0,