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

Better SmartOS support in the process checker #1073

Merged
merged 2 commits into from
Dec 22, 2014
Merged

Conversation

djensen47
Copy link
Contributor

Updated the code to reflect the folllowing:

  • psutil on SmartOS does not report shared
  • SmartOS is unix, has file descriptors
  • SmartOS does have ctx switching information

Updates

  • Sets real to None (like win32)
  • Moves the check for is_unix (and file descriptors) out of the is_win32
    branch
    • Looser coupling
  • Moves the check for ctx switching out of the real is not None branch
    • Looser coupling

Updated the code to reflect the folllowing:
- psutil on SmartOS does not report shared
- SmartOS is unix, has file descriptors
- SmartOS does have ctx switching information

Updates
- Sets `real` to None (like win32)
- Moves the check for is_unix (and file descriptors) out of the is_win32
	branch
	- Looser coupling
- Moves the check for ctx switching out of the `real is not None` branch
  - Looser coupling
@remh
Copy link
Contributor

remh commented Aug 18, 2014

Thanks @djensen47 .

We'll review it soon and are aiming to get it released with version 5.1.0 of the agent.

Thanks a lot!

@remh remh added this to the 5.1.0 milestone Aug 18, 2014
@remh remh added the 1 - Ready label Aug 18, 2014
@remh
Copy link
Contributor

remh commented Aug 29, 2014

It looks good. Thanks!

@remh
Copy link
Contributor

remh commented Aug 29, 2014

Actually it looks like your branch is not up to date with the latest master. Could you rebase your branch please ?

@djensen47
Copy link
Contributor Author

I'll look into it this weekend.

@remh
Copy link
Contributor

remh commented Sep 26, 2014

@djensen47 Any update to rebase ?

@djensen47
Copy link
Contributor Author

I forgot about it. I think I need to create a user story on my side so this doesn't get lost.

@remh remh modified the milestones: 5.2.0, 5.1.0 Oct 8, 2014
@remh remh self-assigned this Dec 10, 2014
@LeoCavaille
Copy link
Member

Ping @djensen47 the release of 5.2, will probably be some time around January. Just need a rebase and to go through the CI one more time, and then we'll be able to merge it!

@djensen47
Copy link
Contributor Author

I've kicked the can down the road too long, I'm looking at it now should have something soon.

Made slight changes in the merge:
- Removed redundant exception check.

Conflicts:
	checks.d/process.py
@djensen47
Copy link
Contributor Author

Looks like the build failed but unrelated to this change (I think). The mongo test timed out.

@remh
Copy link
Contributor

remh commented Dec 22, 2014

Thanks a lot @djensen47 !

remh added a commit that referenced this pull request Dec 22, 2014
Better SmartOS support in the process checker
@remh remh merged commit 5d5325e into DataDog:master Dec 22, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants