django-restit 4.2.107__tar.gz → 4.2.108__tar.gz

{django_restit-4.2.107 → django_restit-4.2.108}/PKG-INFO

@@ -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 → django_restit-4.2.108}/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(

{django_restit-4.2.107 → django_restit-4.2.108}/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))
 
 

{django_restit-4.2.107 → django_restit-4.2.108}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.107"
+version = "4.2.108"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"