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

[Metricbeat]Kubernetes: make state_container metricset ECS compliant #13884

Merged
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
3 changes: 3 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add `docker.cpu.*.norm.pct` metrics for `cpu` metricset of Docker Metricbeat module. {pull}13695[13695]
- Add `instance` label by default when using Prometheus collector. {pull}13737[13737]
- Add Apache Tomcat module {pull}13491[13491]
- Add ECS `container.id` and `container.runtime` to kubernetes `state_container` metricset. {pull}13884[13884]
- Add `job` label by default when using Prometheus collector. {pull}13878[13878]


Expand Down Expand Up @@ -431,6 +432,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Metricbeat*

- `kubernetes.container.id` field for `state_container` is deprecated in favour of ECS `container.id` and `container.runtime`. {pull}13884[13884]

*Packetbeat*

*Winlogbeat*
Expand Down
80 changes: 54 additions & 26 deletions metricbeat/module/kubernetes/state_container/_meta/data.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,72 @@
{
"@timestamp": "2017-05-10T16:42:27.816Z",
"beat": {
"hostname": "X1",
"name": "X1",
"version": "6.0.0-alpha1"
"@timestamp": "2019-10-02T16:47:01.499Z",
"metricset": {
"name": "state_container",
"period": 10000
},
"service": {
"address": "kube-state-metrics.kube-system:8080",
"type": "kubernetes"
},
"kubernetes": {
"labels": {
"app": "playground"
},
"container": {
"cpu": {
"request": {
"nanocores": 200000000
}
},
"id": "docker://39f3267ad1b0c46025e664bfe0b70f3f18a9f172aad00463c8e87e0e93bbf628",
"image": "jenkinsci/jenkins:2.46.1",
"memory": {
"request": {
"bytes": 268435456
}
},
"name": "wise-lynx-jenkins",
},
"image": "ubuntu:latest",
"id": "docker://5f8ce416d10ab0b28ce5c7d521de2264aa03ff4d001e1194076f6a02a330139f",
"name": "ubuntu",
"status": {
"phase": "running",
"ready": true,
"restarts": 4
"restarts": 0,
"phase": "running"
}
},
"namespace": "jenkins",
"pod": {
"name": "playground",
"uid": "d52bd3cb-df62-4cb5-b293-7009055bcaff"
},
"namespace": "default",
"node": {
"name": "minikube"
},
"pod": {
"name": "wise-lynx-jenkins-1616735317-svn6k"
}
},
"metricset": {
"host": "192.168.99.100:18080",
"host": {
"os": {
"codename": "bionic",
"platform": "ubuntu",
"version": "18.04.3 LTS (Bionic Beaver)",
"family": "debian",
"name": "Ubuntu",
"kernel": "4.15.0"
},
"containerized": false,
"hostname": "minikube",
"name": "minikube",
"architecture": "x86_64"
},
"agent": {
"version": "8.0.0",
"type": "metricbeat",
"ephemeral_id": "fed15ef3-ab8f-4e11-aded-115ff923bc1e",
"hostname": "minikube",
"id": "0df400e0-a5fc-40cc-a0c6-b99029a30cd5"
},
"ecs": {
"version": "1.1.0"
},
"container": {
"runtime": "docker",
"id": "5f8ce416d10ab0b28ce5c7d521de2264aa03ff4d001e1194076f6a02a330139f"
},
"event": {
"dataset": "kubernetes.container",
"module": "kubernetes",
"name": "state_container",
"namespace": "container",
"rtt": 6219
"duration": 33750820
}
}
}
Loading