From 8cf7c8388623af0d241d7e28c811fc760d2b69a9 Mon Sep 17 00:00:00 2001 From: Raj Nishtala Date: Tue, 8 Oct 2024 18:43:56 -0400 Subject: [PATCH] fix(timestamp): Fix the timestamp locator for log sources --- .changelog/3853.fixed.txt | 1 + Vagrantfile | 8 +------- .../testdata/goldenfile/terraform/all_fields.output.yaml | 8 ++++---- .../goldenfile/terraform/collector_fields.output.yaml | 8 ++++---- .../testdata/goldenfile/terraform/default.output.yaml | 8 ++++---- .../terraform/disable_default_metrics.output.yaml | 8 ++++---- .../goldenfile/terraform/disabled_dashboards.output.yaml | 8 ++++---- .../goldenfile/terraform/disabled_monitors.output.yaml | 8 ++++---- .../testdata/goldenfile/terraform/logs_fields.output.yaml | 8 ++++---- .../monitors_with_email_notifications.output.yaml | 8 ++++---- .../terraform/monitors_with_single_email.output.yaml | 8 ++++---- .../goldenfile/terraform/strip_extrapolation.output.yaml | 8 ++++---- .../terraform/tracing-metrics-disabled.output.yaml | 8 ++++---- 13 files changed, 46 insertions(+), 51 deletions(-) create mode 100644 .changelog/3853.fixed.txt diff --git a/.changelog/3853.fixed.txt b/.changelog/3853.fixed.txt new file mode 100644 index 0000000000..544dceff19 --- /dev/null +++ b/.changelog/3853.fixed.txt @@ -0,0 +1 @@ +fix(timestamp): Fix the timestamp locator for log sources \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile index b179e4cec2..944850efc6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,7 +2,7 @@ # vi: set ft=ruby : Vagrant.configure('2') do |config| - config.vm.box = 'bento/ubuntu-22.04-arm64' + config.vm.box = 'ubuntu/focal64' config.vm.disk :disk, size: "50GB", primary: true config.vm.box_check_update = false config.vm.host_name = 'sumologic-kubernetes-collection' @@ -17,12 +17,6 @@ Vagrant.configure('2') do |config| vb.name = 'sumologic-kubernetes-collection' end - config.vm.provider 'parallels' do |vb| - vb.cpus = 8 - vb.memory = 16384 - vb.name = 'sumologic-kubernetes-collection' - end - config.vm.provider "qemu" do |qe, override| override.vm.box = "perk/ubuntu-2204-arm64" qe.gui = false diff --git a/tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml b/tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml index a32a0e408d..c8fe20e7c4 100644 --- a/tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/all_fields.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -758,7 +758,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -768,7 +768,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml b/tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml index 7023674cfe..d86ee77542 100644 --- a/tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/collector_fields.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -707,7 +707,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -717,7 +717,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/default.output.yaml b/tests/helm/testdata/goldenfile/terraform/default.output.yaml index 2352e9bf1f..83165842ae 100644 --- a/tests/helm/testdata/goldenfile/terraform/default.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/default.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -707,7 +707,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -717,7 +717,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml b/tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml index 180a9068c1..f519147f90 100644 --- a/tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/disable_default_metrics.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -702,7 +702,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -712,7 +712,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml b/tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml index 2352e9bf1f..83165842ae 100644 --- a/tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/disabled_dashboards.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -707,7 +707,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -717,7 +717,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml b/tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml index 2352e9bf1f..83165842ae 100644 --- a/tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/disabled_monitors.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -707,7 +707,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -717,7 +717,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml b/tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml index be1e22e8a1..6b1e0d1a35 100644 --- a/tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/logs_fields.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -707,7 +707,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -717,7 +717,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml b/tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml index 2352e9bf1f..83165842ae 100644 --- a/tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/monitors_with_email_notifications.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -707,7 +707,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -717,7 +717,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml b/tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml index 2352e9bf1f..83165842ae 100644 --- a/tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/monitors_with_single_email.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -707,7 +707,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -717,7 +717,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml b/tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml index 2627425448..c5012e2219 100644 --- a/tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/strip_extrapolation.output.yaml @@ -598,7 +598,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -610,7 +610,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -708,7 +708,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -718,7 +718,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs" diff --git a/tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml b/tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml index 2352e9bf1f..83165842ae 100644 --- a/tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml +++ b/tests/helm/testdata/goldenfile/terraform/tracing-metrics-disabled.output.yaml @@ -597,7 +597,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -609,7 +609,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ] } @@ -707,7 +707,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "events" @@ -717,7 +717,7 @@ data: "default_date_formats": [ { "format": "epoch", - "locator": "\\\"timestamp\\\":(\\\\d+)" + "locator": "\"timestamp\":(\\d+)" } ], "name": "logs"