Merge branch 'feature/dymanic_host' into 'master'

Dynamic host implemented

See merge request opensolutions/elastalert!21

elastalert/zabbix.py

@@ -16,10 +16,10 @@ def find_value(source, path):
         else:
             return find_value(source[current_path], path)
     else:
-        return 'Field not found'
+        return None
 
 
-def get_extra_fields(match, fields):
+def get_fields(match, fields):
     extra_fields = {}
     for field in fields:
         extra_fields[field] = find_value(match, field.split('.'))
@@ -100,13 +100,21 @@ def __init__(self, *args):
 
     # Alert is called
     def alert(self, matches):
+        zbx_host = self.zbx_host.strip()
 
         # Matches is a list of match dictionaries.
         # It contains more than one match when the alert has
         # the aggregation option set
         zm = []
         ts_epoch = None
         for match in matches:
+            if zbx_host.startswith('{{') and zbx_host.endswith('}}'):
+                host_field = zbx_host[2:-2].strip()
+                zbx_host = find_value(match, host_field.split('.'))
+                if not zbx_host:
+                    elastalert_logger.error(f"Missing host field '%s' for dynamic host, alert will be discarded"
+                                            % host_field)
+                    return
             if ':' not in match[self.timestamp_field] or '-' not in match[self.timestamp_field]:
                 ts_epoch = int(match[self.timestamp_field])
             else:
@@ -116,16 +124,16 @@ def alert(self, matches):
                 except ValueError:
                     ts_epoch = int(datetime.strptime(match[self.timestamp_field], '%Y-%m-%dT%H:%M:%SZ')
                                    .strftime('%s'))
-            zm.append(ZabbixMetric(host=self.zbx_host, key=self.zbx_key, value='1', clock=ts_epoch))
+            zm.append(ZabbixMetric(host=zbx_host, key=self.zbx_key, value='1', clock=ts_epoch))
 
         try:
             if self.extra_data:
                 extra_data = []
 
                 for match in matches:
                     for related_event in match.get('related_events', []):
-                        extra_data.append(get_extra_fields(related_event, self.extra_data['fields']))
-                    extra_data.append(get_extra_fields(match, self.extra_data['fields']))
+                        extra_data.append(get_fields(related_event, self.extra_data['fields']))
+                    extra_data.append(get_fields(match, self.extra_data['fields']))
 
                 data = {
                     'template': self.extra_data['template'],
@@ -136,21 +144,21 @@ def alert(self, matches):
                                                                      data=json.dumps(data, indent=2))
 
                 if object_name:
-                    zm.append(ZabbixMetric(host=self.zbx_host,
+                    zm.append(ZabbixMetric(host=zbx_host,
                                            key=self.zbx_key_minio_data,
                                            value=object_name,
                                            clock=ts_epoch - 1))
                 else:
                     elastalert_logger.warning("Data couldn't be uploaded to MinIO, it won't be provided with the alert")
-                    zm.append(ZabbixMetric(host=self.zbx_host,
+                    zm.append(ZabbixMetric(host=zbx_host,
                                            key=self.zbx_key_minio_data,
                                            value='MinIO data upload failed',
                                            clock=ts_epoch - 1))
 
             response = ZabbixSender(zabbix_server=self.zbx_sender_host, zabbix_port=self.zbx_sender_port).send(zm)
             if response.failed:
                 elastalert_logger.warning("Missing zabbix host '%s' or host's item '%s', alert will be discarded"
-                                          % (self.zbx_host, self.zbx_key))
+                                          % (zbx_host, self.zbx_key))
             else:
                 elastalert_logger.info("Alert sent to Zabbix")
         except Exception as e: