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

Cgroup parent #100

Merged
merged 1 commit into from
Jul 31, 2018
Merged

Conversation

miaofenk
Copy link

Hi @jangaraj ,

I did a few code changes to make the cgroup parent branch supports containers under K8S environment. Would you please review my code changes and decide whether to take the pull request?

Thanks for your time!

@miaofenk miaofenk changed the base branch from master to cgroup-parent July 13, 2018 08:53
@jangaraj
Copy link
Member

👍 Which Kubernetes version has been used for your testing?

@miaofenk
Copy link
Author

Tested using Kubernetes version:1.8.3.

@jangaraj
Copy link
Member

jangaraj commented Jul 29, 2018

Cc: @baoh0308 - version with zbx_module_docker_get_cgroup_parent
baoh0308's version: https://github.com/monitoringartist/zabbix-docker-monitoring/compare/baoh0308?expand=1

@@ -738,10 +817,19 @@ int zbx_docker_dir_detect()
{
if ((strstr(path, "cpuset cgroup")) != NULL)
{

#ifdef ZBX_VERSION_PRE_3_0_17
Copy link
Member

Choose a reason for hiding this comment

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

Where and how do you define ZBX_VERSION_PRE_3_0_17?

Copy link
Author

Choose a reason for hiding this comment

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

I defined the marco when building with gcc using -D. The built module supported version depends on the compile options.

@jangaraj
Copy link
Member

I'm merging this one into the feature branch. TODO:

Tested:

  • CentOS 7 + Docker 18.05.0-ce
  • Kubernetes 1.8.3

I'll be happy to receive any (un)sucessfull reports for other orchestratation tools (maybe @baoh0308 will be able to test it as well).

Anyway, thank you @miaofenk.

@jangaraj jangaraj merged commit 06bd9a8 into monitoringartist:cgroup-parent Jul 31, 2018
@baoh0308
Copy link

baoh0308 commented Aug 1, 2018

@jangaraj
Thank you for quick test and merge.
Now we can get information of Openshift (Kubernetes).

@baoh0308

@miaofenk miaofenk deleted the cgroup-parent branch August 1, 2018 05:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants