django-restit 4.2.113__tar.gz → 4.2.114__tar.gz

{django_restit-4.2.113 → django_restit-4.2.114}/PKG-INFO

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

{django_restit-4.2.113 → django_restit-4.2.114}/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()

{django_restit-4.2.113 → django_restit-4.2.114}/pyproject.toml

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

{django_restit-4.2.113 → django_restit-4.2.114}/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.114"

{django_restit-4.2.113 → django_restit-4.2.114}/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):