qontract-reconcile 0.10.2.dev265__py3-none-any.whl → 0.10.2.dev267__py3-none-any.whl

{qontract_reconcile-0.10.2.dev265.dist-info → qontract_reconcile-0.10.2.dev267.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev265
+Version: 0.10.2.dev267
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev265.dist-info → qontract_reconcile-0.10.2.dev267.dist-info}/RECORD

@@ -65,7 +65,7 @@ reconcile/openshift_network_policies.py,sha256=p81ShFK1WSEGiWHVURopDpg8YvtA3RE3O
 reconcile/openshift_prometheus_rules.py,sha256=onowXab248zmHH8SbYDTc1W1bl7JiqRFU1xdTkZyLFg,1332
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=I2nO_C37mG3rfyGrd4cGwN3mVseVGuTAHAyhFzLyqF4,1518
-reconcile/openshift_resources_base.py,sha256=x_uikuObZWv5ZfLdC2Yvm3MyXDK5Qpz5XFWOP6PDovo,42910
+reconcile/openshift_resources_base.py,sha256=Z5l_EzH5nDuKPF1dkBiyo6oHa-jAgGU9z1OGH77o_2g,42929
 reconcile/openshift_rhcs_certs.py,sha256=d-72kJwgHMtdvs1F5uv-jC2lWmOyN2Wp1pQMbQ43FbU,10240
 reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_RR60OZM,6555
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
@@ -456,7 +456,7 @@ reconcile/oum/models.py,sha256=teH0bJTCMTzbdbYD9CU4yXDuMr34ceLcM0KuoIPU8gI,1712
 reconcile/oum/providers.py,sha256=lfG6d7YV-A4Lte45EMv1Gx4A346piJ_jAkrU5AHJZ_g,1834
 reconcile/oum/standalone.py,sha256=EN5y1S-3DwUZYzSRqRMtf63mI2slvBHKiU9zOTjYvWM,7334
 reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/prometheus_rules_tester/integration.py,sha256=8lXZSaNqZAemulVNDxanrxwl7ZGfUxtwfptJlMPX8ac,9308
+reconcile/prometheus_rules_tester/integration.py,sha256=TWsVBUeRLH3lUCf47sWWVgq4Rpkrq0i_eu2vkqQniP0,9619
 reconcile/rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/rhidp/common.py,sha256=rqifpncnE5--sYSx7ERMGDUjNHRI-SZkpuzwepZSps4,6766
 reconcile/rhidp/metrics.py,sha256=Yp0GtpjhieEdru0qkG3osBTJiKUzg6CAjwPoFTQDnCg,417
@@ -640,7 +640,7 @@ reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
 reconcile/utils/prometheus.py,sha256=Ad0rwLbxRuuYjHwkwJloHEdK0bvy42h-p-HIT1DhDhs,3832
 reconcile/utils/promotion_state.py,sha256=McSgGj3oog83ThJCrMR2v8q6Xb_Pxij-HEe_RbDu8cg,3946
-reconcile/utils/promtool.py,sha256=xPK4ejsXtK0csj7BVAs49IkilGWgWpHiC2j_oPAp4rQ,2831
+reconcile/utils/promtool.py,sha256=YnqwMAzsQVGuBZ1j9zy3UcVPFQVJgBMLzQkxhK_KFkU,3079
 reconcile/utils/quay_api.py,sha256=Z6e3oPSp8sCIYxUSDTc6r_qZmXN8Ci_gK90DSCF7BDw,7814
 reconcile/utils/quay_mirror.py,sha256=dpWCNv5lITwIk6Q9RkmqaQKHNk_JPy27UQEribJ7E-U,1324
 reconcile/utils/raw_github_api.py,sha256=2WKtE8ABYYB9UGOAh9N_kLkksBWL3320Z2_scteZddI,2805
@@ -764,14 +764,14 @@ reconcile/utils/unleash/__init__.py,sha256=2PsN3GlLU8DOyWSvv5q9uzwuFn_vYtfEo-mmV
 reconcile/utils/unleash/client.py,sha256=YrJnauxjcy1ml7W2AHg7dzIH_fVK_GugoRu7IFmk6e0,3505
 reconcile/utils/unleash/server.py,sha256=907gDh9Ee8UxLqusnfpzE-7LUnttB38D4xhVJ0vMf_M,4439
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/alert_report.py,sha256=PqhFD2Yy_-dYCCSdNjoXbU6-FxbKnxCLLbcgjWmePhE,5051
+tools/alert_report.py,sha256=cyQTei8_SYOggW_6uYvzhrF7Nae-9xOz-jmh9O9V8R8,5589
 tools/app_interface_metrics_exporter.py,sha256=f1qwTmQfEcs98uBVRyBa0k7GQXdiSwd7w1hDVjhdGcQ,2303
 tools/app_interface_reporter.py,sha256=0_oq1-mL0UOh1x5G8CoKaEVJqK-XTKE7PX7IbRTovBc,17224
 tools/app_sre_tekton_access_reporter.py,sha256=o9prLUgQpwO3msRWc2as1xT1y9OB3znkpgvLr0Ys8_M,3146
 tools/app_sre_tekton_access_revalidation.py,sha256=66nHEaY-bIqxIhpcmwN8AvQZu6ZXenfkg4Fut0pVZRM,2726
 tools/glitchtip_access_reporter.py,sha256=o01A6b88t3Wie6tj_tJWWVo2J01LxQ_a9giGm4UzEaU,2901
 tools/glitchtip_access_revalidation.py,sha256=PXN5wxl6OX8sxddPaakDF3X79nFLvpm-lz0mWLVelw0,2806
