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

Jump to bottom

Telegraph Docker Input Plugin : per docker running status support #4259

Merged
merged 8 commits into from
Jun 18, 2018
Merged

Telegraph Docker Input Plugin : per docker running status support #4259

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d31f2dd
per docker running status support
Jun 9, 2018
e532e4a
formatting fixes
Jun 9, 2018
58c16a1
removing unnecessary fields
Jun 13, 2018
e2c46b7
container status as tag and edit start/finish ts
Jun 14, 2018
c8d704b
container status support for UT
Jun 14, 2018
704f400
docker time fields as unixNano
Jun 15, 2018
52337ef
rollback docker test CI fix
Jun 15, 2018
735dabd
fixing UT failure
Jun 15, 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
11 changes: 11 additions & 0 deletions plugins/inputs/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,17 @@ func (d *Docker) gatherContainer(
}
}
}
if info.State != nil {
tags["container_status"] = info.State.Status
statefields := map[string]interface{}{
"oomkilled": info.State.OOMKilled,
"pid": info.State.Pid,
"exitcode": info.State.ExitCode,
"started_at": info.State.StartedAt,
"finished_at": info.State.FinishedAt,
}
acc.AddFields("docker_container_status", statefields, tags, time.Now())
}

if info.State.Health != nil {
healthfields := map[string]interface{}{
Expand Down
2 changes: 2 additions & 0 deletions plugins/inputs/docker/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,7 @@ func TestDockerGatherInfo(t *testing.T) {
"label1": "test_value_1",
"label2": "test_value_2",
"server_version": "17.09.0-ce",
"container_status": "running",
},
)
acc.AssertContainsTaggedFields(t,
Expand All @@ -676,6 +677,7 @@ func TestDockerGatherInfo(t *testing.T) {
"label1": "test_value_1",
"label2": "test_value_2",
"server_version": "17.09.0-ce",
"container_status": "running",
},
)
}
Expand Down