Improve report by adding limit and percentage - #384

The idea here is to improve the visualization of the reporting by adding not only the usage, but the limit and how close to the limit it is. Also, to make it easier to read, print it all in a table format. Example before: ``` EC2/All F Spot Instance Requests 0 EC2/All G Spot Instance Requests 0 EC2/All Inf Spot Instance Requests 0 EC2/All P Spot Instance Requests 0 EC2/All Standard (A, C, D, H, I, M, R, T, Z) Spot Instance Requests 0 EC2/All X Spot Instance Requests 0 EC2/Elastic IP addresses (EIPs) 0 EC2/Max active spot fleets per region 0 EC2/Max launch specifications per spot fleet <unknown> EC2/Max target capacity for all spot fleets in region 0 EC2/Max target capacity per spot fleet <unknown> EC2/Rules per VPC security group max: sg-0648da97fdeebf980=102 (sg-0df2ad106237174ea=1, sg-07e5e4f72cea0dfe5=1, sg-0b9911c871252d8e7=1, sg-0d055747ec7c4140e=1, sg-09551693a5250b7f4=1, sg-0781c381e1b5d378a=1, sg-0fd94d543ec6cf4ee=1, sg-05e714614de7941cd=1, sg-03cc3b695a6366ffd=1, sg-083eae2676c6f8b92=1, sg-0dc2ee2f21505bf2c=1, sg-0e1729f5b07df6416=1, sg-0de5f793ac0da38e7=1, sg-0d79228bbb3f97b6d=1, sg-0c7bcbb474d8afbf5=1, sg-0d6aa6e6209d923b5=1, sg-086b6c19c0860460b=1, sg-0c56e7af849a12622=1, sg-086a3c13d414aef8b=1, sg-0853c55cd9df708de=1, sg-0e1ed9e1ceca720a1=1, sg-099ef683e4d35e2ee=1, sg-0adc28eb7faa40ecf=1, sg-0dabf1e2c30f5998f=1, sg-06aedf016149fbe14=1, sg-0f9148df50a48a291=1, sg-006e95a00de69f1b8=1, sg-0f9f697bf9ef106a5=1, ``` Example after: ``` ┌──────────────────────────────────────────────────────────────────────────┬───────────────────────┬───────────┬───────────┬───────────┐ │ Service Limit │ Resource │ Usage # │ Usage % │ Limit │ ├──────────────────────────────────────────────────────────────────────────┼───────────────────────┼───────────┼───────────┼───────────┤ │ EC2/All F Spot Instance Requests │ - │ 0 │ 0 % │ 128 │ │ EC2/All G Spot Instance Requests │ - │ 0 │ - │ <unknown> │ │ EC2/All Inf Spot Instance Requests │ - │ 0 │ 0 % │ 64 │ │ EC2/All P Spot Instance Requests │ - │ 0 │ - │ <unknown> │ │ EC2/All Standard (A, C, D, H, I, M, R, T, Z) Spot Instance Requests │ - │ 0 │ 0 % │ 640 │ │ EC2/All X Spot Instance Requests │ - │ 0 │ 0 % │ 128 │ │ EC2/Elastic IP addresses (EIPs) │ - │ 0 │ - │ <unknown> │ │ EC2/Max active spot fleets per region │ - │ 0 │ - │ <unknown> │ │ EC2/Max target capacity for all spot fleets in region │ - │ 0 │ - │ <unknown> │ │ EC2/Rules per VPC security group │ sg-058d83cc259d4e69c │ 3 │ 2 % │ 120 │ │ EC2/Rules per VPC security group │ sg-0783065c4d2b78c83 │ 3 │ 2 % │ 120 │ │ EC2/Rules per VPC security group │ sg-0df2ad106237174ea │ 1 │ 1 % │ 120 │ │ EC2/Rules per VPC security group │ sg-07e5e4f72cea0dfe5 │ 1 │ 1 % │ 120 │ │ EC2/Rules per VPC security group │ sg-0b9911c871252d8e7 │ 1 │ 1 % │ 120 │ │ EC2/Rules per VPC security group │ sg-0229a5ed0b61ce2bd │ 2 │ 2 % │ 120 │ │ EC2/Rules per VPC security group │ sg-0b25ba5186ce99117 │ 2 │ 2 % │ 120 │ ```
jantman · Jun 28, 2024 · 9152ebe · 9152ebe
1 parent d2157f1
commit 9152ebe
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/awslimitchecker/limit.py b/awslimitchecker/limit.py
@@ -433,7 +433,6 @@ class instance. Return True if usage is within thresholds, or false if
                 continue
             pct = (usage / (limit * 1.0)) * 100
             if crit_int is not None and usage >= crit_int:
-                self._criticals.append(u)
                 all_ok = False
             elif pct >= crit_pct:
                 self._criticals.append(u)

diff --git a/awslimitchecker/runner.py b/awslimitchecker/runner.py
@@ -43,6 +43,7 @@
 import json
 import boto3
 import time
+import tabulate
 
 from .checker import AwsLimitChecker
 from .utils import StoreKeyValuePair, dict2cols, issue_string_tuple
@@ -319,12 +320,20 @@ def show_usage(self):
             service=self.service_name, use_ta=(not self.skip_ta))
         limits = self.checker.get_limits(
             service=self.service_name, use_ta=(not self.skip_ta))
-        data = {}
+        headers = ['Service Limit', 'Resource', 'Usage #', 'Usage %', 'Limit']
+        table = []
         for svc in sorted(limits.keys()):
             for lim in sorted(limits[svc].keys()):
-                data["{s}/{l}".format(s=svc, l=lim)] = '{v}'.format(
-                    v=limits[svc][lim].get_current_usage_str())
-        print(dict2cols(data))
+                data = limits[svc][lim]
+                for usage in data.get_current_usage():
+                    service = svc
+                    limit_name = lim
+                    resource = usage.resource_id or '-'
+                    limit = int(data.quotas_limit) if data.quotas_limit else "<unknown>"
+                    use = usage.value
+                    use_percent = "{:.0f} %".format((use / limit) * 100) if isinstance(limit, (int, float)) else "-"
+                    table.append([f"{service}/{limit_name}", resource, str(use), use_percent, str(limit)])
+        print(tabulate.tabulate(table, headers=headers, tablefmt="simple_outline"))
 
     def check_thresholds(self, metrics=None):
         have_warn = False

diff --git a/setup.py b/setup.py
@@ -50,7 +50,8 @@
     'python-dateutil',
     'versionfinder>=0.1.1',
     'pytz',
-    'urllib3'
+    'urllib3',
+    'tabulate>=0.9.0',
 ]
 
 classifiers = [