summaryrefslogtreecommitdiffstats
path: root/collectors/python.d.plugin/puppet
diff options
context:
space:
mode:
authorIlya Mashchenko <ilyamaschenko@gmail.com>2018-12-07 12:15:03 +0300
committerChris Akritidis <43294513+cakrit@users.noreply.github.com>2018-12-07 10:15:03 +0100
commit5286dae8ebb09d2c9699cd38e8850c5481f3d742 (patch)
tree1d4706225c8e8d6fe76e0a626ac9b65c9f0c1133 /collectors/python.d.plugin/puppet
parente096424786b36d0ba106c72b551a6ce37843be37 (diff)
python.d.plugin update (#4936)
<!-- Describe the change in summary section, including rationale and degin decisions. Include "Fixes #nnn" if you are fixing an existing issue. In "Component Name" section write which component is changed in this PR. This will help us review your PR quicker. If you have more information you want to add, write them in "Additional Information" section. This is usually used to help others understand your motivation behind this change. A step-by-step reproduction of the problem is helpful if there is no related issue. --> ##### Summary Fix: #4756 `python.d.plugin` updates: * remove `retries` option * make `penalty` configurable (enabled by default, max is 10 minutes) > penalty indicates whether to apply penalty to update_every in case of failures. > Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes. > penalty: yes ##### Component Name `python.d.plugin` ##### Additional Information
Diffstat (limited to 'collectors/python.d.plugin/puppet')
-rw-r--r--collectors/python.d.plugin/puppet/README.md5
-rw-r--r--collectors/python.d.plugin/puppet/puppet.chart.py3
-rw-r--r--collectors/python.d.plugin/puppet/puppet.conf12
3 files changed, 6 insertions, 14 deletions
diff --git a/collectors/python.d.plugin/puppet/README.md b/collectors/python.d.plugin/puppet/README.md
index 8304c831ef..1a7f336bf5 100644
--- a/collectors/python.d.plugin/puppet/README.md
+++ b/collectors/python.d.plugin/puppet/README.md
@@ -26,16 +26,13 @@ puppetdb:
tls_cert_file: /path/to/client.crt
tls_key_file: /path/to/client.key
autodetection_retry: 1
- retries: 3600
puppetserver:
url: 'https://fqdn.example.com:8140'
autodetection_retry: 1
- retries: 3600
```
-When no configuration is given then `https://fqdn.example.com:8140` is
-tried without any retries.
+When no configuration is given, module uses `https://fqdn.example.com:8140`.
### notes
diff --git a/collectors/python.d.plugin/puppet/puppet.chart.py b/collectors/python.d.plugin/puppet/puppet.chart.py
index 5c8e48bd9c..901f748222 100644
--- a/collectors/python.d.plugin/puppet/puppet.chart.py
+++ b/collectors/python.d.plugin/puppet/puppet.chart.py
@@ -17,8 +17,7 @@ import socket
update_every = 5
priority = 60000
-# very long clojure-based service startup time
-retries = 180
+
MB = 1048576
CPU_SCALE = 1000
diff --git a/collectors/python.d.plugin/puppet/puppet.conf b/collectors/python.d.plugin/puppet/puppet.conf
index 991bfabedb..ff5c3d0205 100644
--- a/collectors/python.d.plugin/puppet/puppet.conf
+++ b/collectors/python.d.plugin/puppet/puppet.conf
@@ -27,11 +27,9 @@
# If unset, the default for python.d.plugin is used.
# priority: 60000
-# retries sets the number of retries to be made in case of failures.
-# If unset, the default for python.d.plugin is used.
-# Attempts to restore the service are made once every update_every
-# and only if the module has collected values in the past.
-# retries: 60
+# penalty indicates whether to apply penalty to update_every in case of failures.
+# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
+# penalty: yes
# autodetection_retry sets the job re-check interval in seconds.
# The job is not deleted if check fails.
@@ -58,7 +56,7 @@
# # JOBs sharing a name are mutually exclusive
# update_every: 1 # the JOB's data collection frequency
# priority: 60000 # the JOB's order on the dashboard
-# retries: 60 # the JOB's number of restoration attempts
+# penalty: yes # the JOB's penalty
# autodetection_retry: 0 # the JOB's re-check interval in seconds
#
# These configuration comes from UrlService base:
@@ -89,10 +87,8 @@
# tls_cert_file: /path/to/client.crt
# tls_key_file: /path/to/client.key
# autodetection_retry: 1
-# retries: 3600
#
# puppetserver:
# url: 'https://fqdn.example.com:8140'
# autodetection_retry: 1
-# retries: 3600
#