Delete dashboard now works at folder level

esnet · Dec 18, 2024 · 9f7edeb · 9f7edeb
1 parent 11fdc99
commit 9f7edeb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/autogole-api/src/python/RTMon/worker.py b/autogole-api/src/python/RTMon/worker.py
@@ -113,7 +113,8 @@ def delete_exe(self, filename, fout):
         """Delete Action Execution"""
         self.logger.info('Delete Execution: %s, %s', filename, fout)
         # Delete the dashboard and template from Grafana
-        for dashbName, dashbVals in self.dashboards.items():
+        foldername = self.config.get('grafana_folder', 'Real Time Mon')
+        for dashbName, dashbVals in self.dashboards.get(foldername, {}).items():
             present = True
             for key in ['referenceUUID', 'orchestrator', 'submission']:
                 if fout.get(key, '') not in dashbVals['tags']:
@@ -141,7 +142,8 @@ def running_exe(self, filename, fout):
                 fout['state'] = 'renew'
                 self._updateState(filename, fout)
                 return
-        for dashbName, dashbVals in self.dashboards.items():
+        foldername = self.config.get('grafana_folder', 'Real Time Mon')
+        for dashbName, dashbVals in self.dashboards.get(foldername, {}).items():
             present = True
             for key in ['referenceUUID', 'orchestrator', 'submission']:
                 if fout.get(key, '') not in dashbVals['tags']: