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

Import docker util #585

Merged
merged 16 commits into from
Sep 20, 2017
Merged

Import docker util #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
67542b3
copy new burrito code
xvello Sep 15, 2017
6f9fbf8
fix imports for merged code + add cgroup swap stats
xvello Sep 18, 2017
e7e0b4a
Fix util dependency for docker_util and use the agent cache
hush-hush Sep 15, 2017
752caa2
add docker_test.go and use proc_root config option instead of $HOST_PROC
xvello Sep 18, 2017
83f0a83
add CgroupTimesStat.UsageTotal
xvello Sep 18, 2017
c3f8f1d
add cgroup cpu throttling stat
xvello Sep 18, 2017
a32ffb3
add licence header + build flag
xvello Sep 18, 2017
9767c63
improve cgroup_test coverage
xvello Sep 18, 2017
2594e8f
Adding a method to Container to inspect it
hush-hush Sep 18, 2017
1d9aaf7
add MemLimit & cgroup parsing tests
xvello Sep 18, 2017
22926a5
Adding EntityID to the Container struct
hush-hush Sep 19, 2017
b8ce16e
Start the tagger in the agent
hush-hush Sep 19, 2017
fe9d91b
Add the ability to query exited containers
hush-hush Sep 19, 2017
07c1d4e
Adding method to list images from docker
hush-hush Sep 19, 2017
633c986
add TODO for moving back to upstream gopsutil
xvello Sep 20, 2017
5f8f64b
switch gopsutil to upstream repo, build and tests OK
xvello Sep 20, 2017
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
2 changes: 1 addition & 1 deletion Gopkg.lock
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions cmd/agent/app/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/DataDog/datadog-agent/pkg/config"
"github.com/DataDog/datadog-agent/pkg/serializer"
"github.com/DataDog/datadog-agent/pkg/status"
"github.com/DataDog/datadog-agent/pkg/tagger"
"github.com/DataDog/datadog-agent/pkg/util"
"github.com/DataDog/datadog-agent/pkg/util/cache"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -81,6 +82,13 @@ var checkCmd = &cobra.Command{
return err
}

// start tagging system for containers
err = tagger.Init()
if err != nil {
fmt.Printf("Unable to start tagging system: %s", err)
return err
}

s := &serializer.Serializer{Forwarder: common.Forwarder}
agg := aggregator.InitAggregatorWithFlushInterval(s, hostname, 10000000000)
common.SetupAutoConfig(config.Datadog.GetString("confd_path"))
Expand Down
7 changes: 7 additions & 0 deletions cmd/agent/app/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/DataDog/datadog-agent/pkg/metadata"
"github.com/DataDog/datadog-agent/pkg/pidfile"
"github.com/DataDog/datadog-agent/pkg/serializer"
"github.com/DataDog/datadog-agent/pkg/tagger"
"github.com/DataDog/datadog-agent/pkg/util"
"github.com/DataDog/datadog-agent/pkg/util/cache"
"github.com/DataDog/datadog-agent/pkg/version"
Expand Down Expand Up @@ -165,6 +166,12 @@ func StartAgent() error {
return log.Errorf("Error while starting api server, exiting: %v", err)
}

// start tagging system for containers
err = tagger.Init()
if err != nil {
return log.Errorf("Unable to start tagging system: %s", err)
}

// setup the forwarder
keysPerDomain, err := config.GetMultipleEndpoints()
if err != nil {
Expand Down
Loading