trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

events: use colon as separator for task name and task UID

Browse source 
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
Jens Langhammer 2023-02-13 12:06:29 +01:00
parent 1240ed6c6d
commit 53b25d61f7
No known key found for this signature in database
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
authentik/admin/signals.py
View file

@ -18,4 +18,4 @@ def monitoring_set_workers(sender, **kwargs):
def monitoring_set_tasks(sender, **kwargs): def monitoring_set_tasks(sender, **kwargs):
"""Set task gauges""" """Set task gauges"""
for task in TaskInfo.all().values(): for task in TaskInfo.all().values():
task.set_prom_metrics() task.update_metrics()

13
authentik/events/monitored_tasks.py
View file

@ -63,11 +63,6 @@ class TaskInfo:
task_description: Optional[str] = field(default=None) task_description: Optional[str] = field(default=None)
@property
def html_name(self) -> list[str]:
"""Get task_name, but split on underscores, so we can join in the html template."""
return self.task_name.split("_")
@staticmethod @staticmethod
def all() -> dict[str, "TaskInfo"]: def all() -> dict[str, "TaskInfo"]:
"""Get all TaskInfo objects""" """Get all TaskInfo objects"""
@ -82,7 +77,7 @@ class TaskInfo:
"""Delete task info from cache""" """Delete task info from cache"""
return cache.delete(CACHE_KEY_PREFIX + self.task_name) return cache.delete(CACHE_KEY_PREFIX + self.task_name)
def set_prom_metrics(self): def update_metrics(self):
"""Update prometheus metrics""" """Update prometheus metrics"""
start = default_timer() start = default_timer()
if hasattr(self, "start_timestamp"): if hasattr(self, "start_timestamp"):
@ -101,9 +96,9 @@ class TaskInfo:
"""Save task into cache""" """Save task into cache"""
key = CACHE_KEY_PREFIX + self.task_name key = CACHE_KEY_PREFIX + self.task_name
if self.result.uid: if self.result.uid:
key += f"/{self.result.uid}" key += f":{self.result.uid}"
self.task_name += f"/{self.result.uid}" self.task_name += f":{self.result.uid}"
self.set_prom_metrics() self.update_metrics()
cache.set(key, self, timeout=timeout_hours * 60 * 60) cache.set(key, self, timeout=timeout_hours * 60 * 60)