elastalert2 2.26.0__tar.gz → 2.28.0__tar.gz

{elastalert2-2.26.0/elastalert2.egg-info → elastalert2-2.28.0}/PKG-INFO

@@ -1,43 +1,45 @@
 Metadata-Version: 2.4
 Name: elastalert2
-Version: 2.26.0
+Version: 2.28.0
 Summary: Automated rule-based alerting for Elasticsearch
 Home-page: https://github.com/jertel/elastalert2
 License: Apache 2.0
 Project-URL: Documentation, https://elastalert2.readthedocs.io
 Project-URL: Source Code, https://github.com/jertel/elastalert2
 Project-URL: Discussion Forum, https://github.com/jertel/elastalert2/discussions
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apscheduler<4.0,>=3.10.4
+Requires-Dist: apscheduler<4.0,>=3.11.0
 Requires-Dist: aws-requests-auth>=0.4.3
-Requires-Dist: boto3>=1.34.54
-Requires-Dist: cffi>=1.16.0
-Requires-Dist: croniter>=2.0.2
+Requires-Dist: boto3>=1.40.59
+Requires-Dist: cffi>=2.0.0
+Requires-Dist: croniter>=6.0.0
 Requires-Dist: elasticsearch==7.10.1
 Requires-Dist: envparse>=0.2.0
 Requires-Dist: exotel==0.1.5
-Requires-Dist: Jinja2>=3.1.3
-Requires-Dist: jira>=3.6.0
-Requires-Dist: jsonpointer>=2.4
-Requires-Dist: jsonschema>=4.21.1
-Requires-Dist: prettytable>=3.10.0
+Requires-Dist: Jinja2>=3.1.6
+Requires-Dist: jira>=3.10.5
+Requires-Dist: jsonpointer>=3.0.0
+Requires-Dist: jsonschema>=4.25.1
+Requires-Dist: prettytable>=3.16.0
 Requires-Dist: prison>=0.2.1
-Requires-Dist: prometheus_client>=0.20.0
+Requires-Dist: prometheus_client>=0.23.1
 Requires-Dist: python-dateutil>=2.9.0.post0
-Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: py-zabbix>=1.1.7
+Requires-Dist: PyYAML>=6.0.3
+Requires-Dist: zabbix-utils>=2.0.3
 Requires-Dist: requests>=2.31.0
 Requires-Dist: sortedcontainers>=2.4.0
 Requires-Dist: statsd-tags==3.2.1.post1
-Requires-Dist: stomp.py>=8.1.0
-Requires-Dist: tencentcloud-sdk-python>=3.0.1098
+Requires-Dist: stomp.py>=8.2.0
+Requires-Dist: tencentcloud-sdk-python>=3.0.1479
 Requires-Dist: texttable>=1.7.0
-Requires-Dist: twilio>=8.13.0
+Requires-Dist: twilio>=9.8.4
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/alerters/chatwork.py

@@ -29,17 +29,24 @@ class ChatworkAlerter(Alerter):
                 body += '\n----------------------------------------\n'
         if len(body) > 2047:
             body = body[0:1950] + '\n *message was cropped according to chatwork embed description limits!*'
-        headers = {'X-ChatWorkToken': self.chatwork_apikey}
+        headers = {
+            'accept': 'application/json',
+            'content-type': 'application/x-www-form-urlencoded',
+            'x-chatworktoken': self.chatwork_apikey
+        }
         # set https proxy, if it was provided
         proxies = {'https': self.chatwork_proxy} if self.chatwork_proxy else None
         auth = HTTPProxyAuth(self.chatwork_proxy_login, self.chatwork_proxy_pass) if self.chatwork_proxy_login else None
-        params = {'body': body}
+        payload = {
+            'self_unread': 0,
+            'body': body
+        }
 
         try:
-            response = requests.post(self.url, params=params, headers=headers, proxies=proxies, auth=auth)
+            response = requests.post(self.url, data=payload, headers=headers, proxies=proxies, auth=auth)
             response.raise_for_status()
         except RequestException as e:
