Adding upstream version 1.12.0.upstream/1.12.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 8 insertions, 11 deletions

diff --git a/collectors/python.d.plugin/samba/README.md b/collectors/python.d.plugin/samba/README.md
index 44610d373..97f2e3d33 100644
--- a/collectors/python.d.plugin/samba/README.md
+++ b/collectors/python.d.plugin/samba/README.md
@@ -65,3 +65,5 @@ samba: yes
 ```
 
 ---
+
+[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fpython.d.plugin%2Fsamba%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/samba/samba.chart.py b/collectors/python.d.plugin/samba/samba.chart.py
index b2278de9e..ac89c29b0 100644
--- a/collectors/python.d.plugin/samba/samba.chart.py
+++ b/collectors/python.d.plugin/samba/samba.chart.py
@@ -24,10 +24,7 @@ from bases.FrameworkServices.ExecutableService import ExecutableService
 
 disabled_by_default = True
 
-# default module values (can be overridden per job in `config`)
 update_every = 5
-priority = 60000
-retries = 60
 
 ORDER = [
     'syscall_rw',
@@ -41,14 +38,14 @@ ORDER = [
 
 CHARTS = {
     'syscall_rw': {
-        'options': [None, 'R/Ws', 'kilobytes/s', 'syscall', 'syscall.rw', 'area'],
+        'options': [None, 'R/Ws', 'KiB/s', 'syscall', 'syscall.rw', 'area'],
         'lines': [
             ['syscall_sendfile_bytes', 'sendfile', 'incremental', 1, 1024],
             ['syscall_recvfile_bytes', 'recvfile', 'incremental', -1, 1024]
         ]
     },
     'smb2_rw': {
-        'options': [None, 'R/Ws', 'kilobytes/s', 'smb2', 'smb2.rw', 'area'],
+        'options': [None, 'R/Ws', 'KiB/s', 'smb2', 'smb2.rw', 'area'],
         'lines': [
             ['smb2_read_outbytes', 'readout', 'incremental', 1, 1024],
             ['smb2_write_inbytes', 'writein', 'incremental', -1, 1024],
diff --git a/collectors/python.d.plugin/samba/samba.conf b/collectors/python.d.plugin/samba/samba.conf
index ee513c60f..db15d4e9e 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