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.

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

Remove count from the Topbeat event #1207

Merged
merged 1 commit into from
Mar 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ https://github.com/elastic/beats/compare/v1.1.2...master[Check the HEAD diff]

*Topbeat*
- Rename proc.cpu.user_p with proc.cpu.total_p as includes CPU time spent in kernel space {pull}631[631]
- Remove count field from the exported fields {pull}1207[1207]

*Filebeat*
- Default config for ignore_older is now infinite instead of 24h, means ignore_older is disabled by default. Use close_older to only close file handlers.
Expand Down
9 changes: 0 additions & 9 deletions topbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ required: True
Set to "system" to indicate that the statistics are system-wide.


==== count

type: int

required: True

The number of transactions that this event represents. This is generally the inverse of the sampling rate. For example, for a sample rate of 1/10, the count is 10. The count is used by the UIs to return estimated values. Reserved for future usage.


==== beat.name

Name of the Beat sending the events. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used.
Expand Down
9 changes: 0 additions & 9 deletions topbeat/etc/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,6 @@ env:
Set to "system" to indicate that the statistics are system-wide.
required: true

- name: count
type: int
description: >
The number of transactions that this event represents. This
is generally the inverse of the sampling rate. For example, for
a sample rate of 1/10, the count is 10. The count is used by the
UIs to return estimated values. Reserved for future usage.
required: true

- name: beat.name
description: >
Name of the Beat sending the events. If the shipper name is set
Expand Down
6 changes: 3 additions & 3 deletions topbeat/system/cpu.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package system

import (
"strconv"
"time"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/logp"
sigar "github.com/elastic/gosigar"
"strconv"
"time"
)

type CPU struct {
Expand Down Expand Up @@ -147,7 +148,6 @@ func (cpu *CPU) GetSystemStats() (common.MapStr, error) {
event := common.MapStr{
"@timestamp": common.Time(time.Now()),
"type": "system",
"count": 1,
"load": loadStat,
"cpu": GetCpuStatEvent(cpuStat),
"mem": GetMemoryEvent(memStat),
Expand Down
1 change: 0 additions & 1 deletion topbeat/system/filesystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ func CollectFileSystemStats(fss []sigar.FileSystem) []common.MapStr {
event := common.MapStr{
"@timestamp": common.Time(time.Now()),
"type": "filesystem",
"count": 1,
"fs": GetFilesystemEvent(fsStat),
}
events = append(events, event)
Expand Down
1 change: 0 additions & 1 deletion topbeat/system/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ func (procStats *ProcStats) GetProcStats() ([]common.MapStr, error) {
event := common.MapStr{
"@timestamp": common.Time(time.Now()),
"type": "process",
"count": 1,
"proc": proc,
}

Expand Down