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

Cherry-pick #8487 to 6.x: Avoid mapping issues in kubernetes module #8506

Merged
merged 2 commits into from
Oct 3, 2018
Merged

Cherry-pick #8487 to 6.x: Avoid mapping issues in kubernetes module #8506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86e060b
Avoid mapping issues in kubernetes module (#8487)
exekias Oct 1, 2018
1710779
Update CHANGELOG.asciidoc
exekias Oct 1, 2018
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
- Fixed the location of the modules.d dir in Deb and RPM packages. {issue}8104[8104]
- Add docker diskio stats on Windows. {issue}6815[6815] {pull}8126[8126]
- Fix incorrect type conversion of average response time in Haproxy dashboards {pull}8404[8404]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too many changelogs?

- Avoid mapping issues in kubernetes module. {pull}8487[8487]

*Packetbeat*

Expand Down
21 changes: 21 additions & 0 deletions metricbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8239,6 +8239,27 @@ type: long
Count field records the number of times the particular event has occurred


--


*`kubernetes.event.timestamp.first_occurrence`*::
+
--
type: date

Timestamp of first occurrence of event


--

*`kubernetes.event.timestamp.last_occurrence`*::
+
--
type: date

Timestamp of last occurrence of event


--

*`kubernetes.event.message`*::
Expand Down
7 changes: 5 additions & 2 deletions metricbeat/module/kubernetes/container/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.
},
},

"name": container.Name,
"start_time": container.StartTime,
"name": container.Name,

"cpu": common.MapStr{
"usage": common.MapStr{
Expand Down Expand Up @@ -114,6 +113,10 @@ func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.
},
}

if container.StartTime != "" {
containerEvent.Put("start_time", container.StartTime)
}

if nodeCores > 0 {
containerEvent.Put("cpu.usage.node.pct", float64(container.CPU.UsageNanoCores)/1e9/nodeCores)
}
Expand Down
21 changes: 10 additions & 11 deletions metricbeat/module/kubernetes/event/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
type: long
description: >
Count field records the number of times the particular event has occurred
- name: timestamp
type: group
fields:
- name: timestamp
type: group
fields:
- name: first_occurrence
type: date
description: >
Timestamp of first occurrence of event
- name: last_occurrence
type: date
description: >
Timestamp of last occurrence of event
- name: first_occurrence
type: date
description: >
Timestamp of first occurrence of event
- name: last_occurrence
type: date
description: >
Timestamp of last occurrence of event
- name: message
type: keyword
description: >
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kubernetes/fields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions metricbeat/module/kubernetes/node/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ func eventMapping(content []byte) (common.MapStr, error) {

node := summary.Node
nodeEvent := common.MapStr{
"name": node.NodeName,
"start_time": node.StartTime,
"name": node.NodeName,

"cpu": common.MapStr{
"usage": common.MapStr{
Expand Down Expand Up @@ -105,5 +104,10 @@ func eventMapping(content []byte) (common.MapStr, error) {
},
},
}

if node.StartTime != "" {
nodeEvent.Put("start_time", node.StartTime)
}

return nodeEvent, nil
}
7 changes: 5 additions & 2 deletions metricbeat/module/kubernetes/pod/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.
"name": node.NodeName,
},
},
"name": pod.PodRef.Name,
"start_time": pod.StartTime,
"name": pod.PodRef.Name,

"cpu": common.MapStr{
"usage": common.MapStr{
Expand All @@ -85,6 +84,10 @@ func eventMapping(content []byte, perfMetrics *util.PerfMetricsCache) ([]common.
},
}

if pod.StartTime != "" {
podEvent.Put("start_time", pod.StartTime)
}

if coresLimit > nodeCores {
coresLimit = nodeCores
}
Expand Down
8 changes: 6 additions & 2 deletions metricbeat/module/kubernetes/system/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ func eventMapping(content []byte) ([]common.MapStr, error) {
"name": node.NodeName,
},
},
"container": syscontainer.Name,
"start_time": syscontainer.StartTime,
"container": syscontainer.Name,
"cpu": common.MapStr{
"usage": common.MapStr{
"nanocores": syscontainer.CPU.UsageNanoCores,
Expand All @@ -68,6 +67,11 @@ func eventMapping(content []byte) ([]common.MapStr, error) {
"majorpagefaults": syscontainer.Memory.MajorPageFaults,
},
}

if syscontainer.StartTime != "" {
containerEvent.Put("start_time", syscontainer.StartTime)
}

events = append(events, containerEvent)
}

Expand Down