django-restit 4.2.107__py3-none-any.whl → 4.2.108__py3-none-any.whl

{django_restit-4.2.107.dist-info → django_restit-4.2.108.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.107
+Version: 4.2.108
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.107.dist-info → django_restit-4.2.108.dist-info}/RECORD

@@ -354,8 +354,8 @@ metrics/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 metrics/models.py,sha256=lD9nVzfwdav70ENulqJ8rE8Ui8EWlzdVp05rg8bAlMA,13444
 metrics/periodic.py,sha256=VmL0YG05D6k5fcNsF4QqPEU-BBPbZXjbOrp3b8EHZ-U,651
 metrics/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metrics/providers/aws.py,sha256=vhz0w6xE_V_V050g3V2uKEUPRIaI_o48MFkfsHjLzQU,8307
-metrics/rpc.py,sha256=yIv1ZVnlY_RYI693pX5iptH3gnVAC1DQ2nJQ5vLZQyw,21657
+metrics/providers/aws.py,sha256=dIBGFE1Fvszy6rmVrn_Fm1zUDv345q4dBsg9Iit-XCc,8358
+metrics/rpc.py,sha256=LXZcYBtssSFmcaoIjaJ32S6Nv_mswDALtmUYm5ByDMQ,21667
 metrics/settings.py,sha256=wwHA9Z7BAHNeu3tFVn8Fh5j46KR-eGx0E8r5dzCFlAU,132
 metrics/tq.py,sha256=WHBRYSinmTuxF9l-_-lx0yfzEYkb0ffVMt_uvCj9bYo,825
 metrics/utils.py,sha256=PSydxeI983udULUTcbeWG-_ulPSOac6Q_t_8k_Vjn1I,12606
@@ -509,7 +509,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.107.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.107.dist-info/METADATA,sha256=lqLjoZ72QKedFUqZbUcmLjrh8GM7Ja1AkBdJy5VSa8Y,7663
-django_restit-4.2.107.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.107.dist-info/RECORD,,
+django_restit-4.2.108.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.108.dist-info/METADATA,sha256=xjyg7k6U0iPx-OAcb3QmgJzKIMK_cRecySSJJvmlH8w,7663
+django_restit-4.2.108.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.108.dist-info/RECORD,,

metrics/providers/aws.py

@@ -87,7 +87,7 @@ def pushMetric(name, value, unit="Count", instance=None):
 
 def buildQuery(id, instance, period=300, metric="cpu", namespace="rds", stat="max"):
     dname = "DBInstanceIdentifier"
-    if namespace == "ec2":
+    if namespace in ["ec2", "CustomMetrics"]:
         dname = "InstanceId"
     elif namespace == "redis":
         dname = "CacheClusterId"
@@ -120,7 +120,7 @@ def getMetrics(instances, period=300, duration_seconds=900, metric="cpu", namesp
 
 def getMetricsList(instance, namespace="rds"):
     dname = "DBInstanceIdentifier"
-    if namespace == "ec2":
+    if namespace == "ec2" or namespace == "CustomMetrics":
         dname = "InstanceId"
     cloudwatch = getClient(service="cloudwatch")
     response = cloudwatch.list_metrics(

metrics/rpc.py

@@ -366,19 +366,6 @@ def rest_on_ec2_metrics_cpu(request):
         if i.id in data:
             output[i.name] = data[i.id]
             output[i.name].reverse()
-    # if get_rds:
-    #     ids = aws.getAllRDS(True)
-    #     rds_cpu = (aws.getMetrics(
-    #         ids,
-    #         period=period,
-    #         duration_seconds=duration,
-    #         metric="cpu",
-    #         namespace="rds",
-    #         stat="max"))
-    #     for k, v in rds_cpu.items():
-    #         v.reverse()
-    #     output.update(rds_cpu)
-
     data = dict(data=output, periods=getPeriods(period, duration))
     return rv.restReturn(request, dict(data=data))
 
@@ -386,13 +373,25 @@ def rest_on_ec2_metrics_cpu(request):
 @rd.urlGET('aws/ec2/network/established')
 @rd.requires_params(["ids"])
 def rest_on_ec2_metrics_net_established(request):
+    ids = request.DATA.getlist("ids")
+    period = request.DATA.get("period", 300, field_type=int)
+    duration = request.DATA.get("duration", period*8, field_type=int)
+    instances = aws.getAllEC2()
+    if "all" in ids:
+        ids = [inst.id for inst in instances]
     data = aws.getMetrics(
-        request.DATA.getlist("ids"),
-        period=request.DATA.get("period", 300, field_type=int),
-        duration_seconds=request.DATA.get("duration", 900, field_type=int),
+        ids,
+        period=period,
+        duration_seconds=duration,
         metric="EstablishedConnections",
         namespace="CustomMetrics",
         stat="max")
+    output = dict()
+    for i in instances:
+        if i.id in data:
+            output[i.name] = data[i.id]
+            output[i.name].reverse()
+    data = dict(data=output, periods=getPeriods(period, duration))
     return rv.restReturn(request, dict(data=data))