Format datetime as UTC (#44)

IR-774

Author: Zawadidone

api_client/python/timesketch_api_client/search.py

@@ -19,10 +19,7 @@
 
 import pandas
 
-from . import error
-from . import resource
-from . import searchtemplate
-
+from . import error, resource, searchtemplate
 
 logger = logging.getLogger("timesketch_api.search")
 
@@ -1141,18 +1138,10 @@ def to_pandas(self):
             return_list.append(source)
 
         data_frame = pandas.DataFrame(return_list)
-        if "datetime" in data_frame:
-            try:
-                data_frame["datetime"] = pandas.to_datetime(data_frame.datetime)
-            except pandas.errors.OutOfBoundsDatetime:
-                pass
-        elif "timestamp" in data_frame:
-            try:
-                data_frame["datetime"] = pandas.to_datetime(
-                    data_frame.timestamp / 1e6, utc=True, unit="s"
-                )
-            except pandas.errors.OutOfBoundsDatetime:
-                pass
+        try:
+            data_frame["datetime"] = pandas.to_datetime(data_frame.datetime, utc=True)
+        except pandas.errors.OutOfBoundsDatetime:
+            pass
 
         return data_frame
 

api_client/python/timesketch_api_client/sketch.py

@@ -1034,10 +1034,6 @@ def explore(
             RuntimeError: if the query is missing needed values, or if the
                 sketch is archived.
         """
-        logger.warning(
-            "Using this function is discouraged, please consider using "
-            "the search.Search object instead, which is more flexible."
-        )
 
         if not (query_string or query_filter or query_dsl or view):
             raise RuntimeError("You need to supply a query or view")

api_client/python/timesketch_api_client/test_lib.py

@@ -216,9 +216,13 @@ def json(self):
         },
         "objects": [
             {
-                "id": 1,
-                "name": "test",
-                "searchindex": {"id": 1234, "index_name": "test"},
+                "_id": 1234,
+                "_index": "test",
+                "_source": {
+                    "datetime": "2012-03-14T08:12:03.998281",
+                    "id": 1,
+                    "name": "test",
+                },
             }
         ],
     }
@@ -229,9 +233,13 @@ def json(self):
         },
         "objects": [
             {
-                "id": 2,
-                "name": "more_test",
-                "searchindex": {"id": 42, "index_name": "even_more_test"},
+                "_id": 42,
+                "_index": "even_more_test",
+                "_source": {
+                    "datetime": "2012-03-14T08:12:03.998281",
+                    "id": 2,
+                    "name": "more_test",
+                },
             }
         ],
     }