New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg

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

1 files changed, 37 insertions, 40 deletions

diff --git a/python.d/bind_rndc.chart.py b/collectors/python.d.plugin/bind_rndc/bind_rndc.chart.py
index cc96659b2..423232f65 100644
--- a/python.d/bind_rndc.chart.py
+++ b/collectors/python.d.plugin/bind_rndc/bind_rndc.chart.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: bind rndc netdata python.d module
 # Author: l2isbad
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 
@@ -35,56 +36,50 @@ CHARTS = {
             ['nms_dropped_queries', 'dropped_queries', 'incremental'],
         ]},
     'incoming_queries': {
-        'options': [None, 'Incoming Queries', 'queries', 'incoming queries',
-                    'bind_rndc.incoming_queries', 'line'],
+        'options': [None, 'Incoming Queries', 'queries', 'incoming queries', 'bind_rndc.incoming_queries', 'line'],
         'lines': [
         ]},
     'outgoing_queries': {
-        'options': [None, 'Outgoing Queries', 'queries', 'outgoing queries',
-                    'bind_rndc.outgoing_queries', 'line'],
+        'options': [None, 'Outgoing Queries', 'queries', 'outgoing queries', 'bind_rndc.outgoing_queries', 'line'],
         'lines': [
         ]},
     'named_stats_size': {
-        'options': [None, 'Named Stats File Size', 'MB', 'file size',
-                    'bind_rndc.stats_size', 'line'],
+        'options': [None, 'Named Stats File Size', 'MB', 'file size', 'bind_rndc.stats_size', 'line'],
         'lines': [
             ['stats_size', None, 'absolute', 1, 1 << 20]
-        ]}
+        ]
+    }
 }
 
 NMS = {
-    'nms_requests':
-        ['IPv4 requests received',
-         'IPv6 requests received',
-         'TCP requests received',
-         'requests with EDNS(0) receive'],
-    'nms_responses':
-        ['responses sent',
-         'truncated responses sent',
-         'responses with EDNS(0) sent',
-         'requests with unsupported EDNS version received'],
-    'nms_failure':
-        ['other query failures',
-         'queries resulted in SERVFAIL'],
-    'nms_auth_answer':
-        ['queries resulted in authoritative answer'],
-    'nms_non_auth_answer':
-        ['queries resulted in non authoritative answer'],
-    'nms_nxrrset':
-        ['queries resulted in nxrrset'],
-    'nms_success':
-        ['queries resulted in successful answer'],
-    'nms_nxdomain':
-        ['queries resulted in NXDOMAIN'],
-    'nms_recursion':
-        ['queries caused recursion'],
-    'nms_duplicate':
-        ['duplicate queries received'],
-    'nms_rejected_queries':
-        ['auth queries rejected',
-         'recursive queries rejected'],
-    'nms_dropped_queries':
-        ['queries dropped']
+    'nms_requests': [
+        'IPv4 requests received',
+        'IPv6 requests received',
+        'TCP requests received',
+        'requests with EDNS(0) receive'
+    ],
+    'nms_responses': [
+        'responses sent',
+        'truncated responses sent',
+        'responses with EDNS(0) sent',
+        'requests with unsupported EDNS version received'
+    ],
+    'nms_failure': [
+        'other query failures',
+        'queries resulted in SERVFAIL'
+    ],
+    'nms_auth_answer': ['queries resulted in authoritative answer'],
+    'nms_non_auth_answer': ['queries resulted in non authoritative answer'],
+    'nms_nxrrset': ['queries resulted in nxrrset'],
+    'nms_success': ['queries resulted in successful answer'],
+    'nms_nxdomain': ['queries resulted in NXDOMAIN'],
+    'nms_recursion': ['queries caused recursion'],
+    'nms_duplicate': ['duplicate queries received'],
+    'nms_rejected_queries': [
+        'auth queries rejected',
+        'recursive queries rejected'
+    ],
+    'nms_dropped_queries': ['queries dropped']
 }
 
 STATS = ['Name Server Statistics', 'Incoming Queries', 'Outgoing Queries']
@@ -215,7 +210,9 @@ def parse_stats(field, named_stats):
                 if '[' in line:
                     continue
                 v, k = line.strip().split(' ', 1)
-                data[k] = int(v)
+                if k not in data:
+                    data[k] = 0
+                data[k] += int(v)
                 continue
             break
         break