From 6cbad96209c35b900880cc5f6661ac0e6402fdf9 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 09:14:00 -0700 Subject: [PATCH] align all schema mapping with labels metadata (#922) (#926) * align all schema mapping components to contain the following metadata info: labels: list of the relevant labels that are associated with this mapping component or index template Signed-off-by: YANGDB * add labels to the integration config Signed-off-by: YANGDB * update integration.config schema with the new labels field Signed-off-by: YANGDB * remove duplicate meta section inside the logs index template Signed-off-by: YANGDB * update logs-*.mapping labels formating update types.ts labels field Signed-off-by: YANGDB --------- Signed-off-by: YANGDB (cherry picked from commit beece94ede1c3c8e919bd26df14caa0f5cfcf8d7) Co-authored-by: YANGDB (cherry picked from commit e1a99ff16819d628e4b8a617a488c6a6da55c830) --- auto_sync_commit_metadata.json | 4 +- .../repository/apache/apache-1.0.0.json | 6 +- .../schemas/communication-1.0.0.mapping.json | 5 +- .../apache/schemas/http-1.0.0.mapping.json | 5 +- .../schemas/logs_apache-1.0.0.mapping.json | 438 ++++++++--------- .../aws_cloudfront/aws_cloudfront-1.0.0.json | 1 + .../schemas/aws_cloudfront-1.0.0.mapping.json | 3 +- .../schemas/aws_s3-1.0.0.mapping.json | 3 +- .../schemas/cloud-1.0.0.mapping.json | 3 +- .../logs-aws_cloudfront-1.0.0.mapping.json | 20 +- .../aws_cloudtrail/aws_cloudtrail-1.0.0.json | 1 + .../schemas/aws_cloudtrail-1.0.0.mapping.json | 3 +- .../schemas/aws_s3-1.0.0.mapping.json | 3 +- .../schemas/cloud-1.0.0.mapping.json | 3 +- .../logs-aws_cloudtrail-1.0.0.mapping.json | 20 +- .../repository/aws_elb/aws_elb-1.0.0.json | 9 + .../schemas/aws_elb-1.0.0.mapping.json | 3 +- .../aws_elb/schemas/cloud-1.0.0.mapping.json | 3 +- .../schemas/communication-1.0.0.mapping.json | 5 +- .../aws_elb/schemas/http-1.0.0.mapping.json | 5 +- .../schemas/logs_elb-1.0.0.mapping.json | 428 ++++++++-------- .../aws_elb/schemas/url-1.0.0.mapping.json | 5 +- .../repository/aws_rds/aws_rds-1.0.0.json | 1 + .../schemas/aws_rds-1.0.0.mapping.json | 3 +- .../aws_rds/schemas/aws_s3-1.0.0.mapping.json | 3 +- .../aws_rds/schemas/cloud-1.0.0.mapping.json | 3 +- .../schemas/logs_rds-1.0.0.mapping.json | 21 +- .../repository/aws_s3/aws_s3-1.0.0.json | 1 + .../aws_s3/schemas/aws_s3-1.0.0.mapping.json | 3 +- .../aws_s3/schemas/cloud-1.0.0.mapping.json | 3 +- .../aws_s3/schemas/logs_s3-1.0.0.mapping.json | 20 +- .../aws_vpc_flow/aws_vpc_flow-1.0.0.json | 1 + .../schemas/aws_s3-1.0.0.mapping.json | 3 +- .../schemas/aws_vpc_flow-1.0.0.mapping.json | 3 +- .../schemas/cloud-1.0.0.mapping.json | 3 +- .../schemas/communication-1.0.0.mapping.json | 255 +++++----- .../schemas/logs_vpc-1.0.0.mapping.json | 20 +- .../schemas/s3-1.0.0.mapping.json | 40 -- .../repository/aws_waf/aws_waf-1.0.0.json | 1 + .../aws_waf/schemas/aws_s3-1.0.0.mapping.json | 3 +- .../schemas/aws_waf-1.0.0.mapping.json | 3 +- .../aws_waf/schemas/cloud-1.0.0.mapping.json | 57 ++- .../schemas/logs_waf-1.0.0.mapping.json | 20 +- .../__data__/repository/k8s/k8s-1.0.0.json | 1 + .../k8s/schemas/cloud-1.0.0.mapping.json | 57 ++- .../k8s/schemas/container-1.0.0.mapping.json | 5 +- .../k8s/schemas/k8s-1.0.0.mapping.json | 3 +- .../k8s/schemas/logs-k8s-1.0.0.mapping.json | 461 +++++++++--------- .../repository/nginx/nginx-1.0.0.json | 1 + .../schemas/communication-1.0.0.mapping.json | 3 +- .../nginx/schemas/http-1.0.0.mapping.json | 3 +- .../nginx/schemas/logs-1.0.0.mapping.json | 20 +- server/adaptors/integrations/types.ts | 1 + server/adaptors/integrations/validators.ts | 1 + 54 files changed, 970 insertions(+), 1029 deletions(-) delete mode 100644 server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/s3-1.0.0.mapping.json diff --git a/auto_sync_commit_metadata.json b/auto_sync_commit_metadata.json index 59086a3d9..fced4f267 100644 --- a/auto_sync_commit_metadata.json +++ b/auto_sync_commit_metadata.json @@ -1,4 +1,4 @@ { - "last_github_commit": "398335e5c910aed6e2b17b6ce0e1b4360019c1f6", - "last_gitfarm_commit": "902dcde5a1ab483d5a0b7acc4fbda383c6e9df37" + "last_github_commit": "e1a99ff16819d628e4b8a617a488c6a6da55c830", + "last_gitfarm_commit": "c79ccfd7c5a5e55837fc2f7bcaf5227bc47764a8" } \ No newline at end of file diff --git a/server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json b/server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json index c8c90977c..53c3c4829 100644 --- a/server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json @@ -5,7 +5,11 @@ "description": "Apache web logs collector", "license": "Apache-2.0", "type": "logs_apache", - "author": "OpenSearch", + "labels": [ + "log", + "communication", + "http"], + "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/apache/info", "statics": { "logo": { diff --git a/server/adaptors/integrations/__data__/repository/apache/schemas/communication-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/apache/schemas/communication-1.0.0.mapping.json index b15d05786..97263ad26 100644 --- a/server/adaptors/integrations/__data__/repository/apache/schemas/communication-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/apache/schemas/communication-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "communication" + "component": "communication", + "labels": ["communication"] }, "properties": { "communication": { @@ -131,4 +132,4 @@ } } } -} \ No newline at end of file +} diff --git a/server/adaptors/integrations/__data__/repository/apache/schemas/http-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/apache/schemas/http-1.0.0.mapping.json index b5f7d8ed6..8a1e18f04 100644 --- a/server/adaptors/integrations/__data__/repository/apache/schemas/http-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/apache/schemas/http-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "http" + "component": "http", + "labels": ["http"] }, "dynamic_templates": [ { @@ -162,4 +163,4 @@ } } } -} \ No newline at end of file +} diff --git a/server/adaptors/integrations/__data__/repository/apache/schemas/logs_apache-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/apache/schemas/logs_apache-1.0.0.mapping.json index cada132ea..d9800c773 100644 --- a/server/adaptors/integrations/__data__/repository/apache/schemas/logs_apache-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/apache/schemas/logs_apache-1.0.0.mapping.json @@ -1,242 +1,226 @@ { - "index_patterns": [ - "ss4o_logs-apache-*" - ], - "data_stream": {}, - "template": { - "aliases": { - "logs-apache": {} + "index_patterns": [ + "ss4o_logs-apache-*" + ], + "data_stream": {}, + "template": { + "aliases": { + "logs-apache": {} + }, + "mappings": { + "_meta": { + "version": "1.0.0", + "catalog": "observability", + "type": "logs", + "component": "log", + "labels": ["log", "communication", "http"], + "correlations": [ + { + "field": "spanId", + "foreign-schema": "traces", + "foreign-field": "spanId" + }, + { + "field": "traceId", + "foreign-schema": "traces", + "foreign-field": "traceId" + } + ] + }, + "_source": { + "enabled": true + }, + "dynamic_templates": [ + { + "resources_map": { + "mapping": { + "type": "keyword" + }, + "path_match": "resource.*" + } + }, + { + "attributes_map": { + "mapping": { + "type": "keyword" + }, + "path_match": "attributes.*" + } }, - "mappings": { - "_meta": { - "version": "1.0.0", - "catalog": "observability", - "type": "logs", - "component": "log", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] + { + "instrumentation_scope_attributes_map": { + "mapping": { + "type": "keyword" }, - "_source": { - "enabled": true + "path_match": "instrumentationScope.attributes.*" + } + } + ], + "properties": { + "severity": { + "properties": { + "number": { + "type": "long" }, - "dynamic_templates": [ - { - "resources_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "resource.*" - } - }, - { - "attributes_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "attributes.*" - } - }, - { - "instrumentation_scope_attributes_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "instrumentationScope.attributes.*" - } + "text": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 } - ], - "properties": { - "severity": { - "properties": { - "number": { - "type": "long" - }, - "text": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - } - } - } - }, - "attributes": { - "type": "object", - "properties": { - "data_stream": { - "properties": { - "dataset": { - "ignore_above": 128, - "type": "keyword" - }, - "namespace": { - "ignore_above": 128, - "type": "keyword" - }, - "type": { - "ignore_above": 56, - "type": "keyword" - } - } - } - } - }, - "body": { - "type": "text" - }, - "@timestamp": { - "type": "date" - }, - "observedTimestamp": { - "type": "date" - }, - "observerTime": { - "type": "alias", - "path": "observedTimestamp" - }, - "traceId": { - "ignore_above": 256, - "type": "keyword" - }, - "spanId": { - "ignore_above": 256, - "type": "keyword" - }, - "schemaUrl": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - } + } + } + } + }, + "attributes": { + "type": "object", + "properties": { + "data_stream": { + "properties": { + "dataset": { + "ignore_above": 128, + "type": "keyword" }, - "instrumentationScope": { - "properties": { - "name": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 128 - } - } - }, - "version": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - } - }, - "dropped_attributes_count": { - "type": "integer" - }, - "schemaUrl": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - } - } - } + "namespace": { + "ignore_above": 128, + "type": "keyword" }, - "event": { - "properties": { - "domain": { - "ignore_above": 256, - "type": "keyword" - }, - "name": { - "ignore_above": 256, - "type": "keyword" - }, - "source": { - "ignore_above": 256, - "type": "keyword" - }, - "category": { - "ignore_above": 256, - "type": "keyword" - }, - "type": { - "ignore_above": 256, - "type": "keyword" - }, - "kind": { - "ignore_above": 256, - "type": "keyword" - }, - "result": { - "ignore_above": 256, - "type": "keyword" - }, - "exception": { - "properties": { - "message": { - "ignore_above": 1024, - "type": "keyword" - }, - "type": { - "ignore_above": 256, - "type": "keyword" - }, - "stacktrace": { - "type": "text" - } - } - } - } + "type": { + "ignore_above": 56, + "type": "keyword" } + } } + } + }, + "body": { + "type": "text" + }, + "@timestamp": { + "type": "date" + }, + "observedTimestamp": { + "type": "date" + }, + "observerTime": { + "type": "alias", + "path": "observedTimestamp" + }, + "traceId": { + "ignore_above": 256, + "type": "keyword" + }, + "spanId": { + "ignore_above": 256, + "type": "keyword" }, - "settings": { - "index": { - "mapping": { - "total_fields": { - "limit": 10000 - } + "schemaUrl": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "instrumentationScope": { + "properties": { + "name": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 128 + } + } + }, + "version": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "dropped_attributes_count": { + "type": "integer" + }, + "schemaUrl": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + } + } + }, + "event": { + "properties": { + "domain": { + "ignore_above": 256, + "type": "keyword" + }, + "name": { + "ignore_above": 256, + "type": "keyword" + }, + "source": { + "ignore_above": 256, + "type": "keyword" + }, + "category": { + "ignore_above": 256, + "type": "keyword" + }, + "type": { + "ignore_above": 256, + "type": "keyword" + }, + "kind": { + "ignore_above": 256, + "type": "keyword" + }, + "result": { + "ignore_above": 256, + "type": "keyword" + }, + "exception": { + "properties": { + "message": { + "ignore_above": 1024, + "type": "keyword" }, - "refresh_interval": "5s" + "type": { + "ignore_above": 256, + "type": "keyword" + }, + "stacktrace": { + "type": "text" + } + } } + } } + } }, - "composed_of": [ - "communication", - "http" - ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] + "settings": { + "index": { + "mapping": { + "total_fields": { + "limit": 10000 + } + }, + "refresh_interval": "5s" + } } -} \ No newline at end of file + }, + "composed_of": [ + "communication", + "http" + ], + "version": 1 +} diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudfront/aws_cloudfront-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_cloudfront/aws_cloudfront-1.0.0.json index 0bbce27d1..1f44ebd41 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudfront/aws_cloudfront-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudfront/aws_cloudfront-1.0.0.json @@ -5,6 +5,7 @@ "description": "AWS cloudfront Object Store", "license": "Apache-2.0", "type": "logs-aws_cloudfront", + "labels": ["log","aws","s3","cloud","cloudfront"], "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_cloudfront/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/aws_cloudfront-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/aws_cloudfront-1.0.0.mapping.json index 48b84a486..fa54bb36e 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/aws_cloudfront-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/aws_cloudfront-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_cloudfront" + "component": "aws_cloudfront", + "labels": ["aws","cloudfront"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/aws_s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/aws_s3-1.0.0.mapping.json index 24f60ec8e..f948597fc 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/aws_s3-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/aws_s3-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "s3" + "component": "s3", + "labels": ["aws","s3"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/cloud-1.0.0.mapping.json index 8965129b3..e167c16ef 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/cloud-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/cloud-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "cloud" + "component": "cloud", + "labels": ["cloud"] }, "properties": { "cloud": { diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/logs-aws_cloudfront-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/logs-aws_cloudfront-1.0.0.mapping.json index af4efa933..f04ddcb8f 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/logs-aws_cloudfront-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudfront/schemas/logs-aws_cloudfront-1.0.0.mapping.json @@ -14,6 +14,7 @@ "catalog": "observability", "type": "logs", "component": "log", + "labels": ["log","aws","s3","cloud","cloudfront"], "correlations": [ { "field": "spanId", @@ -227,22 +228,5 @@ "aws_cloudfront", "cloud" ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] - } + "version": 1 } diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json index b10c828cf..6bcadeb95 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json @@ -5,6 +5,7 @@ "description": "AWS CloudTrail log collector", "license": "Apache-2.0", "type": "logs-aws_cloudtrail", + "labels": ["log","aws","s3","cloud","cloudtrail"], "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_cloudtrail/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/aws_cloudtrail-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/aws_cloudtrail-1.0.0.mapping.json index 1c6f97e12..0642fcf47 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/aws_cloudtrail-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/aws_cloudtrail-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_cloudtrail" + "component": "aws_cloudtrail", + "labels": ["aws","cloudtrail"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/aws_s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/aws_s3-1.0.0.mapping.json index 204b9c009..06f19e760 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/aws_s3-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/aws_s3-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "s3" + "component": "s3", + "labels": ["aws","s3"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json index 8965129b3..e167c16ef 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/cloud-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "cloud" + "component": "cloud", + "labels": ["cloud"] }, "properties": { "cloud": { diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/logs-aws_cloudtrail-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/logs-aws_cloudtrail-1.0.0.mapping.json index 7239d673d..744fb46e3 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/logs-aws_cloudtrail-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/schemas/logs-aws_cloudtrail-1.0.0.mapping.json @@ -14,6 +14,7 @@ "catalog": "observability", "type": "logs", "component": "log", + "labels": ["log","aws","s3","cloud","cloudtrail"], "correlations": [ { "field": "spanId", @@ -227,22 +228,5 @@ "aws_cloudtrail", "aws_s3" ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] - } + "version": 1 } diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json index 2f9a07f77..3731287f0 100644 --- a/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json @@ -5,6 +5,15 @@ "description": "AWS Elastic Load Balancer collector", "license": "Apache-2.0", "type": "logs_elb", + "labels": [ + "log", + "aws", + "communication", + "http", + "cloud", + "elb", + "url" + ], "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_elb/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/aws_elb-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/aws_elb-1.0.0.mapping.json index 67a2757a6..fdc1188e6 100644 --- a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/aws_elb-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/aws_elb-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_elb" + "component": "aws_elb", + "labels": ["aws","elb"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/cloud-1.0.0.mapping.json index 8965129b3..e167c16ef 100644 --- a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/cloud-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/cloud-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "cloud" + "component": "cloud", + "labels": ["cloud"] }, "properties": { "cloud": { diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/communication-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/communication-1.0.0.mapping.json index b15d05786..d1793ee02 100644 --- a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/communication-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/communication-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "communication" + "component": "communication", + "labels": ["communication"] }, "properties": { "communication": { @@ -131,4 +132,4 @@ } } } -} \ No newline at end of file +} diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/http-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/http-1.0.0.mapping.json index b5f7d8ed6..1c03fe3d6 100644 --- a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/http-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/http-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "http" + "component": "http", + "labels": ["http"] }, "dynamic_templates": [ { @@ -162,4 +163,4 @@ } } } -} \ No newline at end of file +} diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json index c4a75762f..7e365775b 100644 --- a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/logs_elb-1.0.0.mapping.json @@ -1,249 +1,233 @@ { - "index_patterns": [ - "ss4o_logs-aws_elb-*" - ], - "data_stream": {}, - "template": { - "aliases": { - "logs-elb": {} + "index_patterns": [ + "ss4o_logs-aws_elb-*" + ], + "data_stream": {}, + "template": { + "aliases": { + "logs-elb": {} + }, + "mappings": { + "_meta": { + "version": "1.0.0", + "catalog": "observability", + "type": "logs", + "component": "log", + "labels": ["log", "aws", "communication", "http", "cloud", "elb", "url"], + "correlations": [ + { + "field": "spanId", + "foreign-schema": "traces", + "foreign-field": "spanId" + }, + { + "field": "traceId", + "foreign-schema": "traces", + "foreign-field": "traceId" + } + ] }, - "mappings": { - "_meta": { - "version": "1.0.0", - "catalog": "observability", - "type": "logs", - "component": "log", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" + "_source": { + "enabled": true + }, + "dynamic_templates": [ + { + "resources_map": { + "mapping": { + "type": "keyword" }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] + "path_match": "resource.*" + } }, - "_source": { - "enabled": true + { + "attributes_map": { + "mapping": { + "type": "keyword" + }, + "path_match": "attributes.*" + } }, - "dynamic_templates": [ - { - "resources_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "resource.*" - } - }, - { - "attributes_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "attributes.*" - } - }, - { - "instrumentation_scope_attributes_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "instrumentationScope.attributes.*" - } + { + "instrumentation_scope_attributes_map": { + "mapping": { + "type": "keyword" + }, + "path_match": "instrumentationScope.attributes.*" } - ], - "properties": { - "severity": { - "properties": { - "number": { - "type": "long" - }, - "text": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } + } + ], + "properties": { + "severity": { + "properties": { + "number": { + "type": "long" + }, + "text": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 } } } - }, - "attributes": { - "type": "object", - "properties": { - "data_stream": { - "properties": { - "dataset": { - "ignore_above": 128, - "type": "keyword" - }, - "namespace": { - "ignore_above": 128, - "type": "keyword" - }, - "type": { - "ignore_above": 56, - "type": "keyword" - } + } + }, + "attributes": { + "type": "object", + "properties": { + "data_stream": { + "properties": { + "dataset": { + "ignore_above": 128, + "type": "keyword" + }, + "namespace": { + "ignore_above": 128, + "type": "keyword" + }, + "type": { + "ignore_above": 56, + "type": "keyword" } } } - }, - "body": { - "type": "text" - }, - "@message": { - "type": "alias", - "path": "body" - }, - "@timestamp": { - "type": "date" - }, - "observedTimestamp": { - "type": "date" - }, - "observerTime": { - "type": "alias", - "path": "observedTimestamp" - }, - "traceId": { - "ignore_above": 256, - "type": "keyword" - }, - "spanId": { - "ignore_above": 256, - "type": "keyword" - }, - "schemaUrl": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } + } + }, + "body": { + "type": "text" + }, + "@message": { + "type": "alias", + "path": "body" + }, + "@timestamp": { + "type": "date" + }, + "observedTimestamp": { + "type": "date" + }, + "observerTime": { + "type": "alias", + "path": "observedTimestamp" + }, + "traceId": { + "ignore_above": 256, + "type": "keyword" + }, + "spanId": { + "ignore_above": 256, + "type": "keyword" + }, + "schemaUrl": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 } - }, - "instrumentationScope": { - "properties": { - "name": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 128 - } + } + }, + "instrumentationScope": { + "properties": { + "name": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 128 } - }, - "version": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } + } + }, + "version": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 } - }, - "dropped_attributes_count": { - "type": "integer" - }, - "schemaUrl": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } + } + }, + "dropped_attributes_count": { + "type": "integer" + }, + "schemaUrl": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 } } } - }, - "event": { - "properties": { - "domain": { - "ignore_above": 256, - "type": "keyword" - }, - "name": { - "ignore_above": 256, - "type": "keyword" - }, - "source": { - "ignore_above": 256, - "type": "keyword" - }, - "category": { - "ignore_above": 256, - "type": "keyword" - }, - "type": { - "ignore_above": 256, - "type": "keyword" - }, - "kind": { - "ignore_above": 256, - "type": "keyword" - }, - "result": { - "ignore_above": 256, - "type": "keyword" - }, - "exception": { - "properties": { - "message": { - "ignore_above": 1024, - "type": "keyword" - }, - "type": { - "ignore_above": 256, - "type": "keyword" - }, - "stacktrace": { - "type": "text" - } + } + }, + "event": { + "properties": { + "domain": { + "ignore_above": 256, + "type": "keyword" + }, + "name": { + "ignore_above": 256, + "type": "keyword" + }, + "source": { + "ignore_above": 256, + "type": "keyword" + }, + "category": { + "ignore_above": 256, + "type": "keyword" + }, + "type": { + "ignore_above": 256, + "type": "keyword" + }, + "kind": { + "ignore_above": 256, + "type": "keyword" + }, + "result": { + "ignore_above": 256, + "type": "keyword" + }, + "exception": { + "properties": { + "message": { + "ignore_above": 1024, + "type": "keyword" + }, + "type": { + "ignore_above": 256, + "type": "keyword" + }, + "stacktrace": { + "type": "text" } } } } } - }, - "settings": { - "index": { - "mapping": { - "total_fields": { - "limit": 10000 - } - }, - "refresh_interval": "5s" - } } }, - "composed_of": [ - "communication", - "http", - "cloud", - "aws_elb", - "url" - ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" + "settings": { + "index": { + "mapping": { + "total_fields": { + "limit": 10000 + } }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] + "refresh_interval": "5s" + } } - } + }, + "composed_of": [ + "communication", + "http", + "cloud", + "aws_elb", + "url" + ], + "version": 1 +} diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/url-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/url-1.0.0.mapping.json index 2a7151e1f..12961efd3 100644 --- a/server/adaptors/integrations/__data__/repository/aws_elb/schemas/url-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_elb/schemas/url-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "url" + "component": "url", + "labels": ["url"] }, "properties": { "url": { @@ -57,4 +58,4 @@ } } } -} \ No newline at end of file +} diff --git a/server/adaptors/integrations/__data__/repository/aws_rds/aws_rds-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_rds/aws_rds-1.0.0.json index 8df7a67c7..d9b05fa50 100644 --- a/server/adaptors/integrations/__data__/repository/aws_rds/aws_rds-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/aws_rds/aws_rds-1.0.0.json @@ -5,6 +5,7 @@ "description": "AWS RDS", "license": "Apache-2.0", "type": "logs_rds", + "labels": ["log","aws","s3","cloud","rds"], "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_rds/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/aws_rds/schemas/aws_rds-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_rds/schemas/aws_rds-1.0.0.mapping.json index f20e480e2..525d7ca73 100644 --- a/server/adaptors/integrations/__data__/repository/aws_rds/schemas/aws_rds-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_rds/schemas/aws_rds-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_rds" + "component": "aws_rds", + "labels": ["aws","rds"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_rds/schemas/aws_s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_rds/schemas/aws_s3-1.0.0.mapping.json index 734320ff4..fbdfa5237 100644 --- a/server/adaptors/integrations/__data__/repository/aws_rds/schemas/aws_s3-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_rds/schemas/aws_s3-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_s3" + "component": "aws_s3", + "labels": ["aws","s3"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_rds/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_rds/schemas/cloud-1.0.0.mapping.json index 8965129b3..e167c16ef 100644 --- a/server/adaptors/integrations/__data__/repository/aws_rds/schemas/cloud-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_rds/schemas/cloud-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "cloud" + "component": "cloud", + "labels": ["cloud"] }, "properties": { "cloud": { diff --git a/server/adaptors/integrations/__data__/repository/aws_rds/schemas/logs_rds-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_rds/schemas/logs_rds-1.0.0.mapping.json index 8629f80b5..4f032e743 100644 --- a/server/adaptors/integrations/__data__/repository/aws_rds/schemas/logs_rds-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_rds/schemas/logs_rds-1.0.0.mapping.json @@ -14,6 +14,7 @@ "catalog": "observability", "type": "logs", "component": "log", + "labels": ["log","aws","s3","cloud","rds"], "correlations": [ { "field": "spanId", @@ -232,22 +233,6 @@ "cloud", "aws_s3" ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] - } + "version": 1 + } diff --git a/server/adaptors/integrations/__data__/repository/aws_s3/aws_s3-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_s3/aws_s3-1.0.0.json index ce461ddb2..468a6a2b1 100644 --- a/server/adaptors/integrations/__data__/repository/aws_s3/aws_s3-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/aws_s3/aws_s3-1.0.0.json @@ -5,6 +5,7 @@ "description": "AWS S3 Object Store", "license": "Apache-2.0", "type": "logs_s3", + "labels": ["log","aws","s3","cloud"], "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_s3/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/aws_s3/schemas/aws_s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_s3/schemas/aws_s3-1.0.0.mapping.json index 24f60ec8e..f948597fc 100644 --- a/server/adaptors/integrations/__data__/repository/aws_s3/schemas/aws_s3-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_s3/schemas/aws_s3-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "s3" + "component": "s3", + "labels": ["aws","s3"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_s3/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_s3/schemas/cloud-1.0.0.mapping.json index 8965129b3..e167c16ef 100644 --- a/server/adaptors/integrations/__data__/repository/aws_s3/schemas/cloud-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_s3/schemas/cloud-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "cloud" + "component": "cloud", + "labels": ["cloud"] }, "properties": { "cloud": { diff --git a/server/adaptors/integrations/__data__/repository/aws_s3/schemas/logs_s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_s3/schemas/logs_s3-1.0.0.mapping.json index 40b7d56f3..fbe2182b7 100644 --- a/server/adaptors/integrations/__data__/repository/aws_s3/schemas/logs_s3-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_s3/schemas/logs_s3-1.0.0.mapping.json @@ -14,6 +14,7 @@ "catalog": "observability", "type": "logs", "component": "log", + "labels": ["log","aws","s3","cloud"], "correlations": [ { "field": "spanId", @@ -226,22 +227,5 @@ "aws_s3", "cloud" ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] - } + "version": 1 } diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json index cffc317ef..c9367e1aa 100644 --- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json @@ -5,6 +5,7 @@ "description": "AWS VPC Flow log collector", "license": "Apache-2.0", "type": "logs_vpc", + "labels": ["log","aws","s3","cloud","communication","vpc"], "author": "Haidong Wang", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_s3-1.0.0.mapping.json index 60e519f36..b4f4fe597 100644 --- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_s3-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_s3-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_s3" + "component": "aws_s3", + "labels": ["aws","s3"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_vpc_flow-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_vpc_flow-1.0.0.mapping.json index 8498c47d2..2a3851cf5 100644 --- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_vpc_flow-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/aws_vpc_flow-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_vpc_flow" + "component": "aws_vpc_flow", + "labels": ["aws","vpc"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json index 8965129b3..e167c16ef 100644 --- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/cloud-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "cloud" + "component": "cloud", + "labels": ["cloud"] }, "properties": { "cloud": { diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/communication-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/communication-1.0.0.mapping.json index cc714dc58..88b211ab9 100644 --- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/communication-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/communication-1.0.0.mapping.json @@ -1,134 +1,137 @@ { - "template": { - "mappings": { - "_meta": { - "version": "1.0.0", - "catalog": "observability", - "type": "logs", - "component": "communication" + "template": { + "mappings": { + "_meta": { + "version": "1.0.0", + "catalog": "observability", + "type": "logs", + "component": "communication", + "labels": [ + "communication" + ] + }, + "properties": { + "communication": { + "properties": { + "sock.family": { + "type": "keyword", + "ignore_above": 256 }, - "properties": { - "communication": { - "properties": { - "sock.family": { - "type": "keyword", - "ignore_above": 256 - }, - "source": { - "type": "object", - "properties": { - "address": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 1024 - } - } - }, - "domain": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 1024 - } - } - }, - "bytes": { - "type": "long" - }, - "ip": { - "type": "ip" - }, - "port": { - "type": "long" - }, - "mac": { - "type": "keyword", - "ignore_above": 1024 - }, - "packets": { - "type": "long" - }, - "geo": { - "type": "object", - "properties": { - "city_name": { - "type": "keyword" - }, - "country_iso_code": { - "type": "keyword" - }, - "country_name": { - "type": "keyword" - }, - "location": { - "type": "geo_point" - } - } - } - } - }, - "destination": { - "type": "object", - "properties": { - "address": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 1024 - } - } - }, - "domain": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 1024 - } - } - }, - "bytes": { - "type": "long" - }, - "ip": { - "type": "ip" - }, - "port": { - "type": "long" - }, - "mac": { - "type": "keyword", - "ignore_above": 1024 - }, - "packets": { - "type": "long" - }, - "geo": { - "type": "object", - "properties": { - "city_name": { - "type": "keyword" - }, - "country_iso_code": { - "type": "keyword" - }, - "country_name": { - "type": "keyword" - }, - "location": { - "type": "geo_point" - } - } - } - } - } + "source": { + "type": "object", + "properties": { + "address": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 1024 } + } + }, + "domain": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 1024 + } + } + }, + "bytes": { + "type": "long" + }, + "ip": { + "type": "ip" + }, + "port": { + "type": "long" + }, + "mac": { + "type": "keyword", + "ignore_above": 1024 + }, + "packets": { + "type": "long" + }, + "geo": { + "type": "object", + "properties": { + "city_name": { + "type": "keyword" + }, + "country_iso_code": { + "type": "keyword" + }, + "country_name": { + "type": "keyword" + }, + "location": { + "type": "geo_point" + } + } + } + } + }, + "destination": { + "type": "object", + "properties": { + "address": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 1024 + } + } + }, + "domain": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 1024 + } + } + }, + "bytes": { + "type": "long" + }, + "ip": { + "type": "ip" + }, + "port": { + "type": "long" + }, + "mac": { + "type": "keyword", + "ignore_above": 1024 + }, + "packets": { + "type": "long" + }, + "geo": { + "type": "object", + "properties": { + "city_name": { + "type": "keyword" + }, + "country_iso_code": { + "type": "keyword" + }, + "country_name": { + "type": "keyword" + }, + "location": { + "type": "geo_point" + } + } } + } } + } } + } } + } } diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/logs_vpc-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/logs_vpc-1.0.0.mapping.json index 618fd2773..5ece5066d 100644 --- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/logs_vpc-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/logs_vpc-1.0.0.mapping.json @@ -14,6 +14,7 @@ "catalog": "observability", "type": "logs", "component": "log", + "labels": ["log","aws","s3","cloud","communication","vpc"], "correlations": [ { "field": "spanId", @@ -228,22 +229,5 @@ "cloud", "communication" ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] - } + "version": 1 } diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/s3-1.0.0.mapping.json deleted file mode 100644 index e520de430..000000000 --- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/schemas/s3-1.0.0.mapping.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "template": { - "mappings": { - "_meta": { - "version": "1.0.0", - "catalog": "observability", - "type": "logs", - "component": "s3" - }, - "properties": { - "aws": { - "properties": { - "s3": { - "properties": { - "bucket": { - "type": "keyword" - }, - "key": { - "type": "keyword" - }, - "copy_source": { - "type": "keyword" - }, - "upload_id": { - "type": "keyword" - }, - "delete": { - "type": "keyword" - }, - "part_number": { - "type": "keyword" - } - } - } - } - } - } - } - } -} diff --git a/server/adaptors/integrations/__data__/repository/aws_waf/aws_waf-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_waf/aws_waf-1.0.0.json index 439704b87..76f9d74fd 100644 --- a/server/adaptors/integrations/__data__/repository/aws_waf/aws_waf-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/aws_waf/aws_waf-1.0.0.json @@ -5,6 +5,7 @@ "description": "AWS waf log collector", "license": "Apache-2.0", "type": "logs_waf", + "labels": ["log","aws","s3","cloud","waf"], "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_waf/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/aws_waf/schemas/aws_s3-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_waf/schemas/aws_s3-1.0.0.mapping.json index 734320ff4..fbdfa5237 100644 --- a/server/adaptors/integrations/__data__/repository/aws_waf/schemas/aws_s3-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_waf/schemas/aws_s3-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_s3" + "component": "aws_s3", + "labels": ["aws","s3"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_waf/schemas/aws_waf-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_waf/schemas/aws_waf-1.0.0.mapping.json index a05b7c4a0..92bc8cd22 100644 --- a/server/adaptors/integrations/__data__/repository/aws_waf/schemas/aws_waf-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_waf/schemas/aws_waf-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "aws_waf" + "component": "aws_waf", + "labels": ["aws","waf"] }, "properties": { "aws": { diff --git a/server/adaptors/integrations/__data__/repository/aws_waf/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_waf/schemas/cloud-1.0.0.mapping.json index c14bbf327..e167c16ef 100644 --- a/server/adaptors/integrations/__data__/repository/aws_waf/schemas/cloud-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_waf/schemas/cloud-1.0.0.mapping.json @@ -5,34 +5,75 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "cloud" + "component": "cloud", + "labels": ["cloud"] }, "properties": { "cloud": { - "type" : "object", "properties": { "provider": { "type": "keyword" }, + "availability_zone": { + "type": "keyword" + }, + "region": { + "type": "keyword" + }, + "machine": { + "type": "object", + "properties": { + "type": { + "type": "keyword" + } + } + }, "account": { "type": "object", "properties": { "id": { "type": "keyword" + }, + "name": { + "type": "keyword" } } }, - "region": { + "platform": { "type": "keyword" }, - "resource_id": { - "type": "keyword" + "service": { + "type": "object", + "properties": { + "name": { + "type": "keyword" + } + } }, - "availability_zone": { - "type": "keyword" + "project": { + "type": "object", + "properties": { + "id": { + "type": "keyword" + }, + "name": { + "type": "keyword" + } + } }, - "platform": { + "resource_id": { "type": "keyword" + }, + "instance": { + "type": "object", + "properties": { + "id": { + "type": "keyword" + }, + "name": { + "type": "keyword" + } + } } } } diff --git a/server/adaptors/integrations/__data__/repository/aws_waf/schemas/logs_waf-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/aws_waf/schemas/logs_waf-1.0.0.mapping.json index ec4668a28..b24d7f6be 100644 --- a/server/adaptors/integrations/__data__/repository/aws_waf/schemas/logs_waf-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/aws_waf/schemas/logs_waf-1.0.0.mapping.json @@ -14,6 +14,7 @@ "catalog": "observability", "type": "logs", "component": "log", + "labels": ["log","aws","s3","cloud","waf"], "correlations": [ { "field": "spanId", @@ -227,22 +228,5 @@ "aws_waf", "aws_s3" ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] - } + "version": 1 } diff --git a/server/adaptors/integrations/__data__/repository/k8s/k8s-1.0.0.json b/server/adaptors/integrations/__data__/repository/k8s/k8s-1.0.0.json index 9ea873718..a157ac9e8 100644 --- a/server/adaptors/integrations/__data__/repository/k8s/k8s-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/k8s/k8s-1.0.0.json @@ -5,6 +5,7 @@ "description": "Kubernetes web logs collector", "license": "Apache-2.0", "type": "logs-k8s", + "labels": ["log", "k8s", "cloud", "container"], "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/k8s/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/k8s/schemas/cloud-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/k8s/schemas/cloud-1.0.0.mapping.json index c14bbf327..e167c16ef 100644 --- a/server/adaptors/integrations/__data__/repository/k8s/schemas/cloud-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/k8s/schemas/cloud-1.0.0.mapping.json @@ -5,34 +5,75 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "cloud" + "component": "cloud", + "labels": ["cloud"] }, "properties": { "cloud": { - "type" : "object", "properties": { "provider": { "type": "keyword" }, + "availability_zone": { + "type": "keyword" + }, + "region": { + "type": "keyword" + }, + "machine": { + "type": "object", + "properties": { + "type": { + "type": "keyword" + } + } + }, "account": { "type": "object", "properties": { "id": { "type": "keyword" + }, + "name": { + "type": "keyword" } } }, - "region": { + "platform": { "type": "keyword" }, - "resource_id": { - "type": "keyword" + "service": { + "type": "object", + "properties": { + "name": { + "type": "keyword" + } + } }, - "availability_zone": { - "type": "keyword" + "project": { + "type": "object", + "properties": { + "id": { + "type": "keyword" + }, + "name": { + "type": "keyword" + } + } }, - "platform": { + "resource_id": { "type": "keyword" + }, + "instance": { + "type": "object", + "properties": { + "id": { + "type": "keyword" + }, + "name": { + "type": "keyword" + } + } } } } diff --git a/server/adaptors/integrations/__data__/repository/k8s/schemas/container-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/k8s/schemas/container-1.0.0.mapping.json index edcff9897..10d61b102 100644 --- a/server/adaptors/integrations/__data__/repository/k8s/schemas/container-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/k8s/schemas/container-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component" : "container" + "component" : "container", + "labels": ["container"] }, "properties": { "container": { @@ -64,4 +65,4 @@ } } } -} \ No newline at end of file +} diff --git a/server/adaptors/integrations/__data__/repository/k8s/schemas/k8s-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/k8s/schemas/k8s-1.0.0.mapping.json index 349b3560a..0e22ef675 100644 --- a/server/adaptors/integrations/__data__/repository/k8s/schemas/k8s-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/k8s/schemas/k8s-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "k8s" + "component": "k8s", + "labels": ["k8s"] }, "properties": { "kubernetes": { diff --git a/server/adaptors/integrations/__data__/repository/k8s/schemas/logs-k8s-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/k8s/schemas/logs-k8s-1.0.0.mapping.json index 7e87c3dc3..7553e299d 100644 --- a/server/adaptors/integrations/__data__/repository/k8s/schemas/logs-k8s-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/k8s/schemas/logs-k8s-1.0.0.mapping.json @@ -1,250 +1,239 @@ { - "index_patterns": [ - "ss4o_logs-k8s-*" - ], - "data_stream": {}, - "template": { - "aliases": { - "logs-k8s": {} + "index_patterns": [ + "ss4o_logs-k8s-*" + ], + "data_stream": {}, + "template": { + "aliases": { + "logs-k8s": {} + }, + "mappings": { + "_meta": { + "version": "1.0.0", + "catalog": "observability", + "type": "logs", + "component": "log", + "labels": [ + "log", + "k8s", + "cloud", + "container" + ], + "correlations": [ + { + "field": "spanId", + "foreign-schema": "traces", + "foreign-field": "spanId" + }, + { + "field": "traceId", + "foreign-schema": "traces", + "foreign-field": "traceId" + } + ] }, - "mappings": { - "_meta": { - "version": "1.0.0", - "catalog": "observability", - "type": "logs", - "component": "log", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] - }, - "_source": { - "enabled": true - }, - "dynamic_templates": [ - { - "resources_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "resource.*" - } - }, - { - "attributes_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "attributes.*" - } - }, - { - "instrumentation_scope_attributes_map": { - "mapping": { - "type": "keyword" - }, - "path_match": "instrumentationScope.attributes.*" - } + "_source": { + "enabled": true + }, + "dynamic_templates": [ + { + "resources_map": { + "mapping": { + "type": "keyword" + }, + "path_match": "resource.*" + } + }, + { + "attributes_map": { + "mapping": { + "type": "keyword" + }, + "path_match": "attributes.*" + } + }, + { + "instrumentation_scope_attributes_map": { + "mapping": { + "type": "keyword" + }, + "path_match": "instrumentationScope.attributes.*" + } + } + ], + "properties": { + "severity": { + "properties": { + "number": { + "type": "long" + }, + "text": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 } - ], - "properties": { - "severity": { - "properties": { - "number": { - "type": "long" - }, - "text": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - } - } - } - }, - "attributes": { - "type": "object", - "properties": { - "data_stream": { - "properties": { - "dataset": { - "ignore_above": 128, - "type": "keyword" - }, - "namespace": { - "ignore_above": 128, - "type": "keyword" - }, - "type": { - "ignore_above": 56, - "type": "keyword" - } - } - } - } - }, - "body": { - "type": "text" - }, - "@timestamp": { - "type": "date" - }, - "observedTimestamp": { - "type": "date" - }, - "observerTime": { - "type": "alias", - "path": "observedTimestamp" - }, - "traceId": { - "ignore_above": 256, - "type": "keyword" - }, - "spanId": { - "ignore_above": 256, - "type": "keyword" - }, - "schemaUrl": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - } + } + } + } + }, + "attributes": { + "type": "object", + "properties": { + "data_stream": { + "properties": { + "dataset": { + "ignore_above": 128, + "type": "keyword" }, - "instrumentationScope": { - "properties": { - "name": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 128 - } - } - }, - "version": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - } - }, - "dropped_attributes_count": { - "type": "integer" - }, - "schemaUrl": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 256 - } - } - } - } + "namespace": { + "ignore_above": 128, + "type": "keyword" }, - "event": { - "properties": { - "dataset": { - "ignore_above": 128, - "type": "keyword" - }, - "duration": { - "type": "long" - }, - "domain": { - "ignore_above": 256, - "type": "keyword" - }, - "name": { - "ignore_above": 256, - "type": "keyword" - }, - "source": { - "ignore_above": 256, - "type": "keyword" - }, - "category": { - "ignore_above": 256, - "type": "keyword" - }, - "type": { - "ignore_above": 256, - "type": "keyword" - }, - "kind": { - "ignore_above": 256, - "type": "keyword" - }, - "result": { - "ignore_above": 256, - "type": "keyword" - }, - "exception": { - "properties": { - "message": { - "ignore_above": 1024, - "type": "keyword" - }, - "type": { - "ignore_above": 256, - "type": "keyword" - }, - "stacktrace": { - "type": "text" - } - } - } - } + "type": { + "ignore_above": 56, + "type": "keyword" + } + } + } + } + }, + "body": { + "type": "text" + }, + "@timestamp": { + "type": "date" + }, + "observedTimestamp": { + "type": "date" + }, + "observerTime": { + "type": "alias", + "path": "observedTimestamp" + }, + "traceId": { + "ignore_above": 256, + "type": "keyword" + }, + "spanId": { + "ignore_above": 256, + "type": "keyword" + }, + "schemaUrl": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "instrumentationScope": { + "properties": { + "name": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 128 } + } + }, + "version": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "dropped_attributes_count": { + "type": "integer" + }, + "schemaUrl": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } } + } }, - "settings": { - "index": { - "mapping": { - "total_fields": { - "limit": 10000 - } + "event": { + "properties": { + "dataset": { + "ignore_above": 128, + "type": "keyword" + }, + "duration": { + "type": "long" + }, + "domain": { + "ignore_above": 256, + "type": "keyword" + }, + "name": { + "ignore_above": 256, + "type": "keyword" + }, + "source": { + "ignore_above": 256, + "type": "keyword" + }, + "category": { + "ignore_above": 256, + "type": "keyword" + }, + "type": { + "ignore_above": 256, + "type": "keyword" + }, + "kind": { + "ignore_above": 256, + "type": "keyword" + }, + "result": { + "ignore_above": 256, + "type": "keyword" + }, + "exception": { + "properties": { + "message": { + "ignore_above": 1024, + "type": "keyword" + }, + "type": { + "ignore_above": 256, + "type": "keyword" }, - "refresh_interval": "5s" + "stacktrace": { + "type": "text" + } + } } + } } + } }, - "composed_of": [ - "k8s", - "container", - "cloud" - ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] + "settings": { + "index": { + "mapping": { + "total_fields": { + "limit": 10000 + } + }, + "refresh_interval": "5s" + } } + }, + "composed_of": [ + "k8s", + "container", + "cloud" + ], + "version": 1 } diff --git a/server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json b/server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json index 421032f78..2b37953ee 100644 --- a/server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json +++ b/server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json @@ -5,6 +5,7 @@ "description": "Nginx HTTP server collector", "license": "Apache-2.0", "type": "logs", + "labels": ["log","http","communication"], "author": "OpenSearch", "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/nginx/info", "statics": { diff --git a/server/adaptors/integrations/__data__/repository/nginx/schemas/communication-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/nginx/schemas/communication-1.0.0.mapping.json index cc714dc58..97263ad26 100644 --- a/server/adaptors/integrations/__data__/repository/nginx/schemas/communication-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/nginx/schemas/communication-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "communication" + "component": "communication", + "labels": ["communication"] }, "properties": { "communication": { diff --git a/server/adaptors/integrations/__data__/repository/nginx/schemas/http-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/nginx/schemas/http-1.0.0.mapping.json index 98d933840..8a1e18f04 100644 --- a/server/adaptors/integrations/__data__/repository/nginx/schemas/http-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/nginx/schemas/http-1.0.0.mapping.json @@ -5,7 +5,8 @@ "version": "1.0.0", "catalog": "observability", "type": "logs", - "component": "http" + "component": "http", + "labels": ["http"] }, "dynamic_templates": [ { diff --git a/server/adaptors/integrations/__data__/repository/nginx/schemas/logs-1.0.0.mapping.json b/server/adaptors/integrations/__data__/repository/nginx/schemas/logs-1.0.0.mapping.json index 8be8c6285..ab2529668 100644 --- a/server/adaptors/integrations/__data__/repository/nginx/schemas/logs-1.0.0.mapping.json +++ b/server/adaptors/integrations/__data__/repository/nginx/schemas/logs-1.0.0.mapping.json @@ -11,6 +11,7 @@ "catalog": "observability", "type": "logs", "component": "log", + "labels": ["log","http","communication"], "correlations": [ { "field": "spanId", @@ -223,22 +224,5 @@ "communication", "http" ], - "version": 1, - "_meta": { - "description": "Simple Schema For Observability", - "catalog": "observability", - "type": "logs", - "correlations": [ - { - "field": "spanId", - "foreign-schema": "traces", - "foreign-field": "spanId" - }, - { - "field": "traceId", - "foreign-schema": "traces", - "foreign-field": "traceId" - } - ] - } + "version": 1 } diff --git a/server/adaptors/integrations/types.ts b/server/adaptors/integrations/types.ts index 8e8d51ca8..7651145a3 100644 --- a/server/adaptors/integrations/types.ts +++ b/server/adaptors/integrations/types.ts @@ -9,6 +9,7 @@ interface IntegrationTemplate { displayName?: string; license: string; type: string; + labels: string[]; author?: string; description?: string; sourceUrl?: string; diff --git a/server/adaptors/integrations/validators.ts b/server/adaptors/integrations/validators.ts index 7c1964587..e5d1008cb 100644 --- a/server/adaptors/integrations/validators.ts +++ b/server/adaptors/integrations/validators.ts @@ -25,6 +25,7 @@ const templateSchema: JSONSchemaType = { displayName: { type: 'string', nullable: true }, license: { type: 'string' }, type: { type: 'string' }, + labels: { type: 'array', items: { type: 'string' }}, author: { type: 'string', nullable: true }, description: { type: 'string', nullable: true }, sourceUrl: { type: 'string', nullable: true },