feat: re send metrics with error one by one PGPRO-4577

Author: alexander popov

mamonsu/lib/config.py

@@ -52,6 +52,7 @@ def __init__(self, cfg_file=None, plugin_directories=None):
         config.set('zabbix', 'client', socket.gethostname())
         config.set('zabbix', 'address', '127.0.0.1')
         config.set('zabbix', 'port', str(10051))
+        config.set('zabbix', 're_send', str(False))
 
         config.add_section('metric_log')
         config.set('metric_log', 'enabled', str(False))

mamonsu/lib/senders/zbx.py

@@ -27,6 +27,7 @@ def __init__(self, config):
         self.port = config.fetch('zabbix', 'port', int)
         self.max_queue_size = config.fetch('sender', 'queue', int)
         self.fqdn = config.fetch('zabbix', 'client')
+        self.re_send = config.fetch('zabbix', 're_send', bool)
         self.queue = Queue()
         self.log = logging.getLogger(
             'ZBX-{0}:{1}'.format(self.host, self.port))
@@ -55,13 +56,22 @@ def _flush(self):
         metrics = self.queue.flush()
         if len(metrics) == 0:
             return
+        clock = int(time.time())
         data = json.dumps({
             'request': 'sender data',
             'data': metrics,
-            'clock': int(time.time())
+            'clock': clock
         })
-        self._send_data(data)
-
+        sent_all = self._send_data(data)
+        if not sent_all and self.re_send:
+            for metric in metrics:
+                data = json.dumps({
+                    'request': 'sender data',
+                    'data': [metric],
+                    'clock': clock
+                })
+                self._send_data(data)
+                
     def send_file_to_zabbix(self, path):
         zabbix_client = self.config.fetch('zabbix', 'client')
         self.log.setLevel((self.config.fetch('log', 'level')).upper())
@@ -82,7 +92,8 @@ def send_file_to_zabbix(self, path):
                             metrics.append(metric)
                         else:
                             self.log.error(
-                                'Can\'t load metric in line: "{0}". The line must have the format: time <tab> value <tab> metric\'s name.'.format(
+                                'Can\'t load metric in line: "{0}". The line must have the format: '
+                                'time <tab> value <tab> metric\'s name.'.format(
                                     line.rstrip('\n')))
                     except Exception as e:
                         self.log.error('Can\'t load metric in line: "{0}". Error : {1} '.format(line.rstrip('\n'), e, ))
@@ -99,6 +110,7 @@ def send_file_to_zabbix(self, path):
                     break
 
     def _send_data(self, data):
+        sent_all = True
         data_len = struct.pack('<Q', len(data))
         packet = b'ZBXD\x01' + data_len + str.encode(data)
         try:
@@ -111,13 +123,15 @@ def _send_data(self, data):
             resp_body = self._receive(sock, resp_body_len)
             self.log.debug('response: {0}'.format(resp_body))
             if 'failed: 0' not in str(resp_body):
+                sent_all = False
                 self.log.error(
                     'On request:\n{0}\nget response'
                     ' with failed items:\n{1}'.format(
                         data,
                         resp_body))
         finally:
             sock.close()
+        return sent_all
 
     def _receive(self, sock, count):
         buf = str.encode('')

packaging/conf/example.conf

@@ -21,12 +21,14 @@ query_timeout = 10
 # the address field must point to the running Zabbix server, while the client field must provide the name of
 # the Zabbix host. You can find the list of hosts available for your account in the Zabbix web
 # interface under Configuration > Hosts.
+# re_send - True - in case of transmission error, mamonsu repeats sending metrics one by one to look in log metrics with error
 
 [zabbix]
 enabled = True
 client = localhost
 address = 127.0.0.1
 port = 10051
+re_send = False
 
 #########  General parameters sections  ############
 

packaging/conf/example_win32.conf

@@ -21,12 +21,14 @@ query_timeout = 10
 # the address field must point to the running Zabbix server, while the client field must provide the name of
 # the Zabbix host. You can find the list of hosts available for your account in the Zabbix web
 # interface under Configuration > Hosts.
+# re_send - True - in case of transmission error, mamonsu repeats sending metrics one by one to look in log metrics with error
 
 [zabbix]
 enabled = True
 client = localhost
 address = 127.0.0.1
 port = 10051
+re_send = False
 
 #########  General parameters sections  ############