diff options
| author | Ilya Mashchenko <ilyamaschenko@gmail.com> | 2018-12-07 12:15:03 +0300 |
|---|---|---|
| committer | Chris Akritidis <43294513+cakrit@users.noreply.github.com> | 2018-12-07 10:15:03 +0100 |
| commit | 5286dae8ebb09d2c9699cd38e8850c5481f3d742 (patch) | |
| tree | 1d4706225c8e8d6fe76e0a626ac9b65c9f0c1133 /collectors/python.d.plugin/monit | |
| parent | e096424786b36d0ba106c72b551a6ce37843be37 (diff) | |
python.d.plugin update (#4936)
<!--
Describe the change in summary section, including rationale and degin decisions.
Include "Fixes #nnn" if you are fixing an existing issue.
In "Component Name" section write which component is changed in this PR. This
will help us review your PR quicker.
If you have more information you want to add, write them in "Additional
Information" section. This is usually used to help others understand your
motivation behind this change. A step-by-step reproduction of the problem is
helpful if there is no related issue.
-->
##### Summary
Fix: #4756
`python.d.plugin` updates:
* remove `retries` option
* make `penalty` configurable (enabled by default, max is 10 minutes)
> penalty indicates whether to apply penalty to update_every in case of failures.
> Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
> penalty: yes
##### Component Name
`python.d.plugin`
##### Additional Information
Diffstat (limited to 'collectors/python.d.plugin/monit')
| -rw-r--r-- | collectors/python.d.plugin/monit/monit.chart.py | 1 | ||||
| -rw-r--r-- | collectors/python.d.plugin/monit/monit.conf | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/collectors/python.d.plugin/monit/monit.chart.py b/collectors/python.d.plugin/monit/monit.chart.py index 51943c0e13..9963f2420f 100644 --- a/collectors/python.d.plugin/monit/monit.chart.py +++ b/collectors/python.d.plugin/monit/monit.chart.py @@ -9,7 +9,6 @@ from bases.FrameworkServices.UrlService import UrlService # default module values (can be overridden per job in `config`) # update_every = 2 priority = 60000 -retries = 60 # see enum State_Type from monit.h (https://bitbucket.org/tildeslash/monit/src/master/src/monit.h) MONIT_SERVICE_NAMES = ['Filesystem', 'Directory', 'File', 'Process', 'Host', 'System', 'Fifo', 'Program', 'Net'] diff --git a/collectors/python.d.plugin/monit/monit.conf b/collectors/python.d.plugin/monit/monit.conf index f9c26dbc3c..9a3fb69385 100644 --- a/collectors/python.d.plugin/monit/monit.conf +++ b/collectors/python.d.plugin/monit/monit.conf @@ -27,11 +27,9 @@ # If unset, the default for python.d.plugin is used. # priority: 60000 -# retries sets the number of retries to be made in case of failures. -# If unset, the default for python.d.plugin is used. -# Attempts to restore the service are made once every update_every -# and only if the module has collected values in the past. -# retries: 60 +# penalty indicates whether to apply penalty to update_every in case of failures. +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes. +# penalty: yes # autodetection_retry sets the job re-check interval in seconds. # The job is not deleted if check fails. @@ -58,7 +56,7 @@ # # JOBs sharing a name are mutually exclusive # update_every: 1 # the JOB's data collection frequency # priority: 60000 # the JOB's order on the dashboard -# retries: 60 # the JOB's number of restoration attempts +# penalty: yes # the JOB's penalty # autodetection_retry: 0 # the JOB's re-check interval in seconds # # Additionally to the above, this plugin also supports the following: |