-tools/qontract_cli.py,sha256=pjUR7TJZccs-k8e-RH5z7Hmg7RIY-WQKGKn_4kvFq7Y,159087
+tools/qontract_cli.py,sha256=DkIJX7jYRycBDKySQHVB6fNIAFpF3USkZaLJbcsYnDg,159204
 tools/template_validation.py,sha256=wW22pH4bJBN5CcK74RuIEwtiVmQ3zI1eSvNMAE6fbyc,3377
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/container_images_report.py,sha256=_8GuBsl_qYP5qfa5aa9krwyKHYu82MSh02deHEroSa4,5459
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=oF7C4hpIgyMTwTRm3Aun3cDCHIjVar65JoLp6NcJHlU,3909
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev265.dist-info/METADATA,sha256=dstrNAtHuutiYmLbd0W36G_n51PgL2oUMhbPAhNMQ5w,24501
-qontract_reconcile-0.10.2.dev265.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev265.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev265.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev267.dist-info/METADATA,sha256=8vXQoAu6tLPI2W0bpAPmQW3RzzD_eO20K4SvoXs-560,24501
+qontract_reconcile-0.10.2.dev267.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev267.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev267.dist-info/RECORD,,

reconcile/openshift_resources_base.py

@@ -139,6 +139,7 @@ provider
   variables
   enable_query_support
   tests
+  promtool_version
 }
 """
 

reconcile/prometheus_rules_tester/integration.py

@@ -42,6 +42,7 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 PROVIDERS = ["prometheus-rule"]
 
 NAMESPACE_NAME = "openshift-customer-monitoring"
+DEFAULT_PROMTOOL_VERSION = "2.55.1"
 
 
 class TestContent(BaseModel):
@@ -57,6 +58,7 @@ class Test(BaseModel):
     rule_length: int
     tests: list[TestContent] | None
     result: CommandExecutionResult | None = None
+    promtool_version: str
 
 
 class RuleToFetch(BaseModel):
@@ -80,6 +82,8 @@ def fetch_rule_and_tests(
     rule_body = openshift_resource.body
     rule_length = len(yaml.dump(rule_body))  # Same as prometheus-operator does it.
 
+    promtool_version = rule.resource.get("promtool_version") or DEFAULT_PROMTOOL_VERSION
+
     if rule.resource["type"] == "resource-template-extracurlyjinja2":
         variables = json.loads(rule.resource.get("variables") or "{}")
         variables["resource"] = rule.resource
@@ -113,6 +117,7 @@ def fetch_rule_and_tests(
         rule=rule_body,
         rule_length=rule_length,
         tests=tests,
+        promtool_version=promtool_version,
     )
 
 
@@ -204,7 +209,9 @@ def check_rule_length(rule_length: int) -> CommandExecutionResult:
 
 def run_test(test: Test, alerting_services: Iterable[str]) -> None:
     """Checks rules, run tests and stores the result in test.result"""
-    check_rule_result = promtool.check_rule(test.rule["spec"])
+    check_rule_result = promtool.check_rule(
+        test.rule["spec"], promtool_version=test.promtool_version
+    )
     valid_services_result = check_valid_services(test.rule, alerting_services)
     rule_length_result = check_rule_length(test.rule_length)
     test.result = check_rule_result and valid_services_result and rule_length_result
@@ -214,7 +221,9 @@ def run_test(test: Test, alerting_services: Iterable[str]) -> None:
 
     rule_files = {test.rule_path: test.rule["spec"]}
     for t in test.tests or []:
-        result = promtool.run_test(t.test, rule_files)
+        result = promtool.run_test(
+            t.test, rule_files, promtool_version=test.promtool_version
+        )
         test.result = test.result and result
 
 

reconcile/utils/promtool.py

@@ -9,17 +9,28 @@ import yaml
 from reconcile.utils.defer import defer
 from reconcile.utils.structs import CommandExecutionResult
 
-PROMTOOL_VERSION = ["2.55.1"]
+PROMTOOL_VERSION = ["2.55.1", "3.2.1"]
 PROMTOOL_VERSION_REGEX = r"^promtool,\sversion\s([\d]+\.[\d]+\.[\d]+).+$"
 
 
-def check_rule(yaml_spec: Mapping) -> CommandExecutionResult:
+def _bin(version: str | None = None) -> str:
+    return f"promtool-{version}" if version else "promtool"
+
+
+def check_rule(
+    yaml_spec: Mapping,
+    promtool_version: str | None = None,
+) -> CommandExecutionResult:
     """Run promtool check rules on the given yaml spec given as dict"""
-    return _run_yaml_spec_cmd(cmd=["promtool", "check", "rules"], yaml_spec=yaml_spec)
+    return _run_yaml_spec_cmd(
+        cmd=[_bin(promtool_version), "check", "rules"], yaml_spec=yaml_spec
+    )
 
 
 def run_test(
-    test_yaml_spec: MutableMapping, rule_files: Mapping[str, Mapping]
+    test_yaml_spec: MutableMapping,
+    rule_files: Mapping[str, Mapping],
+    promtool_version: str | None = None,
 ) -> CommandExecutionResult:
     """Run promtool test rules
 
