Skip to content

Add https support for monit collector. - #543

Open
nesoneg wants to merge 3 commits into
python-diamond:masterfrom
nesoneg:master
Open

Add https support for monit collector.#543
nesoneg wants to merge 3 commits into
python-diamond:masterfrom
nesoneg:master

Conversation

@nesoneg

Copy link
Copy Markdown

Use private methods, but worked.

@shortdudey123

Copy link
Copy Markdown
Member

Can you fix the pep8 errors? also update the doc and testing?

Comment threadsrc/collectors/monit/monit.py Outdated
self.config['host'],
int(self.config['port']))

if self.config['selfsigned'] and sys.hexversion >= 0x020709f0 and hasattr(ssl, '_create_unverified_context'):

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can you add a comment as to what version 0x020709f0 correlates to? or use sys.version_info instead?

More compliance PEP8 format source code.
Domumentation update.
@nesoneg

Copy link
Copy Markdown
Author

I update doc and bit more accurate PEP8.
Tests i have not mastered…

metrics_blacklist | None | Regex to match metrics to block. Mutually exclusive with metrics_whitelist | NoneType
metrics_whitelist | None | Regex to match metrics to transmit. Mutually exclusive with metrics_blacklist | NoneType
send_totals | False | Send cpu and memory totals | bool
scheme | http | Select scheme http or https | str

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

alphabetize

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The descriptions need to be added to the get_default_config_help method in the collector file since this doc is actually generated from that.

@shortdudey123

Copy link
Copy Markdown
Member

1 pep8 error left
src/collectors/monit/monit.py:56:81: E501 line too long (119 > 80 characters)1

For testing, PR540 would be a good reference for the scheme checking

@coveralls

coveralls commented Oct 14, 2016

Copy link
Copy Markdown

Coverage Status

Coverage remained the same at 59.386% when pulling 19aa876 on nesoneg:master into 175a4db on python-diamond:master.

Sign up for freeto 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.

4 participants

@nesoneg@shortdudey123@coveralls@josegonzalez