http_logs: set the date formatter for @timestamp (#390)

* Revert "Revert "http_logs: use suitable date formater for @timestamp (#388)" (#389)" This reverts commit b1479ad. * Use ISO 8601 date format when ingest_pipeline==grok
elastic · Apr 10, 2023 · 11c5d6c · 11c5d6c
1 parent b1479ad
commit 11c5d6c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/http_logs/index-runtime-fields.json b/http_logs/index-runtime-fields.json
@@ -11,7 +11,7 @@
     },
     "properties": {
       "@timestamp": {
-        "format": "strict_date_optional_time||epoch_second",
+        "format": "strict_date_optional_time",
         "type": "date"
       },
       "message": {

diff --git a/http_logs/index.json b/http_logs/index.json
@@ -11,7 +11,11 @@
     },
     "properties": {
       "@timestamp": {
-        "format": "strict_date_optional_time||epoch_second",
+        {%- if ingest_pipeline is defined and ingest_pipeline == "grok" %}
+        "format": "strict_date_optional_time",
+        {%- else %}
+        "format": "epoch_second",
+        {%- endif %}
         "type": "date"
       },
       "message": {

diff --git a/http_logs/operations/default.json b/http_logs/operations/default.json
@@ -122,8 +122,8 @@
               {
                 "range": {
                   "@timestamp": {
-                    "gte": "1998-05-01T00:00:00Z",
-                    "lt": "1998-05-02T00:00:00Z"
+                    "gte": {{query_range_ts_start | tojson}},
+                    "lt": {{query_range_ts_end | tojson}}
                   }
                 }
               },
@@ -156,8 +156,8 @@
               {
                 "range": {
                   "@timestamp": {
-                    "gte": "1998-05-01T00:00:00Z",
-                    "lt": "1998-05-02T00:00:00Z"
+                    "gte": {{query_range_ts_start | tojson}},
+                    "lt": {{query_range_ts_end | tojson}}
                   }
                 }
               },
@@ -232,7 +232,7 @@
         "sort" : [
           {"@timestamp" : "desc"}
         ],
-        "search_after": ["1998-06-10"]
+        "search_after": [{{search_after_ts | tojson}}]
       }
     },
     {
@@ -260,7 +260,7 @@
         "sort" : [
           {"@timestamp" : "asc"}
         ],
-        "search_after": ["1998-06-10"]
+        "search_after": [{{search_after_ts | tojson}}]
       }
     },
     {

diff --git a/http_logs/track.json b/http_logs/track.json
@@ -3,8 +3,14 @@
 
 {%- if runtime_fields is defined %}
   {% set index_body = 'index-runtime-fields.json' %}
+  {% set query_range_ts_start = "1998-05-01T00:00:00Z" %}
+  {% set query_range_ts_end = "1998-05-02T00:00:00Z" %}
+  {% set search_after_ts = "1998-06-10" %}
 {%- else %}
   {% set index_body = 'index.json' %}
+  {% set query_range_ts_start = "893980800" %}
+  {% set query_range_ts_end = "894067200" %}
+  {% set search_after_ts = "897436800" %}
 {%- endif %}
 {
   "version": 2,