Merge pull request #1708 from jertel/jertel/misc

rtd base os update; import cleanup; revert previous PR change for prom

Author: nsano-rururu

.readthedocs.yaml

@@ -7,10 +7,10 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  # Must stay at 22.04 until RTD adds support for 24.04
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.12"
+    # Python 3.14 dependent upon https://github.com/readthedocs/readthedocs.org/issues/12523
+    python: "3.13"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

CHANGELOG.md

@@ -21,6 +21,8 @@
 - Update library: tencentcloud-sdk-python to 3.0.1479 - [#1706](https://github.com/jertel/elastalert2/pull/1706) - @nsano-rururu
 - Update library: twilio to 9.8.4 - [#1706](https://github.com/jertel/elastalert2/pull/1706) - @nsano-rururu
 - Update build libraries: pylint, pytest, pytest-cov, pytest-xdist, sphinx, tox - [#1706](https://github.com/jertel/elastalert2/pull/1706) - @nsano-rururu
+- Update docs build to use Ubuntu 24.40 and Python 3.13 - [#1708](https://github.com/jertel/elastalert2/pull/1708) - @jertel
+- Cleanup unused imports - [#1708](https://github.com/jertel/elastalert2/pull/1708) - @jertel
 
 # 2.26.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'''

elastalert/prometheus_wrapper.py

@@ -32,9 +32,8 @@ def metrics_run_rule(self, rule, endtime, starttime=None):
         result = None
         try:
             self.prom_scrapes.labels(rule['name']).inc()
-            result = self.run_rule(rule, endtime, starttime)
         finally:
-            pass
+            result = self.run_rule(rule, endtime, starttime)
         return result
 
     def metrics_writeback(self, doc_type, body, rule=None, match_body=None):