-            raise EAException("Error posting to Chattwork: %s. Details: %s" % (e, "" if e.response is None else e.response.text))
+            raise EAException("Error posting to Chatwork: %s. Details: %s" % (e, "" if e.response is None else e.response.text))
 
         elastalert_logger.info(
             "Alert sent to Chatwork room %s" % self.chatwork_room_id)

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/alerters/jira.py

@@ -262,14 +262,26 @@ class JiraAlerter(Alerter):
         if self.bump_not_in_statuses:
             jql = '%s and status not in (%s)' % (jql, ','.join(["\"%s\"" % status if ' ' in status else status
                                                                 for status in self.bump_not_in_statuses]))
+
+        # Force use of enhanced_search_issues (new API)
+        # This method should be available in updated jira library versions
+        if not hasattr(self.client, 'enhanced_search_issues'):
+            raise EAException("enhanced_search_issues method not available. Please update your jira library to a version that supports the new Jira API endpoints.")
+        
         try:
-            issues = self.client.search_issues(jql)
+            issues = self.client.enhanced_search_issues(jql)
+                
+            # Ensure issues is a list-like object before checking length
+            if issues and len(issues):
+                return issues[0]
         except JIRAError as e:
             elastalert_logger.exception("Error while searching for Jira ticket using jql '%s': %s" % (jql, e))
             return None
+        except Exception as e:
+            elastalert_logger.exception("Unexpected error while searching for Jira ticket: %s" % e)
+            return None
 
-        if len(issues):
-            return issues[0]
+        return None
 
     def comment_on_ticket(self, ticket, match):
         text = str(JiraFormattedMatchString(self.rule, match))

elastalert2-2.28.0/elastalert/alerters/line.py

@@ -0,0 +1,61 @@
+import requests
+from requests import RequestException
+import json
+
+from elastalert.alerts import Alerter, BasicMatchString
+from elastalert.util import EAException, elastalert_logger
+
+
+class LineMessageAPIAlerter(Alerter):
+    """Creates a LINE Messaging API for each alert"""
+    required_option = frozenset(['line_channel_access_token', 'line_to'])
+
+    def __init__(self, rule):
+        super(LineMessageAPIAlerter, self).__init__(rule)
+
+        self.line_channel_access_token = self.rule.get('line_channel_access_token')
+        self.line_to = self.rule.get('line_to')
+
+    def alert(self, matches):
+        body = ''
+        for match in matches:
+            body += str(BasicMatchString(self.rule, match))
+            if len(matches) > 1:
+                body += '\n----------------------------------------\n'
+
+        if len(body) > 4800:
+            body = body[:4700] + '\n\n(message cropped due to LINE limit)'
+
+        headers = {
+            'Content-Type': 'application/json',
+            'Authorization': 'Bearer {}'.format(self.line_channel_access_token)
+        }
+
+        payload = {
+            'to': self.line_to,
+            'messages': [
+                {
+                    'type': 'text',
+                    'text': body
+                }
+            ]
+        }
+
+        try:
+            response = requests.post(
+                'https://api.line.me/v2/bot/message/push',
+                headers=headers,
+                data=json.dumps(payload)
+            )
+            response.raise_for_status()
+        except RequestException as e:
+            raise EAException('Error posting to LINE Messaging API: %s' % e)
+
+        elastalert_logger.info('Alert sent to LINE Messaging API')
+
+    def get_info(self):
+        return {
+            'type': 'line',
+            'line_to': self.line_to,
+            'line_channel_access_token': self.line_channel_access_token
+        }

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/alerters/zabbix.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from pyzabbix import ZabbixSender, ZabbixMetric, ZabbixAPI
+from zabbix_utils import Sender, ItemValue, ZabbixAPI
 
 from elastalert.alerts import Alerter
 from elastalert.util import elastalert_logger, lookup_es_key, EAException
@@ -23,20 +23,20 @@ class ZabbixClient(ZabbixAPI):
                                            password=password)
 
     def send_metric(self, hostname, key, data):
-        zm = ZabbixMetric(hostname, key, data)
+        zm = ItemValue(hostname, key, data)
         if self.send_aggregated_metrics:
             self.aggregated_metrics.append(zm)
             if len(self.aggregated_metrics) > self.metrics_chunk_size:
                 elastalert_logger.info("Sending: %s metrics" % (len(self.aggregated_metrics)))
                 try:
