commit b72f4fbcf1583da27f09f4abb9d8162530bf4559
author Gabe Black <gabeblack@chromium.org> Tue Jan 20 16:47:13 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Feb 05 10:34:04 2015 +0000
tree 56a4b2c5aeb038e7f2e256e2fb107e346e3ae40e
parent c14bfc0f55ebf8a03fa4fdec109fd2557c0fdebb

graphite: Reorganize the elastic search code so we can put it in chromite.

This change reorganizes the elastic search integration code so that it's
separate from the code that, for instance, reads config information from the
autotest global config. That way, it can be moved from chromite without
breaking any dependencies.

BUG=chromium:446291
TEST=Ran stats_es_functionaltest.py. Ran unit tests. Ran a butterfly-paladin
tryjob with --hwtest.

Change-Id: I0dbf135c4f1732d633e5fc9d5edb9e1f4f7199d5
Reviewed-on: https://chromium-review.googlesource.com/242701
Reviewed-by: Dan Shi <dshi@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>

site_utils/host_label_utils.py

diff --git a/site_utils/host_label_utils.py b/site_utils/host_label_utils.py
index ff59d2c..2d6806d 100755
--- a/site_utils/host_label_utils.py
+++ b/site_utils/host_label_utils.py
@@ -21,7 +21,7 @@
 
 import common
 from autotest_lib.client.common_lib import time_utils
-from autotest_lib.client.common_lib.cros.graphite import es_utils
+from autotest_lib.client.common_lib.cros.graphite import autotest_es
 from autotest_lib.frontend import setup_django_environment
 from autotest_lib.frontend.afe import models
 
@@ -62,19 +62,17 @@
     # Search for the latest logged labels before the given days_back.
     # Default is 0, which means the last time host labels were logged.
     t_end = time.time() - days_back*24*3600
-    query_time_index = es_utils.create_range_eq_query_multiple(
+    results = autotest_es.query(
             fields_returned=['time_index'],
             equality_constraints=[('_type', _HOST_LABEL_TIME_INDEX_TYPE),],
             range_constraints=[('time_index', None, t_end)],
             size=1,
             sort_specs=[{'time_index': 'desc'}])
-    results = es_utils.execute_query(query_time_index)
-    count = int(results['hits']['total'])
     t_end_str = time_utils.epoch_time_to_date_string(t_end)
-    if count == 0:
+    if results.total == 0:
         logging.error('No label information was logged before %s.', t_end_str)
         return
-    time_index = results['hits']['hits'][0]['fields']['time_index'][0]
+    time_index = results['time_index'][0]
     logging.info('Host labels were recorded at %s',
                  time_utils.epoch_time_to_date_string(time_index))
 
@@ -86,14 +84,12 @@
     if labels:
         for label in labels:
             equality_constraints.append(('labels', label))
-    query_labels =  es_utils.create_range_eq_query_multiple(
+    results = autotest_es.query(
             fields_returned=['hostname', 'labels'],
             equality_constraints=equality_constraints)
-    results = es_utils.execute_query(query_labels)
 
     host_labels = {}
-    for hit in results['hits']['hits']:
-        hit = es_utils.convert_hit(hit['fields'])
+    for hit in results.hits:
         if 'labels' in hit:
             host_labels[hit['hostname']] = hit['labels']
 
@@ -111,11 +107,11 @@
         info = {'hostname': host.hostname,
                 'labels': [label.name for label in host.labels.all()],
                 'time_index': time_index}
-        es_utils.ESMetadata().post(type_str=_HOST_LABEL_TYPE, metadata=info,
+        autotest_es.post(type_str=_HOST_LABEL_TYPE, metadata=info,
                                    log_time_recorded=False)
 
     # After all host label information is logged, save the time stamp.
-    es_utils.ESMetadata().post(type_str=_HOST_LABEL_TIME_INDEX_TYPE,
+    autotest_es.post(type_str=_HOST_LABEL_TIME_INDEX_TYPE,
                                metadata={'time_index': time_index},
                                log_time_recorded=False)
     logging.info('Finished collecting host labels for %d hosts.', len(hosts))