Skip to content

Commit

Permalink
metricbeat: fix a typo (optained -> obtained) in golang heap module (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
mountkin authored and ruflin committed Nov 28, 2017
1 parent 25c8fd9 commit d0da16c
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di

- Rename `heap_init` field to `heap.init`. {pull}5320[5320]
- Rename `http.response.status_code` field to `http.response.code`. {pull}5521[5521]
- Rename `golang.heap.system.optained` field to `golang.heap.system.obtained`. {issue}5703[5703]

*Packetbeat*

Expand Down
2 changes: 1 addition & 1 deletion libbeat/kibana/testdata/extensive/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1683,7 +1683,7 @@
format: bytes
description: >
Total bytes obtained from system (sum of XxxSys below).
- name: optained
- name: obtained
type: long
format: bytes
description: >
Expand Down
4 changes: 2 additions & 2 deletions libbeat/kibana/testdata/extensive/metricbeat-5x.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions libbeat/kibana/testdata/extensive/metricbeat-default.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3376,7 +3376,7 @@ Total bytes obtained from system (sum of XxxSys below).
[float]
=== `golang.heap.system.optained`
=== `golang.heap.system.obtained`
type: long
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"visState": "{\"title\":\"Golang: System\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.total\\\").label(\\\"System Total\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.optained\\\").label(\\\"System Obtained\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.stack\\\").label(\\\"System Stack\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.released\\\").label(\\\"System Released\\\")\",\"interval\":\"10s\"},\"aggs\":[],\"listeners\":{}}",
"visState": "{\"title\":\"Golang: System\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.total\\\").label(\\\"System Total\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.obtained\\\").label(\\\"System Obtained\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.stack\\\").label(\\\"System Stack\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.released\\\").label(\\\"System Released\\\")\",\"interval\":\"10s\"},\"aggs\":[],\"listeners\":{}}",
"description": "",
"title": "Golang: System",
"uiStateJSON": "{}",
"version": 1,
"kibanaSavedObjectMeta": {
"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"title": "System [Metricbeat Golang]",
"uiStateJSON": "{}",
"version": 1,
"visState": "{\"title\":\"System [Metricbeat Golang]\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.total\\\").label(\\\"System Total\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.optained\\\").label(\\\"System Obtained\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.stack\\\").label(\\\"System Stack\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.released\\\").label(\\\"System Released\\\")\",\"interval\":\"10s\"},\"aggs\":[]}"
"visState": "{\"title\":\"System [Metricbeat Golang]\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.total\\\").label(\\\"System Total\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.obtained\\\").label(\\\"System Obtained\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.stack\\\").label(\\\"System Stack\\\"),.es(index=\\\"metricbeat*\\\",metric=\\\"avg:golang.heap.system.released\\\").label(\\\"System Released\\\")\",\"interval\":\"10s\"},\"aggs\":[]}"
},
"id": "9a9a8bf0-f52a-11e6-969c-518c48c913e4",
"type": "visualization",
Expand Down Expand Up @@ -110,4 +110,4 @@
}
],
"version": "6.0.0-beta1-SNAPSHOT"
}
}
4 changes: 2 additions & 2 deletions metricbeat/module/golang/heap/_meta/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"system": {
"optained": 23003136,
"obtained": 23003136,
"released": 0,
"stack": 1114112,
"total": 28956920
Expand All @@ -52,4 +52,4 @@
"rtt": 1159
},
"type": "metricsets"
}
}
2 changes: 1 addition & 1 deletion metricbeat/module/golang/heap/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
format: bytes
description: >
Total bytes obtained from system (sum of XxxSys below).
- name: optained
- name: obtained
type: long
format: bytes
description: >
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/golang/heap/heap.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (m *MetricSet) Fetch() (common.MapStr, error) {

event["system"] = common.MapStr{
"total": ms.Sys,
"optained": ms.HeapSys,
"obtained": ms.HeapSys,
"stack": ms.StackSys,
"released": ms.HeapReleased,
}
Expand Down

0 comments on commit d0da16c

Please sign in to comment.