Merge branch 'main' into security/timeline-openapi-fixes

elastic · Jun 19, 2024 · 1e5e82d · 1e5e82d
2 parents 49e5efd + 05723d4
commit 1e5e82d
Show file tree

Hide file tree

Showing 76 changed files with 3,032 additions and 1,332 deletions.
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/infra/host.ts b/packages/kbn-apm-synthtrace-client/src/lib/infra/host.ts
@@ -16,6 +16,7 @@ interface HostDocument extends Fields {
   'host.name': string;
   'metricset.name'?: string;
   'event.module'?: string;
+  'service.name'?: string;
 }
 
 class Host extends Entity<HostDocument> {

diff --git a/packages/kbn-apm-synthtrace-client/src/lib/logs/index.ts b/packages/kbn-apm-synthtrace-client/src/lib/logs/index.ts
@@ -25,11 +25,14 @@ export type LogDocument = Fields &
     'host.name'?: string;
     'container.id'?: string;
     'trace.id'?: string;
+    'transaction.id'?: string;
     'agent.id'?: string;
     'agent.name'?: string;
     'orchestrator.cluster.name'?: string;
     'orchestrator.cluster.id'?: string;
     'orchestrator.resource.id'?: string;
+    'kubernetes.pod.uid'?: string;
+    'aws.s3.bucket.name'?: string;
     'orchestrator.namespace'?: string;
     'container.name'?: string;
     'cloud.provider'?: string;
@@ -40,6 +43,7 @@ export type LogDocument = Fields &
     'error.stack_trace'?: string;
     'error.exception.stacktrace'?: string;
     'error.log.stacktrace'?: string;
+    'log.custom': Record<string, unknown>;
   }>;
 
 class Log extends Serializable<LogDocument> {