@cryptotaxi247 / netdata-1 / commits / 5286dae8e

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

Ilya Mashchenko committed Dec 7, 2018 at 12:15 UTC 5286dae8ebb09d2c9699cd38e8850c5481f3d742
117 files changed +282 -465
collectors/python.d.plugin/README.md
+1 -4
@@ -21,7 +21,6 @@ Every configuration file must have one of two formats:
21
22 ```yaml
23 update_every : 2 # update frequency
24 -retries : 1 # how many failures in update() is tolerated
24 priority : 20000 # where it is shown on dashboard
25
26 other_var1 : bla # variables passed to module
@@ -33,7 +32,6 @@ other_var2 : alb
32 ```yaml
33 # module defaults:
34 update_every : 2
36 -retries : 1
35 priority : 20000
36
37 local: # job name
@@ -42,11 +40,10 @@ local: # job name
40
41 other_job:
42 priority : 5 # job position on dashboard
45 - retries : 20 # job retries
43 other_var2 : val # module specific variable
44 ```
45
49 -`update_every`, `retries`, and `priority` are always optional.
46 +`update_every` and `priority` are always optional.
47
48 ## How to debug a python module
49
collectors/python.d.plugin/adaptec_raid/adaptec_raid.conf
+4 -6
@@ -19,11 +19,9 @@
19 # If unset, the default for python.d.plugin is used.
20 # priority: 60000
21
22 -# retries sets the number of retries to be made in case of failures.
23 -# If unset, the default for python.d.plugin is used.
24 -# Attempts to restore the service are made once every update_every
25 -# and only if the module has collected values in the past.
26 -# retries: 60
22 +# penalty indicates whether to apply penalty to update_every in case of failures.
23 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
24 +# penalty: yes
25
26 # autodetection_retry sets the job re-check interval in seconds.
27 # The job is not deleted if check fails.
@@ -50,6 +48,6 @@
48 # # JOBs sharing a name are mutually exclusive
49 # update_every: 1 # the JOB's data collection frequency
50 # priority: 60000 # the JOB's order on the dashboard
53 -# retries: 60 # the JOB's number of restoration attempts
51 +# penalty: yes # the JOB's penalty
52 # autodetection_retry: 0 # the JOB's re-check interval in seconds
53 # ----------------------------------------------------------------------
collectors/python.d.plugin/apache/README.md
-2
@@ -46,12 +46,10 @@ priority : 90100
46
47 local:
48 url : 'http://localhost/server-status?auto'
49 - retries : 20
49
50 remote:
51 url : 'http://www.apache.org/server-status?auto'
52 update_every : 5
54 - retries : 4
53 ```
54
55 Without configuration, module attempts to connect to `http://localhost/server-status?auto`
collectors/python.d.plugin/apache/apache.chart.py
-1
@@ -8,7 +8,6 @@ from bases.FrameworkServices.UrlService import UrlService
8 # default module values (can be overridden per job in `config`)
9 # update_every = 2
10 priority = 60000
11 -retries = 60
11
12 # default job configuration (overridden by python.d.plugin)
13 # config = {'local': {
collectors/python.d.plugin/apache/apache.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, apache also supports the following:
collectors/python.d.plugin/beanstalk/beanstalk.chart.py
-1
@@ -15,7 +15,6 @@ from bases.loaders import safe_load
15 # default module values (can be overridden per job in `config`)
16 # update_every = 2
17 priority = 60000
18 -retries = 60
18
19 ORDER = ['cpu_usage', 'jobs_rate', 'connections_rate', 'commands_rate', 'current_tubes', 'current_jobs',
20 'current_connections', 'binlog', 'uptime']
collectors/python.d.plugin/beanstalk/beanstalk.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -68,7 +66,7 @@
66 # # JOBs sharing a name are mutually exclusive
67 # update_every: 1 # the JOB's data collection frequency
68 # priority: 60000 # the JOB's order on the dashboard
71 -# retries: 60 # the JOB's number of restoration attempts
69 +# penalty: yes # the JOB's penalty
70 # autodetection_retry: 0 # the JOB's re-check interval in seconds
71 # chart_cleanup: 10 # the JOB's chart cleanup interval in iterations
72 #
collectors/python.d.plugin/bind_rndc/bind_rndc.chart.py
-1
@@ -12,7 +12,6 @@ from bases.collection import find_binary
12 from bases.FrameworkServices.SimpleService import SimpleService
13
14 priority = 60000
15 -retries = 60
15 update_every = 30
16
17 ORDER = ['name_server_statistics', 'incoming_queries', 'outgoing_queries', 'named_stats_size']
collectors/python.d.plugin/bind_rndc/bind_rndc.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, bind_rndc also supports the following:
collectors/python.d.plugin/boinc/boinc.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, boinc also supports the following:
collectors/python.d.plugin/ceph/ceph.chart.py
-1
@@ -16,7 +16,6 @@ from bases.FrameworkServices.SimpleService import SimpleService
16 # default module values (can be overridden per job in `config`)
17 update_every = 10
18 priority = 60000
19 -retries = 60
19
20 ORDER = [
21 'general_usage',
collectors/python.d.plugin/ceph/ceph.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 10 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, ceph plugin also supports the following:
collectors/python.d.plugin/chrony/chrony.chart.py
-1
@@ -8,7 +8,6 @@ from bases.FrameworkServices.ExecutableService import ExecutableService
8 # default module values (can be overridden per job in `config`)
9 update_every = 5
10 priority = 60000
11 -retries = 10
11
12 # charts order (can be overridden if you want less charts, or different order)
13 ORDER = ['system', 'offsets', 'stratum', 'root', 'frequency', 'residualfreq', 'skew']
collectors/python.d.plugin/chrony/chrony.conf
+4 -6
@@ -27,11 +27,9 @@ update_every: 5
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@ update_every: 5
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, chrony also supports the following:
collectors/python.d.plugin/couchdb/couchdb.chart.py
-1
@@ -18,7 +18,6 @@ from bases.FrameworkServices.UrlService import UrlService
18 # default module values (can be overridden per job in `config`)
19 update_every = 1
20 priority = 60000
21 -retries = 60
21
22 METHODS = namedtuple('METHODS', ['get_data', 'url', 'stats'])
23
collectors/python.d.plugin/couchdb/couchdb.conf
+4 -6
@@ -28,11 +28,9 @@ update_every: 10
28 # If unset, the default for python.d.plugin is used.
29 # priority: 60000
30
31 -# retries sets the number of retries to be made in case of failures.
32 -# If unset, the default for python.d.plugin is used.
33 -# Attempts to restore the service are made once every update_every
34 -# and only if the module has collected values in the past.
35 -# retries: 60
31 +# penalty indicates whether to apply penalty to update_every in case of failures.
32 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
33 +# penalty: yes
34
35 # autodetection_retry sets the job re-check interval in seconds.
36 # The job is not deleted if check fails.
@@ -59,7 +57,7 @@ update_every: 10
57 # # JOBs sharing a name are mutually exclusive
58 # update_every: 1 # the JOB's data collection frequency
59 # priority: 60000 # the JOB's order on the dashboard
62 -# retries: 60 # the JOB's number of restoration attempts
60 +# penalty: yes # the JOB's penalty
61 # autodetection_retry: 0 # the JOB's re-check interval in seconds
62 #
63 # Additionally to the above, the couchdb plugin also supports the following:
collectors/python.d.plugin/cpufreq/cpufreq.conf
+3 -5
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
collectors/python.d.plugin/cpuidle/cpuidle.conf
+3 -5
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
collectors/python.d.plugin/dns_query_time/dns_query_time.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, dns_query_time also supports the following:
collectors/python.d.plugin/dnsdist/dnsdist.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -#retries: 600000
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 #
collectors/python.d.plugin/dockerd/dockerd.chart.py
-1
@@ -13,7 +13,6 @@ from bases.FrameworkServices.SimpleService import SimpleService
13 # default module values (can be overridden per job in `config`)
14 # update_every = 1
15 priority = 60000
16 -retries = 60
16
17 # charts order (can be overridden if you want less charts, or different order)
18 ORDER = [
collectors/python.d.plugin/dockerd/dockerd.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 10 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, dockerd plugin also supports the following:
collectors/python.d.plugin/dovecot/dovecot.chart.py
-1
@@ -8,7 +8,6 @@ from bases.FrameworkServices.SocketService import SocketService
8 # default module values (can be overridden per job in `config`)
9 # update_every = 2
10 priority = 60000
11 -retries = 60
11
12 # charts order (can be overridden if you want less charts, or different order)
13 ORDER = [
collectors/python.d.plugin/dovecot/dovecot.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, dovecot also supports the following:
collectors/python.d.plugin/elasticsearch/elasticsearch.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, elasticsearch plugin also supports the following:
collectors/python.d.plugin/example/example.chart.py
-1
@@ -10,7 +10,6 @@ from bases.FrameworkServices.SimpleService import SimpleService
10 # default module values
11 # update_every = 4
12 priority = 90000
13 -retries = 60
13
14 ORDER = ['random']
15 CHARTS = {
collectors/python.d.plugin/example/example.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, example also supports the following:
collectors/python.d.plugin/exim/exim.chart.py
-1
@@ -8,7 +8,6 @@ from bases.FrameworkServices.ExecutableService import ExecutableService
8 # default module values (can be overridden per job in `config`)
9 # update_every = 2
10 priority = 60000
11 -retries = 60
11
12 # charts order (can be overridden if you want less charts, or different order)
13 ORDER = ['qemails']
collectors/python.d.plugin/exim/exim.conf
+4 -6
@@ -28,11 +28,9 @@ update_every: 10
28 # If unset, the default for python.d.plugin is used.
29 # priority: 60000
30
31 -# retries sets the number of retries to be made in case of failures.
32 -# If unset, the default for python.d.plugin is used.
33 -# Attempts to restore the service are made once every update_every
34 -# and only if the module has collected values in the past.
35 -# retries: 60
31 +# penalty indicates whether to apply penalty to update_every in case of failures.
32 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
33 +# penalty: yes
34
35 # autodetection_retry sets the job re-check interval in seconds.
36 # The job is not deleted if check fails.
@@ -59,7 +57,7 @@ update_every: 10
57 # # JOBs sharing a name are mutually exclusive
58 # update_every: 1 # the JOB's data collection frequency
59 # priority: 60000 # the JOB's order on the dashboard
62 -# retries: 60 # the JOB's number of restoration attempts
60 +# penalty: yes # the JOB's penalty
61 # autodetection_retry: 0 # the JOB's re-check interval in seconds
62 #
63 # Additionally to the above, exim also supports the following:
collectors/python.d.plugin/fail2ban/fail2ban.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, fail2ban also supports the following:
collectors/python.d.plugin/freeradius/freeradius.chart.py
-1
@@ -11,7 +11,6 @@ from bases.FrameworkServices.SimpleService import SimpleService
11
12 # default module values (can be overridden per job in `config`)
13 priority = 60000
14 -retries = 60
14 update_every = 15
15
16 RADIUS_MSG = 'Message-Authenticator = 0x00, FreeRADIUS-Statistics-Type = 15, Response-Packet-Type = Access-Accept'
collectors/python.d.plugin/freeradius/freeradius.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, freeradius also supports the following:
collectors/python.d.plugin/go_expvar/README.md
-1
@@ -169,7 +169,6 @@ and its base `UrlService` class. These are:
169
170 update_every: 1 # the job's data collection frequency
171 priority: 60000 # the job's order on the dashboard
172 - retries: 60 # the job's number of restoration attempts
172 user: admin # use when the expvar endpoint is protected by HTTP Basic Auth
173 password: sekret # use when the expvar endpoint is protected by HTTP Basic Auth
174
collectors/python.d.plugin/go_expvar/go_expvar.chart.py
-2
@@ -11,8 +11,6 @@ from bases.FrameworkServices.UrlService import UrlService
11 # default module values (can be overridden per job in `config`)
12 # update_every = 2
13 priority = 60000
14 -retries = 60
15 -
14
15 MEMSTATS_CHARTS = {
16 'memstats_heap': {
collectors/python.d.plugin/go_expvar/go_expvar.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -53,7 +51,7 @@
51 # # JOBs sharing a name are mutually exclusive
52 # update_every: 1 # the JOB's data collection frequency
53 # priority: 60000 # the JOB's order on the dashboard
56 -# retries: 60 # the JOB's number of restoration attempts
54 +# penalty: yes # the JOB's penalty
55 # autodetection_retry: 0 # the JOB's re-check interval in seconds
56 #
57 # Additionally to the above, this plugin also supports the following:
collectors/python.d.plugin/haproxy/haproxy.chart.py
-1
@@ -18,7 +18,6 @@ from bases.FrameworkServices.UrlService import UrlService
18 # default module values (can be overridden per job in `config`)
19 # update_every = 2
20 priority = 60000
21 -retries = 60
21
22 # charts order (can be overridden if you want less charts, or different order)
23 ORDER = [
collectors/python.d.plugin/haproxy/haproxy.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, haproxy also supports the following:
collectors/python.d.plugin/hddtemp/hddtemp.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, hddtemp also supports the following:
collectors/python.d.plugin/httpcheck/httpcheck.chart.py
-1
@@ -16,7 +16,6 @@ from bases.FrameworkServices.UrlService import UrlService
16 # default module values (can be overridden per job in `config`)
17 update_every = 3
18 priority = 60000
19 -retries = 60
19
20 # Response
21 HTTP_RESPONSE_TIME = 'time'
collectors/python.d.plugin/httpcheck/httpcheck.conf
+5 -1
@@ -27,6 +27,10 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33 +
34 # chart_cleanup sets the default chart cleanup interval in iterations.
35 # A chart is marked as obsolete if it has not been updated
36 # 'chart_cleanup' iterations in a row.
@@ -61,7 +65,7 @@ chart_cleanup: 0
65 # # JOBs sharing a name are mutually exclusive
66 # update_every: 3 # [optional] the JOB's data collection frequency
67 # priority: 60000 # [optional] the JOB's order on the dashboard
64 -# retries: 60 # [optional] the JOB's number of restoration attempts
68 +# penalty: yes # the JOB's penalty
69 # timeout: 1 # [optional] the timeout when connecting, supports decimals (e.g. 0.5s)
70 # url: 'http[s]://host-ip-or-dns[:port][path]'
71 # # [required] the remote host url to connect to. If [:port] is missing, it defaults to 80
collectors/python.d.plugin/icecast/icecast.chart.py
-1
@@ -9,7 +9,6 @@ from bases.FrameworkServices.UrlService import UrlService
9
10
11 priority = 60000
12 -retries = 60
12
13 # charts order (can be overridden if you want less charts, or different order)
14 ORDER = ['listeners']
collectors/python.d.plugin/icecast/icecast.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, icecast also supports the following:
collectors/python.d.plugin/ipfs/ipfs.chart.py
-1
@@ -10,7 +10,6 @@ from bases.FrameworkServices.UrlService import UrlService
10 # default module values (can be overridden per job in `config`)
11 # update_every = 2
12 priority = 60000
13 -retries = 60
13
14 # default job configuration (overridden by python.d.plugin)
15 # config = {'local': {
collectors/python.d.plugin/ipfs/ipfs.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, ipfs also supports the following:
collectors/python.d.plugin/isc_dhcpd/isc_dhcpd.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, isc_dhcpd supports the following:
collectors/python.d.plugin/linux_power_supply/linux_power_supply.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_everye
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # In addition to the above parameters, linux_power_supply also supports
collectors/python.d.plugin/litespeed/litespeed.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, lightspeed also supports the following:
collectors/python.d.plugin/logind/logind.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,5 +56,5 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
collectors/python.d.plugin/mdstat/mdstat.conf
+3 -5
@@ -19,11 +19,9 @@
19 # If unset, the default for python.d.plugin is used.
20 # priority: 60000
21
22 -# retries sets the number of retries to be made in case of failures.
23 -# If unset, the default for python.d.plugin is used.
24 -# Attempts to restore the service are made once every update_every
25 -# and only if the module has collected values in the past.
26 -# retries: 60
22 +# penalty indicates whether to apply penalty to update_every in case of failures.
23 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
24 +# penalty: yes
25
26 # autodetection_retry sets the job re-check interval in seconds.
27 # The job is not deleted if check fails.
collectors/python.d.plugin/megacli/megacli.conf
+4 -6
@@ -19,11 +19,9 @@
19 # If unset, the default for python.d.plugin is used.
20 # priority: 60000
21
22 -# retries sets the number of retries to be made in case of failures.
23 -# If unset, the default for python.d.plugin is used.
24 -# Attempts to restore the service are made once every update_every
25 -# and only if the module has collected values in the past.
26 -# retries: 60
22 +# penalty indicates whether to apply penalty to update_every in case of failures.
23 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
24 +# penalty: yes
25
26 # autodetection_retry sets the job re-check interval in seconds.
27 # The job is not deleted if check fails.
@@ -50,7 +48,7 @@
48 # # JOBs sharing a name are mutually exclusive
49 # update_every: 1 # the JOB's data collection frequency
50 # priority: 60000 # the JOB's order on the dashboard
53 -# retries: 60 # the JOB's number of restoration attempts
51 +# penalty: yes # the JOB's penalty
52 # autodetection_retry: 0 # the JOB's re-check interval in seconds
53 #
54 # Additionally to the above, megacli also supports the following:
collectors/python.d.plugin/memcached/memcached.chart.py
-1
@@ -8,7 +8,6 @@ from bases.FrameworkServices.SocketService import SocketService
8 # default module values (can be overridden per job in `config`)
9 # update_every = 2
10 priority = 60000
11 -retries = 60
11
12 # default job configuration (overridden by python.d.plugin)
13 # config = {'local': {
collectors/python.d.plugin/memcached/memcached.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, memcached also supports the following:
collectors/python.d.plugin/mongodb/mongodb.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, mongodb also supports the following:
collectors/python.d.plugin/monit/monit.chart.py
-1
@@ -9,7 +9,6 @@ from bases.FrameworkServices.UrlService import UrlService
9 # default module values (can be overridden per job in `config`)
10 # update_every = 2
11 priority = 60000
12 -retries = 60
12
13 # see enum State_Type from monit.h (https://bitbucket.org/tildeslash/monit/src/master/src/monit.h)
14 MONIT_SERVICE_NAMES = ['Filesystem', 'Directory', 'File', 'Process', 'Host', 'System', 'Fifo', 'Program', 'Net']
collectors/python.d.plugin/monit/monit.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, this plugin also supports the following:
collectors/python.d.plugin/mysql/README.md
-2
@@ -65,7 +65,6 @@ Here is an example for 3 servers:
65 ```yaml
66 update_every : 10
67 priority : 90100
68 -retries : 5
68
69 local:
70 'my.cnf' : '/etc/mysql/my.cnf'
@@ -82,7 +81,6 @@ remote:
81 pass : 'bla'
82 host : 'example.org'
83 port : 9000
85 - retries : 20
84 ```
85
86 If no configuration is given, module will attempt to connect to mysql server via unix socket at `/var/run/mysqld/mysqld.sock` without password and with username `root`
collectors/python.d.plugin/mysql/mysql.chart.py
-1
@@ -9,7 +9,6 @@ from bases.FrameworkServices.MySQLService import MySQLService
9 # default module values (can be overridden per job in `config`)
10 # update_every = 3
11 priority = 60000
12 -retries = 60
12
13 # query executed on MySQL server
14 QUERY_GLOBAL = 'SHOW GLOBAL STATUS;'
collectors/python.d.plugin/mysql/mysql.conf
+5 -6
@@ -27,11 +27,10 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33 +
34
35 # autodetection_retry sets the job re-check interval in seconds.
36 # The job is not deleted if check fails.
@@ -58,7 +57,7 @@
57 # # JOBs sharing a name are mutually exclusive
58 # update_every: 1 # the JOB's data collection frequency
59 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
60 +# penalty: yes # the JOB's penalty
61 # autodetection_retry: 0 # the JOB's re-check interval in seconds
62 #
63 # Additionally to the above, mysql also supports the following:
collectors/python.d.plugin/nginx/README.md
-1
@@ -37,7 +37,6 @@ priority : 90100
37
38 local:
39 url : 'http://localhost/stub_status'
40 - retries : 10
40 ```
41
42 Without configuration, module attempts to connect to `http://localhost/stub_status`
collectors/python.d.plugin/nginx/nginx.chart.py
-1
@@ -8,7 +8,6 @@ from bases.FrameworkServices.UrlService import UrlService
8 # default module values (can be overridden per job in `config`)
9 # update_every = 2
10 priority = 60000
11 -retries = 60
11
12 # default job configuration (overridden by python.d.plugin)
13 # config = {'local': {
collectors/python.d.plugin/nginx/nginx.conf
+4 -6
@@ -39,11 +39,9 @@
39 # If unset, the default for python.d.plugin is used.
40 # priority: 60000
41
42 -# retries sets the number of retries to be made in case of failures.
43 -# If unset, the default for python.d.plugin is used.
44 -# Attempts to restore the service are made once every update_every
45 -# and only if the module has collected values in the past.
46 -# retries: 60
42 +# penalty indicates whether to apply penalty to update_every in case of failures.
43 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
44 +# penalty: yes
45
46 # autodetection_retry sets the job re-check interval in seconds.
47 # The job is not deleted if check fails.
@@ -70,7 +68,7 @@
68 # # JOBs sharing a name are mutually exclusive
69 # update_every: 1 # the JOB's data collection frequency
70 # priority: 60000 # the JOB's order on the dashboard
73 -# retries: 60 # the JOB's number of restoration attempts
71 +# penalty: yes # the JOB's penalty
72 # autodetection_retry: 0 # the JOB's re-check interval in seconds
73 #
74 # Additionally to the above, this plugin also supports the following:
collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py
-1
@@ -19,7 +19,6 @@ from bases.FrameworkServices.UrlService import UrlService
19 # default module values (can be overridden per job in `config`)
20 update_every = 1
21 priority = 60000
22 -retries = 60
22
23 # charts order (can be overridden if you want less charts, or different order)
24 ORDER = [
collectors/python.d.plugin/nginx_plus/nginx_plus.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, nginx_plus also supports the following:
collectors/python.d.plugin/nsd/nsd.chart.py
-1
@@ -9,7 +9,6 @@ from bases.FrameworkServices.ExecutableService import ExecutableService
9
10 # default module values (can be overridden per job in `config`)
11 priority = 60000
12 -retries = 5
12 update_every = 30
13
14 # charts order (can be overridden if you want less charts, or different order)
collectors/python.d.plugin/nsd/nsd.conf
+4 -6
@@ -28,11 +28,9 @@
28 # If unset, the default for python.d.plugin is used.
29 # priority: 60000
30
31 -# retries sets the number of retries to be made in case of failures.
32 -# If unset, the default for python.d.plugin is used.
33 -# Attempts to restore the service are made once every update_every
34 -# and only if the module has collected values in the past.
35 -# retries: 60
31 +# penalty indicates whether to apply penalty to update_every in case of failures.
32 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
33 +# penalty: yes
34
35 # autodetection_retry sets the job re-check interval in seconds.
36 # The job is not deleted if check fails.
@@ -59,7 +57,7 @@
57 # # JOBs sharing a name are mutually exclusive
58 # update_every: 1 # the JOB's data collection frequency
59 # priority: 60000 # the JOB's order on the dashboard
62 -# retries: 60 # the JOB's number of restoration attempts
60 +# penalty: yes # the JOB's penalty
61 # autodetection_retry: 0 # the JOB's re-check interval in seconds
62 #
63 # Additionally to the above, nsd also supports the following:
collectors/python.d.plugin/ntpd/ntpd.chart.py
-1
@@ -12,7 +12,6 @@ from bases.FrameworkServices.SocketService import SocketService
12 # default module values
13 update_every = 1
14 priority = 60000
15 -retries = 60
15
16 # NTP Control Message Protocol constants
17 MODE = 6
collectors/python.d.plugin/ntpd/ntpd.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # ----------------------------------------------------------------------
35 # JOBS (data collection sources)
@@ -52,7 +50,7 @@
50 # # JOBs sharing a name are mutually exclusive
51 # update_every: 1 # the JOB's data collection frequency
52 # priority: 60000 # the JOB's order on the dashboard
55 -# retries: 60 # the JOB's number of restoration attempts
53 +# penalty: yes # the JOB's penalty
54 #
55 # Additionally to the above, ntp also supports the following:
56 #
collectors/python.d.plugin/nvidia_smi/nvidia_smi.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, example also supports the following:
collectors/python.d.plugin/openldap/openldap.conf
+4 -6
@@ -28,11 +28,9 @@ update_every: 10
28 # If unset, the default for python.d.plugin is used.
29 # priority: 60000
30
31 -# retries sets the number of retries to be made in case of failures.
32 -# If unset, the default for python.d.plugin is used.
33 -# Attempts to restore the service are made once every update_every
34 -# and only if the module has collected values in the past.
35 -# retries: 60
31 +# penalty indicates whether to apply penalty to update_every in case of failures.
32 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
33 +# penalty: yes
34
35 # autodetection_retry sets the job re-check interval in seconds.
36 # The job is not deleted if check fails.
@@ -59,7 +57,7 @@ update_every: 10
57 # # JOBs sharing a name are mutually exclusive
58 # update_every: 1 # the JOB's data collection frequency
59 # priority: 60000 # the JOB's order on the dashboard
62 -# retries: 60 # the JOB's number of restoration attempts
60 +# penalty: yes # the JOB's penalty
61 # autodetection_retry: 0 # the JOB's re-check interval in seconds
62 #
63 # ----------------------------------------------------------------------
collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py
-1
@@ -8,7 +8,6 @@ from re import compile as r_compile
8 from bases.FrameworkServices.SimpleService import SimpleService
9
10 priority = 60000
11 -retries = 60
11 update_every = 10
12
13 ORDER = ['users', 'traffic']
collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, openvpn status log also supports the following:
collectors/python.d.plugin/phpfpm/README.md
-1
@@ -32,7 +32,6 @@ priority : 90100
32
33 local:
34 url : 'http://localhost/status'
35 - retries : 10
35 ```
36
37 Without configuration, module attempts to connect to `http://localhost/status`
collectors/python.d.plugin/phpfpm/phpfpm.chart.py
-1
@@ -12,7 +12,6 @@ from bases.FrameworkServices.UrlService import UrlService
12 # default module values (can be overridden per job in `config`)
13 # update_every = 2
14 priority = 60000
15 -retries = 60
15
16 # default job configuration (overridden by python.d.plugin)
17 # config = {'local': {
collectors/python.d.plugin/phpfpm/phpfpm.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, PHP-FPM also supports the following:
collectors/python.d.plugin/portcheck/portcheck.chart.py
-1
@@ -14,7 +14,6 @@ from bases.FrameworkServices.SimpleService import SimpleService
14
15 # default module values (can be overridden per job in `config`)
16 priority = 60000
17 -retries = 60
17
18 PORT_LATENCY = 'connect'
19
collectors/python.d.plugin/portcheck/portcheck.conf
+5 -1
@@ -27,6 +27,10 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33 +
34 # chart_cleanup sets the default chart cleanup interval in iterations.
35 # A chart is marked as obsolete if it has not been updated
36 # 'chart_cleanup' iterations in a row.
@@ -60,7 +64,7 @@ chart_cleanup: 0
64 # # JOBs sharing a name are mutually exclusive
65 # update_every: 1 # [optional] the JOB's data collection frequency
66 # priority: 60000 # [optional] the JOB's order on the dashboard
63 -# retries: 60 # [optional] the JOB's number of restoration attempts
67 +# penalty: yes # the JOB's penalty
68 # timeout: 1 # [optional] the socket timeout when connecting
69 # host: 'dns or ip' # [required] the remote host address in either IPv4, IPv6 or as DNS name.
70 # port: 22 # [required] the port number to check. Specify an integer, not service name.
collectors/python.d.plugin/postfix/postfix.chart.py
-1
@@ -8,7 +8,6 @@ from bases.FrameworkServices.ExecutableService import ExecutableService
8 # default module values (can be overridden per job in `config`)
9 # update_every = 2
10 priority = 60000
11 -retries = 60
11
12 # charts order (can be overridden if you want less charts, or different order)
13 ORDER = ['qemails', 'qsize']
collectors/python.d.plugin/postfix/postfix.conf
+4 -6
@@ -28,11 +28,9 @@ update_every: 10
28 # If unset, the default for python.d.plugin is used.
29 # priority: 60000
30
31 -# retries sets the number of retries to be made in case of failures.
32 -# If unset, the default for python.d.plugin is used.
33 -# Attempts to restore the service are made once every update_every
34 -# and only if the module has collected values in the past.
35 -# retries: 60
31 +# penalty indicates whether to apply penalty to update_every in case of failures.
32 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
33 +# penalty: yes
34
35 # autodetection_retry sets the job re-check interval in seconds.
36 # The job is not deleted if check fails.
@@ -59,7 +57,7 @@ update_every: 10
57 # # JOBs sharing a name are mutually exclusive
58 # update_every: 1 # the JOB's data collection frequency
59 # priority: 60000 # the JOB's order on the dashboard
62 -# retries: 60 # the JOB's number of restoration attempts
60 +# penalty: yes # the JOB's penalty
61 # autodetection_retry: 0 # the JOB's re-check interval in seconds
62 #
63 # Additionally to the above, postfix also supports the following:
collectors/python.d.plugin/postgres/postgres.chart.py
-1
@@ -19,7 +19,6 @@ from bases.FrameworkServices.SimpleService import SimpleService
19 # default module values
20 update_every = 1
21 priority = 60000
22 -retries = 60
22
23 METRICS = {
24 'DATABASE': [
collectors/python.d.plugin/postgres/postgres.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # A single connection is required in order to pull statistics.
collectors/python.d.plugin/powerdns/powerdns.chart.py
-2
@@ -9,8 +9,6 @@ from json import loads
9 from bases.FrameworkServices.UrlService import UrlService
10
11 priority = 60000
12 -retries = 60
13 -# update_every = 3
12
13 ORDER = ['questions', 'cache_usage', 'cache_size', 'latency']
14 CHARTS = {
collectors/python.d.plugin/powerdns/powerdns.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, apache also supports the following:
collectors/python.d.plugin/proxysql/proxysql.chart.py
-1
@@ -8,7 +8,6 @@ from bases.FrameworkServices.MySQLService import MySQLService
8 # default module values (can be overridden per job in `config`)
9 # update_every = 3
10 priority = 60000
11 -retries = 60
11
12
13 def query(table, *params):
collectors/python.d.plugin/proxysql/proxysql.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, proxysql also supports the following:
collectors/python.d.plugin/puppet/README.md
+1 -4
@@ -26,16 +26,13 @@ puppetdb:
26 tls_cert_file: /path/to/client.crt
27 tls_key_file: /path/to/client.key
28 autodetection_retry: 1
29 - retries: 3600
29
30 puppetserver:
31 url: 'https://fqdn.example.com:8140'
32 autodetection_retry: 1
34 - retries: 3600
33 ```
34
37 -When no configuration is given then `https://fqdn.example.com:8140` is
38 -tried without any retries.
35 +When no configuration is given, module uses `https://fqdn.example.com:8140`.
36
37 ### notes
38
collectors/python.d.plugin/puppet/puppet.chart.py
+1 -2
@@ -17,8 +17,7 @@ import socket
17
18 update_every = 5
19 priority = 60000
20 -# very long clojure-based service startup time
21 -retries = 180
20 +
21
22 MB = 1048576
23 CPU_SCALE = 1000
collectors/python.d.plugin/puppet/puppet.conf
+4 -8
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # These configuration comes from UrlService base:
@@ -89,10 +87,8 @@
87 # tls_cert_file: /path/to/client.crt
88 # tls_key_file: /path/to/client.key
89 # autodetection_retry: 1
92 -# retries: 3600
90 #
91 # puppetserver:
92 # url: 'https://fqdn.example.com:8140'
93 # autodetection_retry: 1
97 -# retries: 3600
94 #
collectors/python.d.plugin/python.d.plugin.in
+1 -1
@@ -48,10 +48,10 @@ except ImportError:
48 from third_party.ordereddict import OrderedDict
49
50 BASE_CONFIG = {'update_every': os.getenv('NETDATA_UPDATE_EVERY', 1),
51 - 'retries': 60,
51 'priority': 60000,
52 'autodetection_retry': 0,
53 'chart_cleanup': 10,
54 + 'penalty': True,
55 'name': str()}
56
57
collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py
+11 -15
@@ -18,6 +18,7 @@ RUNTIME_CHART_UPDATE = 'BEGIN netdata.runtime_{job_name} {since_last}\n' \
18 'END\n'
19
20 PENALTY_EVERY = 5
21 +MAX_PENALTY = 10 * 60 # 10 minutes
22
23
24 class RuntimeCounters:
@@ -26,7 +27,7 @@ class RuntimeCounters:
27 :param configuration: <dict>
28 """
29 self.update_every = int(configuration.pop('update_every'))
29 - self.max_retries = int(configuration.pop('retries'))
30 + self.do_penalty = configuration.pop('penalty')
31
32 self.start_mono = 0
33 self.start_real = 0
@@ -34,6 +35,7 @@ class RuntimeCounters:
35 self.penalty = 0
36 self.elapsed = 0
37 self.prev_update = 0
38 +
39 self.runs = 1
40
41 def calc_next(self):
@@ -49,10 +51,8 @@ class RuntimeCounters:
51
52 def handle_retries(self):
53 self.retries += 1
52 - if self.retries % PENALTY_EVERY:
53 - return True
54 - self.penalty = self.retries * self.update_every / 2
55 - return self.retries < self.max_retries
54 + if self.do_penalty and self.retries % PENALTY_EVERY == 0:
55 + self.penalty = round(min(self.retries * self.update_every / 2, MAX_PENALTY))
56
57
58 class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, object):
@@ -180,10 +180,7 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
180 :return: None
181 """
182 job = self._runtime_counters
183 - self.debug('started, update frequency: {freq}, retries: {retries}'.format(
184 - freq=job.update_every,
185 - retries=job.max_retries - job.retries),
186 - )
183 + self.debug('started, update frequency: {freq}'.format(freq=job.update_every))
184
185 while True:
186 job.sleep_until_next()
@@ -201,8 +198,7 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
198 job.runs += 1
199
200 if not updated:
204 - if not job.handle_retries():
205 - return
201 + job.handle_retries()
202 else:
203 job.elapsed = int((monotonic() - job.start_mono) * 1e3)
204 job.prev_update = job.start_real
@@ -210,10 +206,10 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
206 safe_print(RUNTIME_CHART_UPDATE.format(job_name=self.name,
207 since_last=since,
208 elapsed=job.elapsed))
213 - self.debug('update => [{status}] (elapsed time: {elapsed}, '
214 - 'retries left: {retries})'.format(status='OK' if updated else 'FAILED',
215 - elapsed=job.elapsed if updated else '-',
216 - retries=job.max_retries - job.retries))
209 + self.debug('update => [{status}] (elapsed time: {elapsed}, failed retries in a row: {retries})'.format(
210 + status='OK' if updated else 'FAILED',
211 + elapsed=job.elapsed if updated else '-',
212 + retries=job.retries))
213
214 def update(self, interval):
215 """
collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
-1
@@ -17,7 +17,6 @@ from bases.FrameworkServices.UrlService import UrlService
17 # default module values (can be overridden per job in `config`)
18 update_every = 1
19 priority = 60000
20 -retries = 60
20
21 METHODS = namedtuple('METHODS', ['get_data', 'url', 'stats'])
22
collectors/python.d.plugin/rabbitmq/rabbitmq.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, rabbitmq plugin also supports the following:
collectors/python.d.plugin/redis/redis.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, redis also supports the following:
collectors/python.d.plugin/rethinkdbs/rethinkdbs.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, rethinkdb also supports the following:
collectors/python.d.plugin/retroshare/retroshare.chart.py
-1
@@ -10,7 +10,6 @@ from bases.FrameworkServices.UrlService import UrlService
10 # default module values (can be overridden per job in `config`)
11 # update_every = 2
12 priority = 60000
13 -retries = 60
13
14 # charts order (can be overridden if you want less charts, or different order)
15 ORDER = ['bandwidth', 'peers', 'dht']
collectors/python.d.plugin/retroshare/retroshare.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, RetroShare also supports the following:
collectors/python.d.plugin/samba/samba.chart.py
-1
@@ -27,7 +27,6 @@ disabled_by_default = True
27 # default module values (can be overridden per job in `config`)
28 update_every = 5
29 priority = 60000
30 -retries = 60
30
31 ORDER = [
32 'syscall_rw',
collectors/python.d.plugin/samba/samba.conf
+4 -6
@@ -27,11 +27,9 @@ update_every: 5
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,5 +56,5 @@ update_every: 5
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
\ No newline at end of file
collectors/python.d.plugin/sensors/sensors.conf
+3 -5
@@ -19,11 +19,9 @@
19 # If unset, the default for python.d.plugin is used.
20 # priority: 60000
21
22 -# retries sets the number of retries to be made in case of failures.
23 -# If unset, the default for python.d.plugin is used.
24 -# Attempts to restore the service are made once every update_every
25 -# and only if the module has collected values in the past.
26 -# retries: 60
22 +# penalty indicates whether to apply penalty to update_every in case of failures.
23 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
24 +# penalty: yes
25
26 # autodetection_retry sets the job re-check interval in seconds.
27 # The job is not deleted if check fails.
collectors/python.d.plugin/smartd_log/smartd_log.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, smartd_log also supports the following:
collectors/python.d.plugin/spigotmc/spigotmc.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # In addition to the above, spigotmc supports the following:
collectors/python.d.plugin/springboot/springboot.chart.py
-1
@@ -9,7 +9,6 @@ from bases.FrameworkServices.UrlService import UrlService
9 # default module values (can be overridden per job in `config`)
10 # update_every = 2
11 priority = 60000
12 -retries = 60
12
13
14 DEFAULT_ORDER = ['response_code', 'threads', 'gc_time', 'gc_ope', 'heap']
collectors/python.d.plugin/springboot/springboot.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -53,7 +51,7 @@
51 # # JOBs sharing a name are mutually exclusive
52 # update_every: 1 # the JOB's data collection frequency
53 # priority: 60000 # the JOB's order on the dashboard
56 -# retries: 60 # the JOB's number of restoration attempts
54 +# penalty: yes # the JOB's penalty
55 # autodetection_retry: 0 # the JOB's re-check interval in seconds
56 #
57 # Additionally to the above, this plugin also supports the following:
collectors/python.d.plugin/squid/squid.chart.py
-1
@@ -9,7 +9,6 @@ from bases.FrameworkServices.SocketService import SocketService
9 # default module values (can be overridden per job in `config`)
10 # update_every = 2
11 priority = 60000
12 -retries = 60
12
13 # charts order (can be overridden if you want less charts, or different order)
14 ORDER = ['clients_net', 'clients_requests', 'servers_net', 'servers_requests']
collectors/python.d.plugin/squid/squid.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, squid also supports the following:
collectors/python.d.plugin/tomcat/tomcat.chart.py
-1
@@ -11,7 +11,6 @@ from bases.FrameworkServices.UrlService import UrlService
11 # default module values (can be overridden per job in `config`)
12 # update_every = 2
13 priority = 60000
14 -retries = 60
14
15 # charts order (can be overridden if you want less charts, or different order)
16 ORDER = ['accesses', 'bandwidth', 'processing_time', 'threads', 'jvm', 'jvm_eden', 'jvm_survivor', 'jvm_tenured']
collectors/python.d.plugin/tomcat/tomcat.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, tomcat also supports the following:
collectors/python.d.plugin/tor/tor.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 10 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, tor plugin also supports the following:
collectors/python.d.plugin/traefik/README.md
-1
@@ -46,7 +46,6 @@ priority : 60000
46
47 local:
48 url : 'http://localhost:8080/health'
49 - retries : 10
49 ```
50
51 Without configuration, module attempts to connect to `http://localhost:8080/health`.
collectors/python.d.plugin/traefik/traefik.chart.py
-1
@@ -10,7 +10,6 @@ from bases.FrameworkServices.UrlService import UrlService
10 # default module values (can be overridden per job in `config`)
11 update_every = 1
12 priority = 60000
13 -retries = 10
13
14 # charts order (can be overridden if you want less charts, or different order)
15 ORDER = [
collectors/python.d.plugin/traefik/traefik.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 10 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, traefik plugin also supports the following:
collectors/python.d.plugin/unbound/unbound.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_everye
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, unbound also supports the following:
collectors/python.d.plugin/uwsgi/uwsgi.chart.py
-1
@@ -10,7 +10,6 @@ from bases.FrameworkServices.SocketService import SocketService
10 # default module values (can be overridden per job in `config`)
11 # update_every = 2
12 priority = 60000
13 -retries = 60
13
14 ORDER = [
15 'requests',
collectors/python.d.plugin/uwsgi/uwsgi.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, uwsgi also supports the following:
collectors/python.d.plugin/varnish/varnish.chart.py
-1
@@ -11,7 +11,6 @@ from bases.FrameworkServices.ExecutableService import ExecutableService
11 # default module values (can be overridden per job in `config`)
12 # update_every = 2
13 priority = 60000
14 -retries = 60
14
15 ORDER = [
16 'session_connections',
collectors/python.d.plugin/varnish/varnish.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 1 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # ----------------------------------------------------------------------
collectors/python.d.plugin/w1sensor/w1sensor.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -58,7 +56,7 @@
56 # # JOBs sharing a name are mutually exclusive
57 # update_every: 5 # the JOB's data collection frequency
58 # priority: 60000 # the JOB's order on the dashboard
61 -# retries: 60 # the JOB's number of restoration attempts
59 +# penalty: yes # the JOB's penalty
60 # autodetection_retry: 0 # the JOB's re-check interval in seconds
61 #
62 # Additionally to the above, example also supports the following:
collectors/python.d.plugin/web_log/web_log.conf
+4 -6
@@ -27,11 +27,9 @@
27 # If unset, the default for python.d.plugin is used.
28 # priority: 60000
29
30 -# retries sets the number of retries to be made in case of failures.
31 -# If unset, the default for python.d.plugin is used.
32 -# Attempts to restore the service are made once every update_every
33 -# and only if the module has collected values in the past.
34 -# retries: 60
30 +# penalty indicates whether to apply penalty to update_every in case of failures.
31 +# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
32 +# penalty: yes
33
34 # autodetection_retry sets the job re-check interval in seconds.
35 # The job is not deleted if check fails.
@@ -61,7 +59,7 @@
59 # # JOBs sharing a name are mutually exclusive
60 # update_every: 1 # the JOB's data collection frequency
61 # priority: 60000 # the JOB's order on the dashboard
64 -# retries: 60 # the JOB's number of restoration attempts
62 +# penalty: yes # the JOB's penalty
63 # autodetection_retry: 0 # the JOB's re-check interval in seconds
64 #
65 # Additionally to the above, web_log also supports the following: