Bläddra i källkod

HUE-7020 [indexer] Provide the real lib_path at the Morphline config generation

Romain Rigaux 8 år sedan
förälder
incheckning
ffe5890

+ 1 - 1
desktop/libs/indexer/src/indexer/api3.py

@@ -309,6 +309,6 @@ def _index(request, file_format, collection_name, query=None, start_time=None, l
   else:
     input_path = None
 
-  morphline = indexer.generate_morphline_config(collection_name, file_format, unique_field)
+  morphline = indexer.generate_morphline_config(collection_name, file_format, unique_field, lib_path=lib_path)
 
   return indexer.run_morphline(request, collection_name, morphline, input_path, query, start_time=start_time, lib_path=lib_path)

+ 6 - 3
desktop/libs/indexer/src/indexer/indexers/morphline.py

@@ -170,9 +170,12 @@ class MorphlineIndexer(object):
 
     return field_type.regex.replace('\\', '\\\\')
 
-  def generate_morphline_config(self, collection_name, data, uuid_name=None):
-    geolite_loc = os.path.join(CONFIG_INDEXER_LIBS_PATH.get(), "GeoLite2-City.mmdb")
-    grok_dicts_loc = os.path.join(CONFIG_INDEXER_LIBS_PATH.get(), "grok_dictionaries")
+  def generate_morphline_config(self, collection_name, data, uuid_name=None, lib_path=None):
+    if lib_path is None:
+      lib_path = CONFIG_INDEXER_LIBS_PATH.get()
+
+    geolite_loc = os.path.join(lib_path, "GeoLite2-City.mmdb")
+    grok_dicts_loc = os.path.join(lib_path, "grok_dictionaries")
 
     properties = {
       "collection_name": collection_name,