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

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

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

{django_restit-4.2.107.dist-info → django_restit-4.2.110.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
@@ -374,7 +374,7 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=yUGGhaiZHnz8BlV-outvcNP7abr5Samxuo6VesvF84Y,121
+rest/__init__.py,sha256=tkKkxuntg_NNk2IluEC5jeaier2km2CgtVoFK5ThB-c,122
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -386,7 +386,7 @@ rest/decorators.py,sha256=ig0LATc3-2mhEJPAWHRbIRM-ZOFyjm6e_F9RhpRWidE,15082
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/errors.py,sha256=uKwG9OkLme36etabqK54DMjMQc1fgEoUIAUxXa7WFQw,612
 rest/extra/__init__.py,sha256=YzmNsch5H5FFLkUK9mIAKyoRK_rJCA9HGb0kubp4h30,54
-rest/extra/hostinfo.py,sha256=bAj-6XjY9sJPLHqLxZZLHjmlzSFDJK1L18w81Zb_1ec,3081
+rest/extra/hostinfo.py,sha256=LFigr90B-NU6MkaYDNj7fwfqJVuu9UP1InZMky4kH58,4041
 rest/extra/json_metadata.py,sha256=p_ffzmANmOFix_oC3voR6_NNTjcn7-T7aXcH-I4_Npg,1078
 rest/fields.py,sha256=_v1TJVc6vyWlqmwFRJ6mtuR5Fo-lS0KcUhPWIrzKZUo,9719
 rest/forms.py,sha256=66Wm5cdy8tKib_mGicjq_yd-gNVMFWRECnrDksnNnwU,6316
@@ -413,7 +413,7 @@ rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
 rest/requestex.py,sha256=N56056vV3zWkAP-QrYsCu7SdpPzE5kLuPoxGIuZAKt0,16127
-rest/rpc.py,sha256=lHJkZXOxLJJoD4LVPDMXZGk5jV6Yltu7Lu4pMxMpq38,1764
+rest/rpc.py,sha256=wCR22Ds4CgZ9q-ptWuIpc15J01tTRPpAYWEkAA9LDHM,2205
 rest/search.py,sha256=QVjk2b5tZLgf1zM2MHvJTyRjwUbY5ZD7HXSTmSPXtvU,8362
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/serializers/collection.py,sha256=V9O4qxw26VX9dSYdbsN0-RNnXEi347Ln8eFLZ003LhA,4646
@@ -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.110.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.110.dist-info/METADATA,sha256=TNwT_yHAFrvDOePQCeCcz0eNaUjVtnf9OMFSHv5CLKM,7663
+django_restit-4.2.110.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.110.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))
 
 

rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.66"
+__version__ = "4.2.110"

rest/extra/hostinfo.py

@@ -25,13 +25,47 @@ def getTcpEstablishedCount():
     return len(getTcpEstablished())
 
 
-def getTcpEstablished():
+def getTcpEstablished(filter=None):
     cons = psutil.net_connections(kind="tcp")
     established = []
     for c in cons:
         if c.status == "ESTABLISHED":
             established.append(c)
-    return established
+    return filterConnections(established, filter)
+
+
+def filterConnections(cons, filter):
+    if filter == "https":
+        return [c for c in cons if cons.laddr.port == 443]
+    elif filter == "redis":
+        return [c for c in cons if cons.raddr.port == 6379]
+    elif filter == "postgres":
+        return [c for c in cons if cons.raddr.port == 5432]
+    elif filter == "unknown":
+        return [c for c in cons if cons.raddr.port not in [5432, 6379] and cons.laddr.port != 443]
+    return cons
+
+
+def consToDict(cons):
+    out = []
+    cid = 0
+    for c in cons:
+        cid += 1
+        out.append({
+            "id": cid,
+            "type": c.type.name,
+            "status": c.status,
+            "family": c.family.name,
+            "raddr": {
+                "port": c.raddr.port,
+                "ip": c.raddr.ip
+            },
+            "laddr": {
+                "port": c.laddr.port,
+                "ip": c.laddr.ip
+            }
+        })
+    return out
 
 
 def getVersions(out=None):

rest/rpc.py

@@ -60,3 +60,13 @@ def on_get_system_info(request):
         include_blocked=request.DATA.get("blocked"))
     return views.restGet(request, out)
 
+
+@url('system/cons')
+def on_get_system_cons(request):
+    key = request.DATA.get("key")
+    if SYS_INFO_KEY is None or key != SYS_INFO_KEY:
+        if not ALLOW_PUBLIC_SYS_INFO and not request.user.is_authenticated:
+            return views.restPermissionDenied(request, "system info is not public", 565)
+    cons = hostinfo.getTcpEstablished(filter=request.DATA.get("filter"))
+    return views.restList(request, hostinfo.consToDict(cons))
+