'autodetecion_retry' added to the configuration files

38 files changed, 533 insertions, 313 deletions

diff --git a/conf.d/python.d/apache.conf b/conf.d/python.d/apache.conf
index 5b151ef708..3bbc3f7860 100644
--- a/conf.d/python.d/apache.conf
+++ b/conf.d/python.d/apache.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,12 +53,13 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, apache also supports the following:
 #
diff --git a/conf.d/python.d/bind_rndc.conf b/conf.d/python.d/bind_rndc.conf
index dde65dfe67..253934648f 100644
--- a/conf.d/python.d/bind_rndc.conf
+++ b/conf.d/python.d/bind_rndc.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,12 +53,13 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, bind_rndc also supports the following:
 #
@@ -101,11 +108,5 @@
 # To test your logrotate conf file run as root:
 #
 # logrotate /etc/logrotate.d/bind-rndc -d (debug dry-run mode)
-# ------------------------------------------------------------------------------------------------------------------
-# AUTO-DETECTION JOBS
-# only one of them will run (they have the same name)
-#
-update_every: 30
 #
-#local:
-# named_stats_path: '/var/log/bind/named.stats'  
+# ----------------------------------------------------------------------
diff --git a/conf.d/python.d/chrony.conf b/conf.d/python.d/chrony.conf
index 46229687b8..9ac906b5f6 100644
--- a/conf.d/python.d/chrony.conf
+++ b/conf.d/python.d/chrony.conf
@@ -31,7 +31,13 @@ update_every: 5
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,12 +53,13 @@ update_every: 5
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, chrony also supports the following:
 #
diff --git a/conf.d/python.d/couchdb.conf b/conf.d/python.d/couchdb.conf
index a681dc8d3d..18a96e81fb 100644
--- a/conf.d/python.d/couchdb.conf
+++ b/conf.d/python.d/couchdb.conf
@@ -32,7 +32,13 @@ update_every: 10
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -48,12 +54,13 @@ update_every: 10
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, the couchdb plugin also supports the following:
 #
diff --git a/conf.d/python.d/cpufreq.conf b/conf.d/python.d/cpufreq.conf
index 10c96917f0..0890245d91 100644
--- a/conf.d/python.d/cpufreq.conf
+++ b/conf.d/python.d/cpufreq.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # The directory to search for the file scaling_cur_freq
 sys_dir: "/sys/devices"
diff --git a/conf.d/python.d/dns_query_time.conf b/conf.d/python.d/dns_query_time.conf
index f4d4dbf92e..d32c6db831 100644
--- a/conf.d/python.d/dns_query_time.conf
+++ b/conf.d/python.d/dns_query_time.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,26 +53,19 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, dns_query_time also supports the following:
 #
-#     dns_servers: 'dns servers'       # list of dns servers to query
-#     domains: 'domains'               # list of domains
-#     aggregate: yes/no                # Default: yes. Aggregate all servers in one chart or not
-#     response_timeout: 4              # Defalt: 4. Dns query response timeout (query = -100 if response time > response_time)
-#
-#
-# ----------------------------------------------------------------------
-# AUTO-DETECTION JOBS
-# only one of them will run (they have the same name)
-#
+#     dns_servers: 'dns servers'       # List of dns servers to query
+#     domains: 'domains'               # List of domains
+#     aggregate: yes/no                # Aggregate all servers in one chart or not
+#     response_timeout: 4              # Dns query response timeout (query = -100 if response time > response_time)
 #
-#aggregate: yes
-#dns_servers: '8.8.8.8 8.8.4.4'
-#domains: 'python.org distrowatch.com linuxmint.com linux.com rsyslog.com liblognorm.com archlinux.org cisco.com debian.org kernel.org gns3.com opera.com github.com youtube.com amazon.co.uk kde.org netdata.firehol.org ubuntu.com redhat.com opensuse.org wireshark.org vmware.com microsoft.com elastic.co'
+# ----------------------------------------------------------------------
\ No newline at end of file
diff --git a/conf.d/python.d/dovecot.conf b/conf.d/python.d/dovecot.conf
index 917c5272e2..56c394991d 100644
--- a/conf.d/python.d/dovecot.conf
+++ b/conf.d/python.d/dovecot.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,12 +53,13 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, dovecot also supports the following:
 #
diff --git a/conf.d/python.d/elasticsearch.conf b/conf.d/python.d/elasticsearch.conf
index 7c35df2299..213843bf91 100644
--- a/conf.d/python.d/elasticsearch.conf
+++ b/conf.d/python.d/elasticsearch.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,12 +53,13 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, elasticsearch plugin also supports the following:
 #
diff --git a/conf.d/python.d/example.conf b/conf.d/python.d/example.conf
index 31f9a49a06..e7fed9b505 100644
--- a/conf.d/python.d/example.conf
+++ b/conf.d/python.d/example.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,12 +53,13 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, example also supports the following:
 #
