T53161 Proof of Concept working USER search. WIP js.

pillar/cli/elastic.py

@@ -9,25 +9,49 @@ log = logging.getLogger(__name__)
 manager_elk = Manager(
     current_app, usage="Elastic utilities, like reset_index()")
 
+indexes = ['users', 'nodes']
+
 
 @manager_elk.command
-def reset_index(elk_index):
+def reset_index(elk_index=None):
     """
     Destroy and recreate elastic indices
 
     node, user ...
     """
-    #real_current_app = current_app._get_current_object()._get_current_object()
 
     with current_app.app_context():
         from pillar.api.search import index
+        if not elk_index:
+            index.reset_index(indexes)
+            return
         if elk_index == 'nodes':
-            index.reset_node_index()
+            index.reset_index(['node'])
+            return
+        if elk_index == 'users':
+            index.reset_index(['user'])
+            return
 
 
-@manager_elk.command
-def reindex_nodes():
+def _reindex_users():
+    db = current_app.db()
+    users_coll = db['users']
+    user_count = users_coll.count()
 
+    log.debug('Reindexing %d in Elastic', user_count)
+
+    from pillar.celery.search_index_tasks import prepare_user_data
+    from pillar.api.search import elastic_indexing
+
+    for user in users_coll.find():
+        to_index = prepare_user_data('', user=user)
+        if not to_index:
+            log.debug('missing user..')
+            continue
+        elastic_indexing.push_updated_user(to_index)
+
+
+def _reindex_nodes():
     db = current_app.db()
     nodes_coll = db['nodes']
     node_count = nodes_coll.count()
@@ -40,3 +64,17 @@ def reindex_nodes():
     for node in nodes_coll.find():
         to_index = prepare_node_data('', node=node)
         elastic_indexing.index_node_save(to_index)
+
+
+@manager_elk.command
+def reindex(indexname=None):
+
+    if not indexname:
+        log.debug('reindex everything..')
+        _reindex_nodes()
+        _reindex_users()
+
+    elif indexname == 'users':
+        _reindex_users()
+    elif indexname == 'nodes':
+        _reindex_nodes()