Merge pull request #115 from Helene/adhoc_reresh

Trigger adhoc metadata refresh

Author: Helene

source/messages.py

@@ -61,5 +61,7 @@
        'StartWatchingFiles': 'Start watching file changes in the path {}.',
        'StopWatchingFiles': 'Stop watching file changes in the path {}.',
        'PathNoCfgFiles': 'The path does not contain any configuration files.',
+       'NewKeyDetected': 'Detected not known single ts identifiers {}.',
+       'NewKeyAlreadyReported': 'Single ts identifiers {} already reported as not known.',
        'UnhandledError': 'Unhandled error: {}'
        }

source/watcher.py

@@ -46,7 +46,7 @@ def start_watch(self):
         """ Function to start watch in a thread"""
         self.running = True
         if not self.thread:
-            self.thread = Thread(name='ConfigWatchThread', target=self.watch)
+            self.thread = Thread(name='ConfigWatcher', target=self.watch)
             self.thread.start()
             cherrypy.engine.log('Started custom thread %r.' % self.thread.name)
             self.logger.debug(MSG['StartWatchingFiles'].format(self.paths))

source/zimonGrafanaIntf.py

@@ -41,6 +41,10 @@
 from collections import defaultdict
 from timeit import default_timer as timer
 from time import sleep
+from threading import Thread
+
+
+local_cache = []
 
 
 class MetadataHandler(metaclass=Singleton):
@@ -153,6 +157,7 @@ def __getSuggest(self, params):
 
         if params.get('q'):
             searchStr = params['q'].strip()
+            self.logger.trace(f'Suggest for {searchStr} called')
             # if '*' and tagv, then it denotes a grouping key value: do not process
             if not (searchStr == '*' and params['type'] == 'tagv'):
                 # Since grafana sends the candidate string quickly, one character at a time, it
@@ -194,6 +199,7 @@ def __getLookup(self, params):
                     res = LookupResultObj(searchMetric)
                     res.parseResultTags(identifiersMap)
                     res.parseRequestTags(filterBy)
+                    self.logger.trace(f'lookUp result {res}')
                     resp = res.__dict__
 
             except Exception as e:
@@ -545,6 +551,7 @@ def parseTags(self, logger, filtersMap, columnInfo):
             ident = [key.parent]
             ident.extend(key.identifier)
             logger.debug(MSG['ReceivAttrValues'].format('Single ts identifiers', ', '.join(ident)))
+            found = False
             for filtersDict in filtersMap:
                 if all((value in filtersDict.values()) for value in ident):
                     logger.debug(MSG['ReceivAttrValues'].format('filtersKeys', ', '.join(filtersDict.keys())))
@@ -553,7 +560,20 @@ def parseTags(self, logger, filtersMap, columnInfo):
                     else:
                         for _key, _value in filtersDict.items():
                             tagsDict[_key].add(_value)
+                    found = True
                     break
+            # detected zimon key, do we need refresh local TOPO?
+            if not found:
+                already_reported = False
+                for cache_item in local_cache:
+                    if set(cache_item) == set(ident):
+                        logger.trace(MSG['NewKeyAlreadyReported'].format(ident))
+                        already_reported = True
+                        break
+                if not already_reported:
+                    logger.debug(MSG['NewKeyDetected'].format(ident))
+                    local_cache.append(ident)
+                    Thread(name='AdHocMetaDataUpdate', target=refresh_metadata).start()
 
         for _key, _values in tagsDict.items():
             if len(_values) > 1: