django-restit 4.2.113__py3-none-any.whl → 4.2.115__py3-none-any.whl

{django_restit-4.2.113.dist-info → django_restit-4.2.115.dist-info}/METADATA

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

{django_restit-4.2.113.dist-info → django_restit-4.2.115.dist-info}/RECORD

@@ -113,7 +113,7 @@ incident/migrations/0014_event_group_alter_rulecheck_index.py,sha256=v3gm5k0LVoa
 incident/migrations/0015_rule_title_template_alter_incident_state.py,sha256=FPUDhFwqBC39EjeknRT7BPddEf6ExCjsXVb9LMqIn3U,687
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
-incident/models/event.py,sha256=Dw6fUi2tbLeA_ZRDcvGQNFkCkMGMBdtNeaLikXdAyE8,7769
+incident/models/event.py,sha256=LNKYdqOj_CO4aGvc2dNmy3K-S52Udi_gZ4-wintbs1s,7901
 incident/models/incident.py,sha256=1uLkr7_QEKYsccO-OVmb7YcM8BA3Q6UCWWw2m935YKg,20030
 incident/models/ossec.py,sha256=eUDRGawzuLWobKEVGKfdZisDnyjS_Hlxi0T_GCSLCCI,2252
 incident/models/rules.py,sha256=aRkJ0ZnTv87nAUC1sHVkPExfb3OJ8fgHQIhnCIpIbhQ,7001
@@ -333,7 +333,7 @@ medialib/youtube/upload.py,sha256=MTuPxm1ZC-y5pXAGtLNtp1hBSNZgCKYt1ewP5hwMQHI,28
 medialib/youtube/uritemplate/__init__.py,sha256=ONWR_KRz9au0O-XUUTrO_UN7GHTmZCTKyvflUQb8wxM,4996
 metrics/README.md,sha256=YwbCA2y6xJBlaO6yEtl1zWpqrQ4ZzkQSuQT-h6btET8,2307
 metrics/__init__.py,sha256=70sdDZGOwGIEFWgDkHWPMVODFelo206jp1g-BFV2u_4,90
-metrics/client.py,sha256=WXyyl4C4CUZECJHWrY154uTPMEoJTZoYocVK582i4co,25322
+metrics/client.py,sha256=vc49J0KLLJlryhb77I-ejShDnWGF8NqSU6mhdPv8V2s,25570
 metrics/eod.py,sha256=gnq-tNE7xfm2ah52e2TUyERgUQNwkFuT2rtDv8XOUVQ,9182
 metrics/examples/eod_example.py,sha256=gYtansjsKILVxe8XJD12XPaxmBJ-B6dOXGZG2JTGWA8,1664
 metrics/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=i3s__yG9Z22yx1bmRS4KcS9xtQl2dT7xDnCCeUYFhos,122
+rest/__init__.py,sha256=rpT5GRLaen0ZtXUGON9i6D2o8jTE0wUDdVakkyznoVk,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
@@ -382,7 +382,7 @@ rest/crypto/aes.py,sha256=NOVRBRSHCV-om68YpGySWWG-4kako3iEVjq8hxZWPUU,4372
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
 rest/crypto/util.py,sha256=agFN2OCPHC70tHNGWrMkkZX4Tt_Ty6imoKEMdTkZpKA,4514
 rest/datem.py,sha256=JHMvWG8A-n4g915wrZiCtfuhgcLMgNYMXuzXIEtgaPg,12335
-rest/decorators.py,sha256=ig0LATc3-2mhEJPAWHRbIRM-ZOFyjm6e_F9RhpRWidE,15082
+rest/decorators.py,sha256=AuB4agpog587CUsF8HkAZiHDfs_pueb2rdxXZD7dUUE,15327
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/errors.py,sha256=uKwG9OkLme36etabqK54DMjMQc1fgEoUIAUxXa7WFQw,612
 rest/extra/__init__.py,sha256=YzmNsch5H5FFLkUK9mIAKyoRK_rJCA9HGb0kubp4h30,54
@@ -456,7 +456,7 @@ taskqueue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/admin.py,sha256=E6zXoToS_ea3MdoGjZzF1JiepWFtDSoZUQdan8H-pXI,208
 taskqueue/migrations/0001_initial.py,sha256=JwYib8CK5ftSXlfxKZUcKEEVsXktNB5q3h-2tu9inGk,4738
 taskqueue/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-taskqueue/models.py,sha256=i8v0vQqlz4X3rVFVJsUSldA-26NEPWnsMZF2Kly_1Qo,22398
