Skip to content

Exclude pauseamd64 containers from container inventory #182

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

Merged
rashmichandrashekar merged 26 commits into from
Jan 8, 2019
Merged

Exclude pauseamd64 containers from container inventory #182

Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2b1866f
containernodeinventory changes
Dec 5, 2018
b5b6c0e
changes for containernodeinventory
Dec 6, 2018
f48c26a
changes to add node telemetry
Dec 15, 2018
5336e55
pod telemetry cahnges
Dec 15, 2018
7c67c04
updated telemetry changes
Dec 16, 2018
0c3ccef
changes to get uid of owner references as controller id
Dec 17, 2018
7f7b98b
updating socket to the new mount location
Dec 18, 2018
91b0816
Merge remote-tracking branch 'refs/remotes/origin/ci_feature'
Dec 19, 2018
7a4c2be
Adding exception telemetry and heartbeat
Dec 19, 2018
d2b043c
changes to fix controller type
Dec 20, 2018
e048d9b
Fixing typo
Dec 20, 2018
e4242d0
fixing method signature
Dec 20, 2018
d6f746a
updating plugins to get controller type from env
Dec 20, 2018
081ba8a
fixing bugs
Dec 21, 2018
f3577b8
changes to fixed type
Dec 21, 2018
145e920
Merge remote-tracking branch 'origin/ci_feature' into rashmi/kubenode…
Dec 21, 2018
5ea2d17
removing comments
Dec 21, 2018
6d64894
changes for fixed type
Dec 21, 2018
5d22e5f
adding kubelet version as a dimension
Dec 28, 2018
b5a6722
Merge remote-tracking branch 'origin/ci_feature' into rashmi/kubenode…
Dec 28, 2018
3c2f791
Excluding raw docker containers from container inventory
Jan 4, 2019
c297ee8
Merge remote-tracking branch 'origin/ci_feature' into rashmi/kubenode…
Jan 4, 2019
3f4aafb
making labels key case insensitive
Jan 7, 2019
4b35301
make poduid label case insensitive
Jan 7, 2019
f93deda
Merge branch 'ci_feature' into rashmi/kubenodeinventory
Jan 8, 2019
1ad4419
changes to exclude pause amd 64 containers
Jan 8, 2019
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
16 changes: 12 additions & 4 deletions source/code/plugin/DockerApiClient.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,18 @@ def listContainers()
labels = (!container['Labels'].nil?)? container['Labels'] : container['labels']
if !labels.nil?
labelKeys = labels.keys
#Case insensitive lookup for pod uid label
keyValue = labelKeys.find {|k| 'io.kubernetes.pod.uid'.downcase == k.downcase}
if !labels[keyValue].nil?
ids.push(container['Id'])
dockerTypeLabel = labelKeys.find {|k| 'io.kubernetes.docker.type'.downcase == k.downcase}
if !dockerTypeLabel.nil?
dockerTypeLabelValue = labels[dockerTypeLabel]
# Checking for 'io.kubernetes.docker.type' label for docker containers to exclude the pause-amd64 containers
if !(dockerTypeLabelValue.downcase == "podsandbox".downcase)
# Case insensitive lookup for pod uid label - This is to exclude containers created using docker run and only include containers that
# are created in the pods for ContainerInventory
keyValue = labelKeys.find {|k| 'io.kubernetes.pod.uid'.downcase == k.downcase}
if !labels[keyValue].nil?
ids.push(container['Id'])
end
end
end
end
end
Expand Down