qontract-reconcile 0.10.1rc1131__py3-none-any.whl → 0.10.1rc1133__py3-none-any.whl

{qontract_reconcile-0.10.1rc1131.dist-info → qontract_reconcile-0.10.1rc1133.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1131
+Version: 0.10.1rc1133
 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.1rc1131.dist-info → qontract_reconcile-0.10.1rc1133.dist-info}/RECORD

@@ -17,7 +17,7 @@ reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4
 reconcile/dashdotdb_cso.py,sha256=IkI_KSZuH_kPn0cIQKXitJXiPPFSyHykrOuFy9h9ZpU,3643
 reconcile/dashdotdb_dora.py,sha256=YmfxD02tKUAQQzku2aj2DXv1oKkAr4V_2lrPVtTFGyI,17674
 reconcile/dashdotdb_dvo.py,sha256=lCkZ0iby6HrNQb-3kYb6xrt8wCjVUZYxKzz9SiStfHU,8946
-reconcile/dashdotdb_slo.py,sha256=S7j7xFeGaJkE82biWEdPu6ORCJEsJYNTDqcTzSl8AQY,6679
+reconcile/dashdotdb_slo.py,sha256=s-AMW927seimHou19h4fHnvjUJwkXcJRBEHi6HjOMI8,7106
 reconcile/database_access_manager.py,sha256=FfyXnYcUdX54BYR_6B9PWFmhT8xdNrPCfoz3Q7q39tg,25646
 reconcile/deadmanssnitch.py,sha256=n-5W-djUgwzpmdDM4eQIZpkkDmHY0vndt-42LJXI4Y8,7491
 reconcile/email_sender.py,sha256=-5L-Ag_jaEYSzYRoMr52KQBRXz1E8yx9GqLbg2X4XFU,3533
@@ -188,7 +188,7 @@ reconcile/dynatrace_token_provider/model.py,sha256=gkpqo5rRRueBXnIMjp4EEHqBUBuU6
 reconcile/dynatrace_token_provider/ocm.py,sha256=MwYCZIxW4f-1jzFTxxN__sity6S8O7bbKUdyTFEVO7U,4325
 reconcile/dynatrace_token_provider/validate.py,sha256=40_9QmHoB3-KBc0k_0D4QO00PpNNPS-gU9Z6cIcWga8,1920
 reconcile/endpoints_discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/endpoints_discovery/integration.py,sha256=q01DJgCv1YiDY-VUWDfQ5kfGm67BUhP-YP7c0JQObj8,12333
+reconcile/endpoints_discovery/integration.py,sha256=V6uriGAM4Ki9bjTpM2kmRh1UVcyIIFdJK4w0YsorUo8,12704
 reconcile/endpoints_discovery/merge_request.py,sha256=_yLb4tnvoZMCko8rta2C_CvOInJa9pa3HzSmHNtjgGU,2978
 reconcile/endpoints_discovery/merge_request_manager.py,sha256=wUMsumxv8RnWaRattax4HfoRlhtVzmgro3GiJJ1C4Vc,6392
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -871,8 +871,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc1131.dist-info/METADATA,sha256=2COkT03GzJzpy3Gb1O-srsEwA9GQwzaBMm00k4pPxOI,2213
-qontract_reconcile-0.10.1rc1131.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1131.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1131.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1131.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1133.dist-info/METADATA,sha256=-7WqkBwuhgv_OY_C53SD1T0bN9WAMFeIQEZrqGYCUYU,2213
+qontract_reconcile-0.10.1rc1133.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1133.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1133.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1133.dist-info/RECORD,,

reconcile/dashdotdb_slo.py

@@ -1,5 +1,6 @@
 from collections.abc import Iterable
 from dataclasses import dataclass
+from math import isnan
 from typing import Any
 
 import jinja2
@@ -83,10 +84,13 @@ class DashdotdbSLO(DashdotdbBase):
                 continue
 
             LOG.info("%s syncing slo %s", self.logmarker, slo_name)
-            response = self._do_post(endpoint, payload)
             try:
+                response = self._do_post(endpoint, payload)
                 response.raise_for_status()
-            except requests.exceptions.HTTPError as details:
+            except (
+                requests.exceptions.HTTPError,
+                requests.exceptions.InvalidJSONError,
+            ) as details:
                 LOG.error("%s error posting %s - %s", self.logmarker, slo_name, details)
 
             LOG.info("%s slo %s synced", self.logmarker, slo_name)
@@ -144,6 +148,12 @@ class DashdotdbSLO(DashdotdbBase):
                     continue
 
                 slo_value = float(slo_value[1])
+                if isnan(slo_value):
+                    LOG.warning(
+                        f"{self.logmarker} Skipping SLO '{slo.name}' in SLO doc '{slo_document.name}'"
+                        "as the obtained value is not a number (maybe a division by 0?)"
+                    )
+                    continue
                 slo_target = float(slo.slo_target)
 
                 # In Dash.DB we want to always store SLOs in percentages

reconcile/endpoints_discovery/integration.py

@@ -1,4 +1,5 @@
 import logging
+from collections import defaultdict
 from collections.abc import Callable, Iterable
 from typing import TypedDict
 
@@ -43,7 +44,7 @@ from reconcile.utils.unleash import get_feature_toggle_state
 from reconcile.utils.vcs import VCS
 
 QONTRACT_INTEGRATION = "endpoints-discovery"
-QONTRACT_INTEGRATION_VERSION = make_semver(1, 0, 0)
+QONTRACT_INTEGRATION_VERSION = make_semver(1, 0, 1)
 
 
 class EndpointsDiscoveryIntegrationParams(PydanticRunParams):
@@ -137,13 +138,21 @@ class EndpointsDiscoveryIntegration(
             )
             return []
 
+        routes = defaultdict(list)
+        for item in oc.get_items(kind="Route", namespace=namespace.name):
+            tls = bool(item["spec"].get("tls"))
+            host = item["spec"]["host"]
+            # group all routes with the same hostname/tls
+            routes[(host, tls)].append(item["metadata"]["name"])
+
+        # merge all routes with the same hostname into one and combine the names
         return [
             Route(
-                name=item["metadata"]["name"],
-                host=item["spec"]["host"],
-                tls=bool(item["spec"].get("tls")),
+                name="|".join(sorted(names)),
+                host=host,
+                tls=tls,
             )
-            for item in oc.get_items(kind="Route", namespace=namespace.name)
+            for (host, tls), names in routes.items()
         ]
 
     def get_endpoint_changes(