-                    ZabbixSender(zabbix_server=self.sender_host, zabbix_port=self.sender_port) \
+                    Sender(server=self.sender_host, port=self.sender_port) \
                         .send(self.aggregated_metrics)
                     self.aggregated_metrics = []
                 except Exception as e:
                     elastalert_logger.exception(e)
         else:
             try:
-                ZabbixSender(zabbix_server=self.sender_host, zabbix_port=self.sender_port).send([zm])
+                Sender(server=self.sender_host, port=self.sender_port).send([zm])
             except Exception as e:
                 elastalert_logger.exception(e)
 
@@ -81,10 +81,10 @@ class ZabbixAlerter(Alerter):
                 zbx_host = lookup_es_key(match, self.rule["zbx_host"])
             else:
                 zbx_host = self.zbx_host
-            zm.append(ZabbixMetric(host=zbx_host, key=self.zbx_key, value='1', clock=ts_epoch))
+            zm.append(ItemValue(host=zbx_host, key=self.zbx_key, value='1', clock=ts_epoch))
 
         try:
-            response = ZabbixSender(zabbix_server=self.zbx_sender_host, zabbix_port=self.zbx_sender_port).send(zm)
+            response = Sender(server=self.zbx_sender_host, port=self.zbx_sender_port).send(zm)
             if response.failed:
                 if self.zbx_host_from_field and not zbx_host:
                     elastalert_logger.warning("Missing term '%s' or host's item '%s', alert will be discarded"

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/elastalert.py

@@ -926,7 +926,14 @@ class ElastAlerter(object):
             if query_key_value is not None:
                 silence_cache_key += '.' + query_key_value
 
-            if self.is_silenced(rule['name'] + "._silence") or self.is_silenced(silence_cache_key):
+            # Check cache first to reduce unnecessary ES queries
+            # Effectively, this checks query key cache first. Then checks rule cache. Then checks the rule via ES.
+            # Followed by a second (duplicated) query key cache check, and then finally a query key check via ES. 
+            # It could be further improved to eliminate the second query key cache check but this implementation
+            # favors both cache checks up front, before any ES hit, which is an overall performance improvement
+            # compared to the original logic, which required a rule check via ES before checking the query key cache.
+            if self.is_silenced(silence_cache_key, check_cache_only=True) or \
+               self.is_silenced(rule['name'] + "._silence") or self.is_silenced(silence_cache_key):
                 elastalert_logger.info('Ignoring match for silenced rule %s' % (silence_cache_key,))
                 continue
 
@@ -1785,13 +1792,13 @@ class ElastAlerter(object):
         self.silence_cache[silence_cache_key] = (timestamp, exponent)
         return self.writeback('silence', body)
 
-    def is_silenced(self, rule_name):
+    def is_silenced(self, rule_name, check_cache_only=False):
         """ Checks if rule_name is currently silenced. Returns false on exception. """
         if rule_name in self.silence_cache:
             if ts_now() < self.silence_cache[rule_name][0]:
                 return True
 
-        if self.debug:
+        if self.debug or check_cache_only:
             return False
         query = {'term': {'rule_name': rule_name}}
         sort = {'sort': {'until': {'order': 'desc'}}}

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/loaders.py

@@ -11,7 +11,6 @@ import yaml.scanner
 from elastalert.alerters.flashduty import FlashdutyAlerter
 from jinja2 import Environment
 from jinja2 import FileSystemLoader
-from jinja2 import Template
 
 import elastalert.alerters.alerta
 import elastalert.alerters.chatwork
@@ -28,6 +27,7 @@ import elastalert.alerters.httppost
 import elastalert.alerters.httppost2
 import elastalert.alerters.iris
 import elastalert.alerters.lark
+import elastalert.alerters.line
 import elastalert.alerters.pagertree
 import elastalert.alerters.rocketchat
 import elastalert.alerters.servicenow
@@ -136,6 +136,7 @@ class RulesLoader(object):
         'discord': elastalert.alerters.discord.DiscordAlerter,
         'dingtalk': elastalert.alerters.dingtalk.DingTalkAlerter,
         'lark': elastalert.alerters.lark.LarkAlerter,
+        'line': elastalert.alerters.line.LineMessageAPIAlerter,
         'webex_webhook': elastalert.alerters.webex_webhook.WebexWebhookAlerter,
         'workwechat': elastalert.alerters.workwechat.WorkWechatAlerter,
         'chatwork': elastalert.alerters.chatwork.ChatworkAlerter,
@@ -161,6 +162,7 @@ class RulesLoader(object):
     base_config = {}
 
     jinja_environment = Environment(loader=FileSystemLoader(""))
+    jinja_filters = []
 
     def __init__(self, conf):
         self.rule_schema = load_rule_schema()
@@ -479,13 +481,38 @@ class RulesLoader(object):
 
         self.load_jinja_template(rule)
 
+    def load_jinja_filters(self, filters = []):
+        """ Load custom Jinja2 filters into the Environment
+        :param list filters: List of filter paths to load, format should be path to a module, ie 'jinja2.filters.MyFilterClass'
+        """
+        for module_path in filters:
+   
+            filter_class = get_module(module_path)
+            for method in dir(filter_class):
+                if not method.startswith('filter_'):
+                    continue
+                filter_func = getattr(filter_class, method)
+                filter_name = method.removeprefix('filter_')
+
+                # Skip if filter already loaded
+                if filter_name in self.jinja_filters:
+                    continue
+
+                self.jinja_environment.filters[filter_name] = filter_func
+                self.jinja_filters.append(filter_name)
+                elastalert_logger.debug('Loaded custom Jinja2 filter: %s.%s', module_path, filter_name)
+
     def load_jinja_template(self, rule):
         if rule.get('alert_text_type') == 'alert_text_jinja':
             jinja_template_path = rule.get('jinja_template_path')
+
+            if rule.get('jinja_filters'):
+                self.load_jinja_filters(rule.get('jinja_filters'))
+
             if jinja_template_path:
                 rule["jinja_template"] = self.jinja_environment.get_or_select_template(jinja_template_path)
             else:
-                rule["jinja_template"] = Template(str(rule.get('alert_text', '')))
+                rule["jinja_template"] = self.jinja_environment.from_string(str(rule.get('alert_text', '')))
 
     def load_modules(self, rule, args=None):
         """ Loads things that could be modules. Enhancements, alerts and rule type. """

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/opensearch_external_url_formatter.py

@@ -1,13 +1,4 @@
-import boto3
-import os
-from urllib.parse import parse_qsl, urlencode, urljoin, urlparse, urlsplit, urlunsplit
-
-import requests
-from requests import RequestException
-from requests.auth import AuthBase, HTTPBasicAuth
-
-from elastalert.auth import RefeshableAWSRequestsAuth
-from elastalert.util import EAException
+from urllib.parse import urljoin
 
 class OpensearchExternalUrlFormatter:
     '''Interface for formatting external Opensearch urls'''

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/prometheus_wrapper.py

@@ -29,10 +29,12 @@ class PrometheusWrapper:
 
     def metrics_run_rule(self, rule, endtime, starttime=None):
         """ Increment counter every time rule is run """
+        result = None
         try:
             self.prom_scrapes.labels(rule['name']).inc()
         finally:
-            return self.run_rule(rule, endtime, starttime)
+            result = self.run_rule(rule, endtime, starttime)
+        return result
 
     def metrics_writeback(self, doc_type, body, rule=None, match_body=None):
         """ Update various prometheus metrics accoording to the doc_type """
@@ -53,4 +55,5 @@ class PrometheusWrapper:
             elif doc_type == 'silence':
                 self.prom_alerts_silenced.labels(body['rule_name']).inc()
         finally:
-            return res
+            pass
+        return res

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/ruletypes.py

@@ -1030,8 +1030,22 @@ class BaseAggregationRule(RuleType):
                 if total_seconds(self.rules['buffer_time']) % total_seconds(self.rules['bucket_interval_timedelta']) != 0:
                     raise EAException("Buffer_time must be evenly divisible by bucket_interval if specified")
 
+    allowed_percent_aggregations = frozenset(['percentiles'])
+
     def generate_aggregation_query(self):
-        raise NotImplementedError()
+        if self.rules.get('metric_agg_script'):
+            agg_data = self.rules['metric_agg_script']
+            if isinstance(agg_data, dict):
+                agg_data = agg_data.copy()
+            else:
+                agg_data = {'script': agg_data}
+            query = {self.metric_key: {self.rules['metric_agg_type']: agg_data}}
+        else:
+            query = {self.metric_key: {self.rules['metric_agg_type']: {'field': self.rules['metric_agg_key']}}}
+        if self.rules['metric_agg_type'] in self.allowed_percent_aggregations:
+            if 'percents' not in query[self.metric_key][self.rules['metric_agg_type']]:
+                query[self.metric_key][self.rules['metric_agg_type']]['percents'] = [self.rules['percentile_range']]
+        return query
 
     def add_aggregation_data(self, payload):
         for timestamp, payload_data in payload.items():
@@ -1072,8 +1086,9 @@ class MetricAggregationRule(BaseAggregationRule):
 
         self.metric_key = 'metric_' + self.rules['metric_agg_key'] + '_' + self.rules['metric_agg_type']
 
-        if not self.rules['metric_agg_type'] in self.allowed_aggregations.union(self.allowed_percent_aggregations):
-            raise EAException("metric_agg_type must be one of %s" % (str(self.allowed_aggregations)))
+        all_allowed_aggregations = self.allowed_aggregations.union(self.allowed_percent_aggregations)
+        if not self.rules['metric_agg_type'] in all_allowed_aggregations:
+            raise EAException("metric_agg_type must be one of %s" % (str(all_allowed_aggregations)))
         if self.rules['metric_agg_type'] in self.allowed_percent_aggregations and self.rules['percentile_range'] is None:
             raise EAException("percentile_range must be specified for percentiles aggregation")
 
@@ -1090,13 +1105,7 @@ class MetricAggregationRule(BaseAggregationRule):
         )
         return message
 
