Set job ids (use entity id as job identifier) when adding jobs

Author: Anze

collector.py

@@ -165,7 +165,7 @@ def __init__(self, backend_url, bot_token):
     @abstractmethod
     def jobs(self):
         """
-            Returns a list of (intervals, job_func, job_data) tuples. Usually calls
+            Returns a list of (job_id, intervals, job_func, job_data) tuples. Usually calls
             `fetch_job_configs` to get input data.
         """
 
@@ -260,9 +260,9 @@ def execute(self):
         executor = IntervalsAwareProcessPoolExecutor(10)
         scheduler.add_executor(executor, 'iaexecutor')
 
-        for intervals, job_func, job_data in self.jobs():
+        for job_id, intervals, job_func, job_data in self.jobs():
             trigger = MultipleIntervalsTrigger(intervals)
-            scheduler.add_job(job_func, trigger=trigger, executor='iaexecutor', kwargs=job_data)
+            scheduler.add_job(job_func, id=job_id, trigger=trigger, executor='iaexecutor', kwargs=job_data)
 
         try:
             scheduler.start()

snmpcollector.py

@@ -198,7 +198,8 @@ def jobs(self):
         for entity_info in self.fetch_job_configs('snmp'):
             intervals = list(set([sensor_info["interval"] for sensor_info in entity_info["sensors"]]))
             job_info = { **entity_info, "backend_url": self.backend_url, "bot_token": self.bot_token }
-            yield intervals, SNMPCollector.do_snmp, job_info
+            job_id = str(entity_info["entity_id"])
+            yield job_id, intervals, SNMPCollector.do_snmp, job_info
 
 
 if __name__ == "__main__":