From 5286dae8ebb09d2c9699cd38e8850c5481f3d742 Mon Sep 17 00:00:00 2001
From: Ilya Mashchenko <ilyamaschenko@gmail.com>
Date: Fri, 7 Dec 2018 12:15:03 +0300
Subject: 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
---
 collectors/python.d.plugin/samba/samba.chart.py |  1 -
 collectors/python.d.plugin/samba/samba.conf     | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'collectors/python.d.plugin/samba')

diff --git a/collectors/python.d.plugin/samba/samba.chart.py b/collectors/python.d.plugin/samba/samba.chart.py
index b2278de9ef..e43f6048b4 100644
--- a/collectors/python.d.plugin/samba/samba.chart.py
+++ b/collectors/python.d.plugin/samba/samba.chart.py
@@ -27,7 +27,6 @@ disabled_by_default = True
 # default module values (can be overridden per job in `config`)
 update_every = 5
 priority = 60000
-retries = 60
 
 ORDER = [
     'syscall_rw',
diff --git a/collectors/python.d.plugin/samba/samba.conf b/collectors/python.d.plugin/samba/samba.conf
index ee513c60f9..db15d4e9ec 100644
--- a/collectors/python.d.plugin/samba/samba.conf
+++ b/collectors/python.d.plugin/samba/samba.conf
@@ -27,11 +27,9 @@ update_every: 5
 # 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,5 +56,5 @@ update_every: 5
 #                             # 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
\ No newline at end of file
-- 
cgit v1.2.3