-    def generate_aggregation_query(self):
-        if self.rules.get('metric_agg_script'):
-            return {self.metric_key: {self.rules['metric_agg_type']: self.rules['metric_agg_script']}}
-        query = {self.metric_key: {self.rules['metric_agg_type']: {'field': self.rules['metric_agg_key']}}}
-        if self.rules['metric_agg_type'] in self.allowed_percent_aggregations:
-            query[self.metric_key][self.rules['metric_agg_type']]['percents'] = [self.rules['percentile_range']]
-        return query
+
 
     def check_matches(self, timestamp, query_key, aggregation_data):
         if "compound_query_key" in self.rules:
@@ -1137,7 +1146,10 @@ class MetricAggregationRule(BaseAggregationRule):
             if 'interval_aggs' in aggregation_data:
                 metric_val_arr = [term[self.metric_key]['value'] for term in aggregation_data['interval_aggs']['buckets']]
             else:
-                metric_val_arr = [aggregation_data[self.metric_key]['value']]
+                if self.rules['metric_agg_type'] in self.allowed_percent_aggregations:
+                    metric_val_arr = list(aggregation_data[self.metric_key]['values'].values())
+                else:
+                    metric_val_arr = [aggregation_data[self.metric_key]['value']]
             for metric_val in metric_val_arr:
                 if self.crossed_thresholds(metric_val):
                     match_data[self.rules['timestamp_field']] = timestamp