diff --git a/conf.d/python.d/exim.conf b/conf.d/python.d/exim.conf
index 07d72c5a3d..2add7b2cb2 100644
--- a/conf.d/python.d/exim.conf
+++ b/conf.d/python.d/exim.conf
@@ -32,7 +32,13 @@ update_every: 10
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -48,12 +54,13 @@ update_every: 10
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, exim also supports the following:
 #
diff --git a/conf.d/python.d/fail2ban.conf b/conf.d/python.d/fail2ban.conf
index 76277108b2..60ca87231b 100644
--- a/conf.d/python.d/fail2ban.conf
+++ b/conf.d/python.d/fail2ban.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,17 +53,18 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, fail2ban also supports the following:
 #
-#     log_path:  'path to fail2ban.log'			        # Default: '/var/log/fail2ban.log'
-#     conf_path: 'path to jail.local/jail.conf'			# Default: '/etc/fail2ban/jail.local'
-#     conf_dir:  'path to jail.d/'			        # Default: '/etc/fail2ban/jail.d/'
-#     exclude:   'jails you want to exclude from autodetection'	# Default: '[]' empty list
+#     log_path:  'path to fail2ban.log'			                 # Default: '/var/log/fail2ban.log'
+#     conf_path: 'path to jail.local/jail.conf'			         # Default: '/etc/fail2ban/jail.local'
+#     conf_dir:  'path to jail.d/'			                     # Default: '/etc/fail2ban/jail.d/'
+#     exclude:   'jails you want to exclude from autodetection'  # Default: none
 #------------------------------------------------------------------------------------------------------------------
diff --git a/conf.d/python.d/freeradius.conf b/conf.d/python.d/freeradius.conf
index f3299fda7b..3336d4c493 100644
--- a/conf.d/python.d/freeradius.conf
+++ b/conf.d/python.d/freeradius.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -47,17 +53,18 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: myname     # the JOB's name as it will appear at the
-#                      # dashboard (by default is the job_name)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, freeradius also supports the following:
 #
-#     host: 'host'			# Default: 'localhost'. Server ip address or hostname.
-#     port: 'port'			# Default: '18121'. Port on which freeradius server listen (type = status).
+#     host: 'host'			    # Default: 'localhost'. Server ip address or hostname.
+#     port: 'port'			    # Default: '18121'. Port on which freeradius server listen (type = status).
 #     secret: 'secret'			# Default: 'adminsecret'. 
 #     acct: yes/no		     	# Default: no. Freeradius accounting statistics.
 #     proxy_auth: yes/no		# Default: no. Freeradius proxy authentication statistics.
@@ -73,15 +80,3 @@
 #    ln -s ../sites-available/status status
 # and restart/reload your FREERADIUS server. 
 # ------------------------------------------------------------------------------------------------------------------
-update_every: 15
-
-# AUTO-DETECTION JOBS
-# only one of them will run (they have the same name)
-
-local:
- host: 'localhost'
- port: '18121'
-#secret: 'adminsecret'
-#acct: no
-#proxy_auth: no
-#proxy_acct: no
diff --git a/conf.d/python.d/go_expvar.conf b/conf.d/python.d/go_expvar.conf
index 5be4890dc7..c352b1674e 100644
--- a/conf.d/python.d/go_expvar.conf
+++ b/conf.d/python.d/go_expvar.conf
@@ -31,7 +31,13 @@
 # If unset, the default for python.d.plugin is used.
 # Attempts to restore the service are made once every update_every
 # and only if the module has collected values in the past.
-# retries: 5
+# retries: 60
+
+# autodetection_retry sets the job re-check interval in seconds.
+# The job is not deleted if check fails.
+# Attempts to start the job are made once every autodetection_retry.
+# This feature is disabled by default.
+# autodetection_retry: 0
 
 # ----------------------------------------------------------------------
 # JOBS (data collection sources)
@@ -42,19 +48,17 @@
 # predefined parameters. These are:
 #
 # job_name:
-#     name: my_name    # the JOB's name as it will appear at the
-#                      # dashboard. If name: is not supplied the
-#                      # job_name: will be used (use _ for spaces)
-#                      # JOBs sharing a name are mutually exclusive
-#     update_every: 1  # the JOB's data collection frequency
-#     priority: 60000  # the JOB's order on the dashboard
-#     retries: 5       # the JOB's number of restoration attempts
+#     name: myname            # the JOB's name as it will appear at the
+#                             # dashboard (by default is the job_name)
+#                             # JOBs sharing a name are mutually exclusive
+#     update_every: 1         # the JOB's data collection frequency
+#     priority: 60000         # the JOB's order on the dashboard
+#     retries: 60             # the JOB's number of restoration attempts
+#     autodetection_retry: 0  # the JOB's re-check interval in seconds
 #
 # Additionally to the above, this plugin also supports the following:
 #
 #     url: 'http://127.0.0.1/debug/vars'       # the URL of the expvar endpoint
-#     ss_cert:                                 # ignore HTTPS self-signed cer