django-restit 4.2.116__py3-none-any.whl → 4.2.118__py3-none-any.whl

{django_restit-4.2.116.dist-info → django_restit-4.2.118.dist-info}/METADATA

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

{django_restit-4.2.116.dist-info → django_restit-4.2.118.dist-info}/RECORD

@@ -114,7 +114,7 @@ incident/migrations/0015_rule_title_template_alter_incident_state.py,sha256=FPUD
 incident/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 incident/models/__init__.py,sha256=NMphuhb0RTMf7Ov4QkNv7iv6_I8Wtr3xQ54yjX_a31M,209
 incident/models/event.py,sha256=LNKYdqOj_CO4aGvc2dNmy3K-S52Udi_gZ4-wintbs1s,7901
-incident/models/incident.py,sha256=1uLkr7_QEKYsccO-OVmb7YcM8BA3Q6UCWWw2m935YKg,20030
+incident/models/incident.py,sha256=v3UAQFn5IsoS8vhHEQXmGgZ8cIf8Hnd5elmULDTnYlk,19825
 incident/models/ossec.py,sha256=eUDRGawzuLWobKEVGKfdZisDnyjS_Hlxi0T_GCSLCCI,2252
 incident/models/rules.py,sha256=aRkJ0ZnTv87nAUC1sHVkPExfb3OJ8fgHQIhnCIpIbhQ,7001
 incident/models/ticket.py,sha256=S3kqGQpYLE6Y4M9IKu_60sgW-f592xNr8uufqHnvDoU,2302
@@ -351,7 +351,7 @@ metrics/migrations/0003_metrics_expires.py,sha256=_g4oRv4NHW-4iCQx2s1SiF38LLyFf8
 metrics/migrations/0004_eodmetrics.py,sha256=Ky6ZVMZqa0F_SUp_QFWY7ZKBgVhy9CS4wZcsEhrkSgc,3271
 metrics/migrations/0005_alter_metrics_v1_alter_metrics_v10_alter_metrics_v11_and_more.py,sha256=pmwJfpPJ1RUX_CqM66l6vvV-nrAUPo_GIan0Pc9mQHs,2358
 metrics/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metrics/models.py,sha256=lD9nVzfwdav70ENulqJ8rE8Ui8EWlzdVp05rg8bAlMA,13444
+metrics/models.py,sha256=-sATVwJpN830fb02WR7iX48dYEPHFLKJMJ-5PlS8GOw,13536
 metrics/periodic.py,sha256=IayBLLat40D8FB-A3bYBW9lxm9-IzcugQunojThQ_OU,661
 metrics/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metrics/providers/aws.py,sha256=dIBGFE1Fvszy6rmVrn_Fm1zUDv345q4dBsg9Iit-XCc,8358
@@ -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=zq-aA_H3gyebhcB7jqx-Fz7xYfU8p-8olZwDkM19dMU,122
+rest/__init__.py,sha256=xEslkzQlilJn1Z0GyVu43AgfKG-dqCpYSTh7lo0rFZk,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
@@ -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.116.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.116.dist-info/METADATA,sha256=BToaxG5x14y7PloG6uUtuWk9iPDlNIqPS9_CjfUhCvA,7663
-django_restit-4.2.116.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.116.dist-info/RECORD,,
+django_restit-4.2.118.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.118.dist-info/METADATA,sha256=NWCvCnQ0SAtLaQlZQUGKZEVIzbLf8_VNVAfNE_7Re2M,7663
+django_restit-4.2.118.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.118.dist-info/RECORD,,

incident/models/incident.py

@@ -13,20 +13,9 @@ import time
 
 logger = log.getLogger("incident", filename="incident.log")
 
-EVENT_META_TO_INCIDENT = [
-    "username",
-    "email",
-    "phone",
-    "group_name",
-    "group_id",
-    ("http_user_agent", "user_agent"),
-    "user_agent",
-    "http_url",
-    "error",
-    "error_code",
-    "rule_id",
-    "path"
-]
+EVENT_META_TO_INCIDENT = {
+    "http_user_agent": "user_agent"
+}
 
 INCIDENT_STATE_NEW = 0
 INCIDENT_STATE_OPENED = 1
@@ -139,22 +128,23 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         self.setProperty("event_count", count)
 
     def updateMeta(self, event):
-        for key in EVENT_META_TO_INCIDENT:
-            new_key = key
-            if isinstance(key, tuple):
-                key, new_key = key
-            if key in event.metadata:
-                self.setProperty(new_key, event.metadata[key])
-        self.setProperty("details", event.details)
+        for key in event.metadata:
+            v = event.metadata[key]
+            if not isinstance(v, (str, int, float)):
+                continue
+            if key in EVENT_META_TO_INCIDENT:
+                if isinstance(EVENT_META_TO_INCIDENT[key], tuple):
+                    key = EVENT_META_TO_INCIDENT[key][1]
+            self.setProperty(key, v)
+
+        if event.details:
+            self.setProperty("details", event.details)
+    
         if event.metadata.geoip and event.metadata.geoip.city:
             self.setProperty("city", event.metadata.geoip.city)
             self.setProperty("state", event.metadata.geoip.state)
             self.setProperty("country", event.metadata.geoip.country)
             self.setProperty("isp", event.metadata.geoip.isp)
-        else:
-            for key in ["city", "state", "country", "isp"]:
-                if key in event.metadata:
-                    self.setProperty(new_key, event.metadata[key])
 
     def shouldTriggerAction(self):
         count = self.events.all().count()

metrics/models.py

@@ -46,17 +46,18 @@ def metric(
         m.updateMetrics(keys, data, created)
 
 
-def gauge(slug, keys, data, granularity="daily", group=None, date=None, timezone=None, slug_append=None):
+def gauge(slug, keys, data, granularity="daily", group=None, date=None, timezone=None, slug_append=None, max_granularity=None):
     # guage does not accumulate but just stores the data like a cache
     # if calledf on the same time period it will just update the current numbers
     uuid_key = generate_uuid(slug, group, slug_append)
     granularities = utils.granularities(granularity, granularity)
     date = normalize_date(date, timezone, group)
-    
+    if max_granularity is None:
+        max_granularity = granularity
     uuids = utils.build_keys(
         uuid_key, date,
         min_granularity=granularity,
-        max_granularity=granularity)
+        max_granularity=max_granularity)
 
     for gran, key in zip(granularities, uuids):
         # DO not change slug to uuid_key so we can filter by group using group field
@@ -72,6 +73,7 @@ def gauge(slug, keys, data, granularity="daily", group=None, date=None, timezone
                 group=group, start=utils.date_for_granulatiry(date, gran)))
         m.setMetrics(keys, data, created)
 
+
 def normalize_date(date=None, timezone=None, group=None):
     if date is None:
         date = utils.datetime.utcnow()

rest/__init__.py

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