@@ -1186,14 +1198,7 @@ class SpikeMetricAggregationRule(BaseAggregationRule, SpikeRule):
 
         self.rules['aggregation_query_element'] = self.generate_aggregation_query()
 
-    def generate_aggregation_query(self):
-        """Lifted from MetricAggregationRule"""
-        if self.rules.get('metric_agg_script'):
-            return {self.metric_key: {self.rules['metric_agg_type']: self.rules['metric_agg_script']}}
-        query = {self.metric_key: {self.rules['metric_agg_type']: {'field': self.rules['metric_agg_key']}}}
-        if self.rules['metric_agg_type'] in self.allowed_percent_aggregations:
-            query[self.metric_key][self.rules['metric_agg_type']]['percents'] = [self.rules['percentile_range']]
-        return query
+
 
     def add_aggregation_data(self, payload):
         """

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert/schema.yaml

@@ -184,6 +184,7 @@ oneOf:
       threshold_cur: {type: number}
       min_doc_count: {type: integer}
       percentile_range: {type: integer}
+      metric_agg_script: {type: [string, object]}
 
   - title: Flatline
     required: [threshold, timeframe]
@@ -231,6 +232,7 @@ oneOf:
       bucket_interval: *timeframe
       sync_bucket_interval: {type: boolean}
       metric_format_string: {type: string}
+      metric_agg_script: {type: [string, object]}
 
   - title: Percentage Match
     required: [match_bucket_filter]
@@ -307,6 +309,7 @@ properties:
   use_local_time: {type: boolean}
   custom_pretty_ts_format: {type: string}
   match_enhancements: {type: array, items: {type: string}}
+  jinja_filters: {type: array, items: {type: string}}
   query_key: *arrayOfString
   replace_dots_in_field_names: {type: boolean}
   scan_entire_timeframe: {type: boolean}
@@ -659,6 +662,10 @@ properties:
   lark_bot_id: { type: string }
   lark_msgtype: { type: string, enum: [ 'text' ] }
 
+  ### LINE Messaging API
+  line_channel_access_token: {type: string}
+  line_to: {type: string}
+
   ### Matrix Hookshot
   matrixhookshot_ca_certs: {type: [boolean, string]}
   matrixhookshot_webhook_url: *arrayOfString

{elastalert2-2.26.0 → elastalert2-2.28.0/elastalert2.egg-info}/PKG-INFO

@@ -1,43 +1,45 @@
 Metadata-Version: 2.4
 Name: elastalert2
-Version: 2.26.0
+Version: 2.28.0
 Summary: Automated rule-based alerting for Elasticsearch
 Home-page: https://github.com/jertel/elastalert2
 License: Apache 2.0
 Project-URL: Documentation, https://elastalert2.readthedocs.io
 Project-URL: Source Code, https://github.com/jertel/elastalert2
 Project-URL: Discussion Forum, https://github.com/jertel/elastalert2/discussions
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: apscheduler<4.0,>=3.10.4
+Requires-Dist: apscheduler<4.0,>=3.11.0
 Requires-Dist: aws-requests-auth>=0.4.3
-Requires-Dist: boto3>=1.34.54
-Requires-Dist: cffi>=1.16.0
-Requires-Dist: croniter>=2.0.2
+Requires-Dist: boto3>=1.40.59
+Requires-Dist: cffi>=2.0.0
+Requires-Dist: croniter>=6.0.0
 Requires-Dist: elasticsearch==7.10.1
 Requires-Dist: envparse>=0.2.0
 Requires-Dist: exotel==0.1.5
-Requires-Dist: Jinja2>=3.1.3
-Requires-Dist: jira>=3.6.0
-Requires-Dist: jsonpointer>=2.4
-Requires-Dist: jsonschema>=4.21.1
-Requires-Dist: prettytable>=3.10.0
+Requires-Dist: Jinja2>=3.1.6
+Requires-Dist: jira>=3.10.5
+Requires-Dist: jsonpointer>=3.0.0
+Requires-Dist: jsonschema>=4.25.1
+Requires-Dist: prettytable>=3.16.0
 Requires-Dist: prison>=0.2.1
-Requires-Dist: prometheus_client>=0.20.0
+Requires-Dist: prometheus_client>=0.23.1
 Requires-Dist: python-dateutil>=2.9.0.post0
-Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: py-zabbix>=1.1.7
+Requires-Dist: PyYAML>=6.0.3
+Requires-Dist: zabbix-utils>=2.0.3
 Requires-Dist: requests>=2.31.0
 Requires-Dist: sortedcontainers>=2.4.0
 Requires-Dist: statsd-tags==3.2.1.post1
-Requires-Dist: stomp.py>=8.1.0
-Requires-Dist: tencentcloud-sdk-python>=3.0.1098
+Requires-Dist: stomp.py>=8.2.0
+Requires-Dist: tencentcloud-sdk-python>=3.0.1479
 Requires-Dist: texttable>=1.7.0
-Requires-Dist: twilio>=8.13.0
+Requires-Dist: twilio>=9.8.4
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type

{elastalert2-2.26.0 → elastalert2-2.28.0}/elastalert2.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ elastalert/alerters/indexer.py
 elastalert/alerters/iris.py
 elastalert/alerters/jira.py
 elastalert/alerters/lark.py
+elastalert/alerters/line.py
 elastalert/alerters/matrixhookshot.py
 elastalert/alerters/mattermost.py
 elastalert/alerters/opsgenie.py
@@ -102,6 +103,7 @@ tests/alerters/indexer_test.py
 tests/alerters/iris_test.py
 tests/alerters/jira_test.py
 tests/alerters/lark_test.py
+tests/alerters/line_test.py
 tests/alerters/matrixhookshot_test.py
 tests/alerters/mattermost_test.py
 tests/alerters/opsgenie_test.py

elastalert2-2.28.0/elastalert2.egg-info/requires.txt

@@ -0,0 +1,25 @@
+apscheduler<4.0,>=3.11.0
+aws-requests-auth>=0.4.3
+boto3>=1.40.59
+cffi>=2.0.0
+croniter>=6.0.0
+elasticsearch==7.10.1
+envparse>=0.2.0
+exotel==0.1.5
+Jinja2>=3.1.6
+jira>=3.10.5
+jsonpointer>=3.0.0
+jsonschema>=4.25.1
+prettytable>=3.16.0
+prison>=0.2.1
+prometheus_client>=0.23.1
+python-dateutil>=2.9.0.post0
+PyYAML>=6.0.3
+zabbix-utils>=2.0.3
+requests>=2.31.0
+sortedcontainers>=2.4.0
+statsd-tags==3.2.1.post1
+stomp.py>=8.2.0
+tencentcloud-sdk-python>=3.0.1479
+texttable>=1.7.0
+twilio>=9.8.4

{elastalert2-2.26.0 → elastalert2-2.28.0}/setup.py

@@ -8,7 +8,7 @@ from setuptools import setup
 base_dir = os.path.dirname(__file__)
 setup(
     name='elastalert2',
-    version='2.26.0',
+    version='2.28.0',
     description='Automated rule-based alerting for Elasticsearch',
     long_description=open('README.md').read(),
     long_description_content_type="text/markdown",
@@ -21,7 +21,9 @@ setup(
         "Discussion Forum": "https://github.com/jertel/elastalert2/discussions",
     },
     classifiers=[
+        'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
     ],
@@ -33,30 +35,30 @@ setup(
     package_data={'elastalert': ['schema.yaml', 'es_mappings/**/*.json']},
     python_requires='>=3.12',
     install_requires=[
-        'apscheduler>=3.10.4,<4.0',
+        'apscheduler>=3.11.0,<4.0',
         'aws-requests-auth>=0.4.3',
-        'boto3>=1.34.54',
-        'cffi>=1.16.0',
-        'croniter>=2.0.2',
+        'boto3>=1.40.59',
+        'cffi>=2.0.0',
+        'croniter>=6.0.0',
         'elasticsearch==7.10.1',
         'envparse>=0.2.0',
         'exotel==0.1.5',
-        'Jinja2>=3.1.3',
-        'jira>=3.6.0',
-        'jsonpointer>=2.4',
-        'jsonschema>=4.21.1',
-        'prettytable>=3.10.0',
+        'Jinja2>=3.1.6',
+        'jira>=3.10.5',
+        'jsonpointer>=3.0.0',
+        'jsonschema>=4.25.1',
+        'prettytable>=3.16.0',
         'prison>=0.2.1',
-        'prometheus_client>=0.20.0',
+        'prometheus_client>=0.23.1',
         'python-dateutil>=2.9.0.post0',
-        'PyYAML>=6.0.1',
-        'py-zabbix>=1.1.7',
+        'PyYAML>=6.0.3',
+        'zabbix-utils>=2.0.3',
         'requests>=2.31.0',
         'sortedcontainers>=2.4.0',
         'statsd-tags==3.2.1.post1',
-        'stomp.py>=8.1.0',
-        'tencentcloud-sdk-python>=3.0.1098',
+        'stomp.py>=8.2.0',
+        'tencentcloud-sdk-python>=3.0.1479',
         'texttable>=1.7.0',
-        'twilio>=8.13.0',
+        'twilio>=9.8.4',
     ]
 )