@@ -52,7 +63,7 @@ def run_test(
     defer(lambda: _cleanup(temp_rule_files.values()))
 
     return _run_yaml_spec_cmd(
-        cmd=["promtool", "test", "rules"], yaml_spec=temp_test_yaml_spec
+        cmd=[_bin(promtool_version), "test", "rules"], yaml_spec=temp_test_yaml_spec
     )
 
 

tools/alert_report.py

@@ -12,17 +12,22 @@ class Alert:
     message: str
     timestamp: float
     username: str
+    responsed: bool
 
 
 class AlertStat:
     def __init__(self) -> None:
         self._triggered_alerts = 0
         self._resolved_alerts = 0
+        self._responsed_alerts = 0
         self._elapsed_times: list[float] = []
 
     def add_triggered(self) -> None:
         self._triggered_alerts += 1
 
+    def add_responsed(self) -> None:
+        self._responsed_alerts += 1
+
     def add_resolved(self) -> None:
         self._resolved_alerts += 1
 
@@ -37,6 +42,10 @@ class AlertStat:
     def resolved_alerts(self) -> int:
         return self._resolved_alerts
 
+    @property
+    def responsed_alerts(self) -> int:
+        return self._responsed_alerts
+
     @property
     def elapsed_times(self) -> list[float]:
         return self._elapsed_times
@@ -53,6 +62,8 @@ def group_alerts(messages: list[dict]) -> dict[str, list[Alert]]:
             continue
 
         timestamp = float(m["ts"])
+        responsed = bool(m.get("reply_count", 0) or m.get("reactions", []))
+
         for at in m.get("attachments", []):
             if "title" not in at:
                 continue
@@ -79,6 +90,7 @@ def group_alerts(messages: list[dict]) -> dict[str, list[Alert]]:
                         message=alert_message,
                         timestamp=timestamp,
                         username=m["username"],
+                        responsed=responsed,
                     )
                 )
             else:
@@ -93,6 +105,7 @@ def group_alerts(messages: list[dict]) -> dict[str, list[Alert]]:
                             message="placeholder",
                             timestamp=timestamp,
                             username=m["username"],
+                            responsed=responsed,
                         )
                     )
                     continue
@@ -114,6 +127,7 @@ def group_alerts(messages: list[dict]) -> dict[str, list[Alert]]:
                                 message=alert_message,
                                 timestamp=timestamp,
                                 username=m["username"],
+                                responsed=responsed,
                             )
                         )
 
@@ -135,6 +149,8 @@ def gen_alert_stats(alerts: dict[str, list[Alert]]) -> dict[str, AlertStat]:
             if al.state == "FIRING":
                 alert_stats[alert_name].add_triggered()
                 temp[key] = al
+                if al.responsed:
+                    alert_stats[alert_name].add_responsed()
 
             if al.state == "RESOLVED":
                 alert_stats[alert_name].add_resolved()

tools/qontract_cli.py

@@ -869,6 +869,7 @@ def alert_report(
         "Triggered",
         "Resolved",
         "Median time to resolve (h:mm:ss)",
+        "Response Rate",
     ]
     table_data: list[dict[str, str]] = []
     for alert_name, data in sorted(
@@ -884,6 +885,7 @@ def alert_report(
             "Triggered": str(data.triggered_alerts),
             "Resolved": str(data.resolved_alerts),
             "Median time to resolve (h:mm:ss)": median_elapsed,
+            "Response Rate": f"{data.responsed_alerts / data.triggered_alerts * 100:.2f}%",
         })
 
     # TODO(mafriedm, rporres): Fix this