Merge branch 'topic/timw/fix-timestamp-parsing'

* topic/timw/fix-timestamp-parsing:
  Don't add timezone offset to ISO time, since it results in errors
  Parse 'timestamp' fields from json received from Zeek correctly

CHANGES

@@ -1,3 +1,17 @@
+2.3.0-dev.59 | 2023-12-11 09:56:46 -0700
+
+  * Merge branch 'topic/timw/fix-timestamp-parsing'
+
+    * topic/timw/fix-timestamp-parsing:
+      Don't add timezone offset to ISO time, since it results in errors
+      Parse 'timestamp' fields from json received from Zeek correctly
+
+  * Don't add timezone offset to ISO time, since it results in errors
+
+  * Parse 'timestamp' fields from json received from Zeek correctly
+
+  * Update pathfind submodule for #include fix
+
 2.3.0-dev.55 | 2023-12-01 09:42:11 -0700
 
   * Add section about building for Windows to README

VERSION

@@ -1 +1 @@
-2.3.0-dev.55
+2.3.0-dev.59

src/io/zeek.cc

@@ -733,6 +733,14 @@ static std::pair<Value, value::Type> from_json(const nlohmann::json& json) {
     if ( type == "timespan" )
         return {to_interval_from_secs(std::stoi(value.get<std::string>())), value::Type::Interval};
 
+    if ( type == "timestamp" ) {
+        std::tm tm = {};
+        std::istringstream ss(value.get<std::string>());
+        ss >> std::get_time(&tm, "%FT%T");
+        auto tp = std::chrono::system_clock::from_time_t(std::mktime(&tm));
+        return {tp, value::Type::Time};
+    }
+
     /* Not supported, don't need these.
      *
      * if ( auto x = broker::get_if<broker::address>(&v) )

src/util/helpers.h

@@ -103,7 +103,7 @@ inline std::string to_string_iso(Time t) {
     auto tm = std::localtime(&teatime);
 
     std::stringstream b;
-    b << std::put_time(tm, "%FT%T%z");
+    b << std::put_time(tm, "%FT%T");
     return std::string(b.str());
 }