paasta-tools 1.0.3__tar.gz → 1.0.5__tar.gz

{paasta-tools-1.0.3/paasta_tools.egg-info → paasta-tools-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.0.3
+Version: 1.0.5
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-1.0.3 → paasta-tools-1.0.5}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.0.3"
+__version__ = "1.0.5"

{paasta-tools-1.0.3 → paasta-tools-1.0.5}/paasta_tools/check_autoscaler_max_instances.py

@@ -124,28 +124,33 @@ async def check_max_instances(
                     )
 
                     metric_threshold_target_ratio = threshold / setpoint
-
-                    current_value = suffixed_number_value(metric["current_value"])
-                    target_value = suffixed_number_value(metric["target_value"])
-
-                    if current_value / target_value > metric_threshold_target_ratio:
-                        status = pysensu_yelp.Status.CRITICAL
-                        output = (
-                            f"{service}.{instance}: Service is at max_instances, and"
-                            " ratio of current value to target value"
-                            f" ({current_value} / {target_value}) is greater than the"
-                            " ratio of max_instances_alert_threshold to setpoint"
-                            f" ({threshold} / {setpoint})"
-                        )
-                    else:
-                        status = pysensu_yelp.Status.OK
-                        output = (
-                            f"{service}.{instance}: Service is at max_instances, but"
-                            " ratio of current value to target value"
-                            f" ({current_value} / {target_value}) is below the ratio of"
-                            f" max_instances_alert_threshold to setpoint ({threshold} /"
-                            f" {setpoint})"
-                        )
+                    try:
+                        current_value = suffixed_number_value(metric["current_value"])
+                        target_value = suffixed_number_value(metric["target_value"])
+
+                        if current_value / target_value > metric_threshold_target_ratio:
+                            status = pysensu_yelp.Status.CRITICAL
+                            output = (
+                                f"{service}.{instance}: Service is at max_instances, and"
+                                " ratio of current value to target value"
+                                f" ({current_value} / {target_value}) is greater than the"
+                                " ratio of max_instances_alert_threshold to setpoint"
+                                f" ({threshold} / {setpoint})"
+                            )
+                        else:
+                            status = pysensu_yelp.Status.OK
+                            output = (
+                                f"{service}.{instance}: Service is at max_instances, but"
+                                " ratio of current value to target value"
+                                f" ({current_value} / {target_value}) is below the ratio of"
+                                f" max_instances_alert_threshold to setpoint ({threshold} /"
+                                f" {setpoint})"
+                            )
+                    except KeyError:
+                        # we likely couldn't find values for the current metric from autoscaling status
+                        # if this is the only metric, we will return UNKNOWN+this error
+                        # suggest fixing their autoscaling config
+                        output = f'{service}.{instance}: Service is at max_instances, and there is an error fetching your {metrics_provider_config["type"]} metric. Check your autoscaling configs or reach out to #paasta.'
             else:
                 status = pysensu_yelp.Status.OK
                 output = f"{service}.{instance} is below max_instances."

{paasta-tools-1.0.3 → paasta-tools-1.0.5/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: paasta-tools
-Version: 1.0.3
+Version: 1.0.5
 Summary: Tools for Yelps SOA infrastructure
 Home-page: UNKNOWN
 Author: Compute Infrastructure @ Yelp

{paasta-tools-1.0.3 → paasta-tools-1.0.5}/paasta_tools/cli/cmds/rollback.py

@@ -237,12 +237,6 @@ def paasta_rollback(args: argparse.Namespace) -> int:
     mark_for_deployment.
     """
 
-    try:
-        validate_full_git_sha(args.commit)
-    except argparse.ArgumentTypeError as e:
-        print(PaastaColors.red(f"Error: {e}"))
-        return 1
-
     soa_dir = args.soa_dir
     service = figure_out_service_name(args, soa_dir)
 
@@ -305,6 +299,12 @@ def paasta_rollback(args: argparse.Namespace) -> int:
         )
         return 1
 
+    try:
+        validate_full_git_sha(args.commit)
+    except argparse.ArgumentTypeError as e:
+        print(PaastaColors.red(f"Error: {e}"))
+        return 1
+
     # TODO: Add similar check for when image_version is empty and no-commit redeploys is enforced for requested deploy_group
 
     returncode = 0