From 548dd7b88bb2cce0cac29f4e6ce920d30eedfdc1 Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Thu, 11 Feb 2021 15:45:26 +0800 Subject: [PATCH] Cross-reference sampling/pubsub and apmpackage --- .../apm/0.1.0/data_stream/sampled_traces/fields/fields.yml | 2 ++ x-pack/apm-server/sampling/pubsub/datastream.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/apmpackage/apm/0.1.0/data_stream/sampled_traces/fields/fields.yml b/apmpackage/apm/0.1.0/data_stream/sampled_traces/fields/fields.yml index cbef8c0da6e..370b8752662 100644 --- a/apmpackage/apm/0.1.0/data_stream/sampled_traces/fields/fields.yml +++ b/apmpackage/apm/0.1.0/data_stream/sampled_traces/fields/fields.yml @@ -1,3 +1,5 @@ +# When changing fields or ILM policy, make sure to update +# x-pack/apm-server/sampling/pubsub/datastream.go. - name: observer.id type: keyword description: | diff --git a/x-pack/apm-server/sampling/pubsub/datastream.go b/x-pack/apm-server/sampling/pubsub/datastream.go index aad7859a8c9..016848cb0a6 100644 --- a/x-pack/apm-server/sampling/pubsub/datastream.go +++ b/x-pack/apm-server/sampling/pubsub/datastream.go @@ -58,6 +58,9 @@ func SetupDataStream( return nil } +// NOTE(axw) these replicate the index template and ILM policy created by Fleet, +// and should be kept in sync with apmpackage/apm/.../data_stream/sampled_traces. + const ilmPolicy = `{ "policy": { "phases": {