+taskqueue/models.py,sha256=VQ8Slk6Cm3H7ZDCfFP_b83VL2mpSdOOGTxALTZxQdqo,23726
 taskqueue/periodic.py,sha256=hpXnunJL_cuVQLAKpjTbABbsQ4fvdsV9_gyyK-_53Sk,3844
 taskqueue/rpc.py,sha256=Lf5VUoqCRkfWUAIvx_s508mjAtDPwpiWyxg0ryqWbQA,5793
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
@@ -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.113.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.113.dist-info/METADATA,sha256=GpwHy5Fu9GlB1SztkmqX22MGSuVoAOVvfN3Iv9zgGCQ,7663
-django_restit-4.2.113.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.113.dist-info/RECORD,,
+django_restit-4.2.115.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.115.dist-info/METADATA,sha256=uI2rG3O3i93ljjzF9wkBo86YUx0sUU-eR6FfZ8erZHQ,7663
+django_restit-4.2.115.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.115.dist-info/RECORD,,

incident/models/event.py

@@ -14,6 +14,7 @@ from .rules import Rule
 
 INCIDENT_METRICS = settings.get("INCIDENT_METRICS", False)
 INCIDENT_EVENT_METRICS = settings.get("INCIDENT_EVENT_METRICS", False)
+INCIDENT_EVENT_GRANULARITY = settings.get("INCIDENT_EVENT_GRANULARITY", "hourly")
 EVENT_TO_INCIDENT_LEVEL = settings.get("EVENT_TO_INCIDENT_LEVEL", 4)
 EVENT_DETAIL_TEMPLATES = settings.get("EVENT_DETAIL_TEMPLATES", None)
 EVENT_META_KEYWORDS = settings.get("EVENT_META_KEYWORDS", [
@@ -144,7 +145,7 @@ class Event(JSONMetaData, rm.RestModel):
         if INCIDENT_EVENT_METRICS:
             if self.hostname:
                 metrics.metric(f"incident_evt_{self.hostname}", category="incident_events", min_granularity="hourly")
-            metrics.metric("incident_evt", category="incident_events", min_granularity="hourly")
+            metrics.metric("incident_evt", min_granularity=INCIDENT_EVENT_GRANULARITY)
 
         self.setProperty("level", self.level)
         if request is not None:
@@ -199,9 +200,10 @@ class Event(JSONMetaData, rm.RestModel):
         self.incident = incident
         self.save()
         if INCIDENT_METRICS:
+            # we want to track any incidents, including bundles
             if self.hostname:
                 metrics.metric(f"incidents_{self.hostname}", category="incidents", min_granularity="hourly")
-            metrics.metric("incidents", category="incidents", min_granularity="hourly")
+            metrics.metric("incidents", min_granularity=INCIDENT_EVENT_GRANULARITY)
 
         try:
             incident.triggerAction()

metrics/client.py

@@ -607,6 +607,10 @@ class R(object):
             data[slug].append(v)
 
         # Now, reorganize data for our end result.
+        if len(slugs) == 0:
+            periods = self.build_periods("junk", since, granularity=granularity, samples=samples)
+            values = [0 for p in periods]
+            return dict(periods=periods, data=[dict(slug="na", values=values)])
         periods = self.build_periods(slugs[0], since, granularity=granularity, samples=samples)
         metrics = {'periods': periods, 'data': []}
         for slug, values in data.items():

rest/__init__.py

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

rest/decorators.py

@@ -25,6 +25,7 @@ import traceback
 REST_METRICS = settings.get("REST_METRICS", False)
 REST_METRICS_BY_ENDPOINT = settings.get("REST_METRICS_BY_ENDPOINT", False)
 REST_METRICS_IGNORE = settings.get("REST_METRICS_IGNORE", [])
+REST_METRICS_GRANULARITY = settings.get("REST_METRICS_GRANULARITY", "daily")
 REST_MODULE_NAME = settings.get("REST_MODULE_NAME", "rpc")
 
 
@@ -55,17 +56,17 @@ def postpone(function):
 def rest_error_catcher(func, request, *args, **kwargs):
     try:
         if REST_METRICS:
-            metrics.metric("rest_calls")
+            metrics.metric("rest_calls", min_granularity=REST_METRICS_GRANULARITY)
             if REST_METRICS_BY_ENDPOINT:
                 slug_path = request.path.replace("/", "__")
-                metrics.metric(f"rest_call_{slug_path}", category="rest_calls")
+                metrics.metric(f"rest_call_{slug_path}", category="rest_calls", min_granularity=REST_METRICS_GRANULARITY)
         return func(request, *args, **kwargs)
     except PermissionDeniedException as err:
         return rv.restPermissionDenied(request, err.reason, err.code)
     except RestError as err:
         rh.log_exception("REST ERROR", request.path, err.reason)
         if settings.get("REST_ERROR_METRICS", True):
-            metrics.metric("rest_errors")
+            metrics.metric("rest_errors", min_granularity=REST_METRICS_GRANULARITY)
         if settings.get("REST_ERROR_EVENTS", True):
             incident.exception_event(
                 request, f"{err.code}: {err.reason}", level=7,
@@ -75,7 +76,7 @@ def rest_error_catcher(func, request, *args, **kwargs):
     except Exception as err:
         rh.log_exception("REST EXCEPTION", request.path)
         if settings.get("REST_ERROR_METRICS", True):
-            metrics.metric("rest_errors")
+            metrics.metric("rest_errors", min_granularity=REST_METRICS_GRANULARITY)
         try:
             body = request.body.decode('utf-8')
         except Exception:

taskqueue/models.py

@@ -8,6 +8,7 @@ from rest import crypto
 from ws4redis import client as redis
 from account.models import Member
 import importlib
+import metrics
 
 import traceback
 
@@ -34,6 +35,12 @@ TASK_STATES = [
 TQ_RETRY_BACKOFF_FACTOR = settings.get("TQ_RETRY_BACKOFF_FACTOR", 2)
 TQ_RETRY_ATTEMPTS = settings.get("TQ_RETRY_ATTEMPTS", 5)
 TQ_RETRY_DELAY = settings.get("TQ_RETRY_DELAY", 60)
+TQ_METRICS = settings.get("TQ_METRICS", True)
+TQ_METRICS_GRANULARITY = settings.get("TQ_METRICS_GRANULARITY", "hourly")
+TQ_METRICS_CREATED = settings.get("TQ_METRICS_CREATED", False)
+TQ_METRICS_FUNCTION = settings.get("TQ_METRICS_FUNCTION", False)
+TQ_METRICS_CHANNEL = settings.get("TQ_METRICS_CHANNEL", False)
+
 
 def getAppHandler(app_name, fname):
     try:
@@ -225,6 +232,12 @@ class Task(models.Model, RestModel):
         self.runtime = int(time.time() - self._started)
         self.state = TASK_STATE_COMPLETED
         self.save()
+        if TQ_METRICS:
+            metrics.metric("tq_task_completed", min_granularity=TQ_METRICS_GRANULARITY)
+            if TQ_METRICS_CHANNEL:
+                metrics.metric(f"tq_chan_done_{self.channel}", category="tq_chan_done", min_granularity=TQ_METRICS_GRANULARITY)
+            if TQ_METRICS_FUNCTION:
+                metrics.metric(f"tq_func_done_{self.fname}", category="tq_func_done", min_granularity=TQ_METRICS_GRANULARITY)
 
     def failed(self, reason=None, category="taskqueue_errors"):
         if reason and len(reason) > 250:
@@ -233,6 +246,12 @@ class Task(models.Model, RestModel):
         self.state = TASK_STATE_FAILED
         self.notifyError(category=category, reason=reason)
         self.save()
+        if TQ_METRICS:
+            metrics.metric("tq_task_failed", min_granularity=TQ_METRICS_GRANULARITY)
+            if TQ_METRICS_CHANNEL:
+                metrics.metric(f"tq_chan_fail_{self.channel}", category="tq_chan_fail", min_granularity=TQ_METRICS_GRANULARITY)
+            if TQ_METRICS_FUNCTION:
+                metrics.metric(f"tq_func_fail_{self.fname}", category="tq_func_fail", min_granularity=TQ_METRICS_GRANULARITY)
 
     def notifyError(self, category="taskqueue_errors", reason=None):
         handler = f"{self.model}.{self.fname}"
@@ -287,6 +306,8 @@ class Task(models.Model, RestModel):
         out.data = self.data
         if not channel:
             channel = self.channel
+        if TQ_METRICS and TQ_METRICS_CREATED:
+            metrics.metric("tq_task_created", min_granularity=TQ_METRICS_GRANULARITY)
         return redis.publish(channel, out)
 
     def getHandler(self):