qontract-reconcile 0.10.1rc403__py3-none-any.whl → 0.10.1rc405__py3-none-any.whl

{qontract_reconcile-0.10.1rc403.dist-info → qontract_reconcile-0.10.1rc405.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc403
+Version: 0.10.1rc405
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc403.dist-info → qontract_reconcile-0.10.1rc405.dist-info}/RECORD

@@ -479,7 +479,7 @@ reconcile/typed_queries/terraform_tgw_attachments/aws_accounts.py,sha256=T5HSeyB
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=0wvfrjuFjyO1pblC1N9zTNq_4ihAiw0D7yguiNyQLjc,3330
 reconcile/utils/amtool.py,sha256=9p9FYkv4RYPnkDICuN1apcqJyZ5n8WbHF6vC0FIiQIw,2166
-reconcile/utils/aws_api.py,sha256=zr8NaB-8PT_k6yiLHRnjVat527RfvOR1DuD6-2bI5Zo,62586
+reconcile/utils/aws_api.py,sha256=Bt_TtVM3FVWvVAJ-z-UclVYYZjWoXeA1UAJYzYqKcIE,63026
 reconcile/utils/aws_helper.py,sha256=E8NHkStoHRmvLVjRll2f5kGtU3i3f7ekp5V6nrn7B_M,1691
 reconcile/utils/binary.py,sha256=3IBnwjKakHM367skPPvG6yVSQYjKt5muQlFNdoa63DU,2352
 reconcile/utils/config.py,sha256=ZhYy3ZKI0vB_QvrYr14JPxu0EAVM5gS8cKRbM8ECRSE,992
@@ -612,7 +612,7 @@ tools/app_interface_reporter.py,sha256=8HUH8kkW50-plKgiTgCiFINJNN_cl4ZFzmY4aSnRa
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
 tools/qontract_cli.py,sha256=xEMgcF90wD9gak8JbYemKog0alh_usFhwwvyB356Ukw,97319
-tools/sd_app_sre_alert_report.py,sha256=utFZCreITuTZTiOaFNCaVPyFK0zxFZbc_ElcngGbiW8,4346
+tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=JryinrDdvztN931enUY3FuDeLVnfs6y58mnK7itNK6Y,4940
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
@@ -620,10 +620,10 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_app_interface_metrics_exporter.py,sha256=dmEcNwZltP1rd_4DbxIYakOCh0DHp8Trox3Z1N0Au3U,1293
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
-tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
+tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc403.dist-info/METADATA,sha256=cIo20x-baQGEabysu8S0LhYBh9G8h8NeNGF0KOyJhlU,2347
-qontract_reconcile-0.10.1rc403.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-qontract_reconcile-0.10.1rc403.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc403.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc403.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc405.dist-info/METADATA,sha256=bIqWFa2YEDDCInJCzun3qZNNLuo-Ok-3ib1HmGEXccg,2347
+qontract_reconcile-0.10.1rc405.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+qontract_reconcile-0.10.1rc405.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc405.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc405.dist-info/RECORD,,

{qontract_reconcile-0.10.1rc403.dist-info → qontract_reconcile-0.10.1rc405.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.41.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

reconcile/utils/aws_api.py

@@ -20,6 +20,7 @@ from typing import (
 
 import botocore
 from boto3 import Session
+from botocore.config import Config
 from pydantic import BaseModel
 from sretoolbox.utils import threaded
 
@@ -170,6 +171,13 @@ class AWSApi:  # pylint: disable=too-many-public-methods
             access_key = secret["aws_access_key_id"]
             secret_key = secret["aws_secret_access_key"]
             region_name = account["resourcesDefaultRegion"]
+            self.use_fips = False
+
+            # ensure that govcloud accounts use FIPs endpoints
+            if "partition" in account and account["partition"] == GOVCLOUD_PARTITION:
+                logging.debug(f"FIPS endpoint enabled for AWS account: {account_name}")
+                self.use_fips = True
+
             session = Session(
                 aws_access_key_id=access_key,
                 aws_secret_access_key=secret_key,
@@ -203,7 +211,11 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         region_name: Optional[str] = None,
     ):
         region = region_name if region_name else session.region_name
-        client = session.client(service_name, region_name=region)
+        client = session.client(
+            service_name,
+            region_name=region,
+            config=Config(use_fips_endpoint=self.use_fips),
+        )
         self._session_clients.append(client)
         return client
 

tools/sd_app_sre_alert_report.py

@@ -82,6 +82,21 @@ def group_alerts(messages: list[dict]) -> dict[str, list[Alert]]:
                     )
                 )
             else:
+                # This may happen for alerts rules without "message". This can happen
+                # if schema cannot be validated for a certain alert rule because it
+                # is not valid yaml (go templates, jinja templates)
+                if "text" not in at:
+                    alert_state = "FIRING" if "FIRING" in mg.group(2) else mg.group(2)
+                    alerts[alert_name].append(
+                        Alert(
+                            state=alert_state,
+                            message="placeholder",
+                            timestamp=timestamp,
+                            username=m["username"],
+                        )
+                    )
+                    continue
+
                 alert_state = ""
                 for line in at["text"].split("\n"):
                     if "Alerts Firing" in line:

tools/test/test_sd_app_sre_alert_report.py

@@ -28,16 +28,21 @@ def test_group_alerts():
     assert csopc
     assert len(csopc) == 1
 
+    art = alerts["AlertmanagerReceiverTest"]
+    assert art
+    assert len(art) == 2
+
     # This means one of the list elements has been ignored as it didn't have alertname
-    # as the total alerts we have from the above tests is 11 and the total of messages
-    # from the fixture is 12.
+    # as the total alerts we have from the above tests is 13 and the total of messages
+    # from the fixture is 14.
     assert set(alerts.keys()) == {
         "PrometheusTargetFlapping",
         "SLOMetricAbsent",
         "PatchmanAlertEvalDelay",
         "ContainerSecurityOperatorPodCount",
+        "AlertmanagerReceiverTest",
     }
-    assert len(messages) == 12
+    assert len(messages) == 14
 
 
 def test_alert_stats():
@@ -62,3 +67,8 @@ def test_alert_stats():
     assert csopc.triggered_alerts == 0
     assert csopc.resolved_alerts == 1
     assert not csopc.elapsed_times
+
+    art = alert_stats["AlertmanagerReceiverTest"]
+    assert art.triggered_alerts == 1
+    assert art.resolved_alerts == 1
+    assert median(art.elapsed_times) == 300