Merge branch 'master' into ryandeivert-bug-fix-200

airbnb · Jun 27, 2017 · 96014b5 · 96014b5
2 parents fb0bfec + a9a7e3f
commit 96014b5
Showing 1 changed file with 42 additions and 4 deletions.
diff --git a/conf/logs.json b/conf/logs.json
@@ -7,7 +7,7 @@
       "md5": "string",
       "node_id": "string",
       "size": "string",
-      "timestamp": "string",
+      "timestamp": "float",
       "type": "string"
     },
     "parser": "json"
@@ -30,12 +30,14 @@
       "remote_ip": "string",
       "remote_port": "string",
       "sensor_id": "string",
-      "timestamp": "string",
+      "timestamp": "float",
       "type": "string"
     },
     "parser": "json",
     "configuration": {
       "optional_top_level_keys": [
+        "local_ip",
+        "local_port",
         "remote_ip",
         "remote_port"
       ]
@@ -94,7 +96,7 @@
       "segment_id": "integer",
       "sensor_id": "integer",
       "server_name": "string",
-      "timestamp": "string",
+      "timestamp": "float",
       "type": "string"
     },
     "parser": "json",
@@ -276,7 +278,7 @@
       "product_version": "string",
       "server_added_timestamp": "string",
       "signed": "string",
-      "timestamp": "string"
+      "timestamp": "float"
     },
     "parser": "json",
     "configuration": {
@@ -317,6 +319,30 @@
     },
     "parser": "json"
   },
+  "carbonblack:feed.ingress.hit.binary": {
+    "schema": {
+      "cb_server": "string",
+      "cb_version": "string",
+      "computer_name": "string",
+      "feed_id": "integer",
+      "feed_name": "string",
+      "from_feed_search": "boolean",
+      "group": "string",
+      "hostname": "string",
+      "ioc_attr": {},
+      "ioc_type": "string",
+      "ioc_value": "string",
+      "md5": "string",
+      "os_type": "string",
+      "report_id": "string",
+      "report_score": "integer",
+      "sensor_id": "integer",
+      "server_name": "string",
+      "timestamp": "float",
+      "type": "string"
+    },
+    "parser": "json"
+  },
   "carbonblack:binaryinfo.observed": {
     "schema": {
       "cb_server": "string",
@@ -422,6 +448,18 @@
       }
     }
   },
+  "carbonblack:feed.synchronized": {
+    "schema": {
+      "cb_server": "string",
+      "feed_id": "integer",
+      "feed_name": "string",
+      "feed_update_time": "string",
+      "scan_start_time": "string",
+      "timestamp": "float",
+      "type": "string"
+    },
+    "parser": "json"
+  },
   "cloudwatch:events": {
     "schema": {
       "account": "integer",