This is an automated email from the ASF dual-hosted git repository. lujiajing pushed a commit to branch banyandb-integration-stream in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 9a8979a879eec86a43c7e79214193e49df53d65a Author: Megrez Lu <[email protected]> AuthorDate: Thu Jan 27 11:10:14 2022 +0800 add metadata json --- .../plugin/banyandb/BanyanDBIndexInstaller.java | 2 +- .../EndpointRelationServerSideMetricsBuilder.java | 4 ++ .../storage/plugin/banyandb/schema/Metadata.java | 14 +++---- .../banyandb/schema/SegmentRecordBuilder.java | 12 +++++- ...ceInstanceRelationClientSideMetricsBuilder.java | 9 +++-- ...ceInstanceRelationServerSideMetricsBuilder.java | 9 +++-- .../banyandb/stream/BanyanDBMetadataQueryDAO.java | 8 ++-- .../banyandb/stream/BanyanDBTraceQueryDAO.java | 24 +++++------ .../metadata/endpoint_relation_server_side.json | 46 ++++++++++++++++++++++ .../main/resources/metadata/endpoint_traffic.json | 37 +++++++++++++++++ .../metadata/index_rules/component_id.json | 12 ++++++ .../metadata/index_rules/dest_endpoint.json | 12 ++++++ .../metadata/index_rules/dest_service_id.json | 12 ++++++ .../resources/metadata/index_rules/entity_id.json | 12 ++++++ .../resources/metadata/index_rules/latency.json | 12 ++++++ .../metadata/index_rules/source_endpoint.json | 12 ++++++ .../metadata/index_rules/source_service_id.json | 12 ++++++ .../src/main/resources/metadata/profile_task.json | 4 ++ .../src/main/resources/metadata/segment.json | 6 +-- ... => service_instance_relation_client_side.json} | 43 +++++++++----------- ... => service_instance_relation_server_side.json} | 43 +++++++++----------- .../metadata/service_relation_client_side.json | 46 ++++++++++++++++++++++ .../metadata/service_relation_server_side.json | 46 ++++++++++++++++++++++ .../{profile_task.json => service_traffic.json} | 37 ++++++----------- 24 files changed, 363 insertions(+), 111 deletions(-) diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBIndexInstaller.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBIndexInstaller.java index 6a8f789976..c9566b1549 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBIndexInstaller.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBIndexInstaller.java @@ -41,7 +41,7 @@ public class BanyanDBIndexInstaller extends ModelInstaller { StreamMetaInfo metaInfo = StreamMetaInfo.addModel(model); if (metaInfo != null) { log.info("install index {}", model.getName()); -// ((BanyanDBStorageClient) client).createStream(metaInfo); + ((BanyanDBStorageClient) client).createStream(metaInfo); } } } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/EndpointRelationServerSideMetricsBuilder.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/EndpointRelationServerSideMetricsBuilder.java index ec25c79e10..c6cef854e4 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/EndpointRelationServerSideMetricsBuilder.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/EndpointRelationServerSideMetricsBuilder.java @@ -31,14 +31,18 @@ public class EndpointRelationServerSideMetricsBuilder extends BanyanDBStorageDat @Override protected List<SerializableTag<BanyandbModel.TagValue>> searchableTags(EndpointRelationServerSideMetrics entity) { List<SerializableTag<BanyandbModel.TagValue>> searchable = new ArrayList<>(); + // 0 - source_endpoint searchable.add(TagAndValue.stringField(entity.getSourceEndpoint())); + // 1 - dest_endpoint searchable.add(TagAndValue.stringField(entity.getDestEndpoint())); + // 2 - entity_id searchable.add(TagAndValue.stringField(entity.getEntityId())); return searchable; } @Override protected List<SerializableTag<BanyandbModel.TagValue>> dataTags(EndpointRelationServerSideMetrics entity) { + // 0 - component_id return Collections.singletonList(TagAndValue.longField(entity.getComponentId())); } } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/Metadata.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/Metadata.java index 545cd507d6..9f0fda0ac4 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/Metadata.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/Metadata.java @@ -50,17 +50,17 @@ public class Metadata { searchable.add(TagAndValue.stringField(serviceName)); // 1 - serviceID searchable.add(TagAndValue.stringField(entity.getServiceId())); - // 2 - layer + // 2 - group + searchable.add(TagAndValue.stringField(entity.getGroup())); + // 3 - layer Layer layer = entity.getLayer(); searchable.add(TagAndValue.longField(layer != null ? layer.value() : Layer.UNDEFINED.value())); - // 3 - group - searchable.add(TagAndValue.stringField(entity.getGroup())); return searchable; } @Override protected List<SerializableTag<BanyandbModel.TagValue>> dataTags(ServiceTraffic entity) { - // shortName + // 0 - shortName return Collections.singletonList(TagAndValue.stringField(entity.getShortName())); } } @@ -69,10 +69,10 @@ public class Metadata { @Override protected List<SerializableTag<BanyandbModel.TagValue>> searchableTags(EndpointTraffic entity) { List<SerializableTag<BanyandbModel.TagValue>> searchable = new ArrayList<>(2); - // 0 - name - searchable.add(TagAndValue.stringField(entity.getName())); - // 1 - serviceID + // 0 - serviceID searchable.add(TagAndValue.stringField(entity.getServiceId())); + // 1 - name + searchable.add(TagAndValue.stringField(entity.getName())); return searchable; } } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/SegmentRecordBuilder.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/SegmentRecordBuilder.java index 0aa54cd3c1..729ad90e15 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/SegmentRecordBuilder.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/SegmentRecordBuilder.java @@ -42,13 +42,21 @@ public class SegmentRecordBuilder extends BanyanDBStorageDataBuilder<SegmentReco @Override protected List<SerializableTag<BanyandbModel.TagValue>> searchableTags(SegmentRecord segmentRecord) { List<SerializableTag<BanyandbModel.TagValue>> searchable = new ArrayList<>(10); + // 0 - trace_id searchable.add(TagAndValue.stringField(segmentRecord.getTraceId())); + // 1 - is_error + searchable.add(TagAndValue.longField(segmentRecord.getIsError())); + // 2 - service_id searchable.add(TagAndValue.stringField(segmentRecord.getServiceId())); + // 3 - service_instance_id searchable.add(TagAndValue.stringField(segmentRecord.getServiceInstanceId())); + // 4 - endpoint_id searchable.add(TagAndValue.stringField(segmentRecord.getEndpointId())); - searchable.add(TagAndValue.longField(segmentRecord.getStartTime())); + // 5 - latency searchable.add(TagAndValue.longField(segmentRecord.getLatency())); - searchable.add(TagAndValue.longField(segmentRecord.getIsError())); + // 6 - start_time + searchable.add(TagAndValue.longField(segmentRecord.getStartTime())); + // 7 ~ 13: indexed tags searchable.addAll(filterSearchableTags(segmentRecord.getTagsRawData(), INDEXED_TAGS)); return searchable; } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ServiceInstanceRelationClientSideMetricsBuilder.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ServiceInstanceRelationClientSideMetricsBuilder.java index e940f6d291..a7f0f1b156 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ServiceInstanceRelationClientSideMetricsBuilder.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ServiceInstanceRelationClientSideMetricsBuilder.java @@ -24,7 +24,6 @@ import org.apache.skywalking.banyandb.v1.client.TagAndValue; import org.apache.skywalking.oap.server.core.analysis.manual.relation.instance.ServiceInstanceRelationClientSideMetrics; import java.util.ArrayList; -import java.util.Collections; import java.util.List; public class ServiceInstanceRelationClientSideMetricsBuilder extends BanyanDBStorageDataBuilder<ServiceInstanceRelationClientSideMetrics> { @@ -32,15 +31,17 @@ public class ServiceInstanceRelationClientSideMetricsBuilder extends BanyanDBSto protected List<SerializableTag<BanyandbModel.TagValue>> searchableTags(ServiceInstanceRelationClientSideMetrics entity) { List<SerializableTag<BanyandbModel.TagValue>> searchable = new ArrayList<>(); searchable.add(TagAndValue.stringField(entity.getSourceServiceId())); - searchable.add(TagAndValue.stringField(entity.getSourceServiceInstanceId())); searchable.add(TagAndValue.stringField(entity.getDestServiceId())); - searchable.add(TagAndValue.stringField(entity.getDestServiceInstanceId())); searchable.add(TagAndValue.stringField(entity.getEntityId())); return searchable; } @Override protected List<SerializableTag<BanyandbModel.TagValue>> dataTags(ServiceInstanceRelationClientSideMetrics entity) { - return Collections.singletonList(TagAndValue.longField(entity.getComponentId())); + List<SerializableTag<BanyandbModel.TagValue>> data = new ArrayList<>(); + data.add(TagAndValue.longField(entity.getComponentId())); + data.add(TagAndValue.stringField(entity.getSourceServiceInstanceId())); + data.add(TagAndValue.stringField(entity.getDestServiceInstanceId())); + return data; } } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ServiceInstanceRelationServerSideMetricsBuilder.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ServiceInstanceRelationServerSideMetricsBuilder.java index 43495bc148..7796265f8d 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ServiceInstanceRelationServerSideMetricsBuilder.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ServiceInstanceRelationServerSideMetricsBuilder.java @@ -24,7 +24,6 @@ import org.apache.skywalking.banyandb.v1.client.TagAndValue; import org.apache.skywalking.oap.server.core.analysis.manual.relation.instance.ServiceInstanceRelationServerSideMetrics; import java.util.ArrayList; -import java.util.Collections; import java.util.List; public class ServiceInstanceRelationServerSideMetricsBuilder extends BanyanDBStorageDataBuilder<ServiceInstanceRelationServerSideMetrics> { @@ -32,15 +31,17 @@ public class ServiceInstanceRelationServerSideMetricsBuilder extends BanyanDBSto protected List<SerializableTag<BanyandbModel.TagValue>> searchableTags(ServiceInstanceRelationServerSideMetrics entity) { List<SerializableTag<BanyandbModel.TagValue>> searchable = new ArrayList<>(); searchable.add(TagAndValue.stringField(entity.getSourceServiceId())); - searchable.add(TagAndValue.stringField(entity.getSourceServiceInstanceId())); searchable.add(TagAndValue.stringField(entity.getDestServiceId())); - searchable.add(TagAndValue.stringField(entity.getDestServiceInstanceId())); searchable.add(TagAndValue.stringField(entity.getEntityId())); return searchable; } @Override protected List<SerializableTag<BanyandbModel.TagValue>> dataTags(ServiceInstanceRelationServerSideMetrics entity) { - return Collections.singletonList(TagAndValue.longField(entity.getComponentId())); + List<SerializableTag<BanyandbModel.TagValue>> data = new ArrayList<>(); + data.add(TagAndValue.longField(entity.getComponentId())); + data.add(TagAndValue.stringField(entity.getSourceServiceInstanceId())); + data.add(TagAndValue.stringField(entity.getDestServiceInstanceId())); + return data; } } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java index b9fc53258c..447d6316ac 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetadataQueryDAO.java @@ -145,8 +145,8 @@ public class BanyanDBMetadataQueryDAO extends AbstractBanyanDBDAO implements IMe public Endpoint apply(RowEntity row) { Endpoint endpoint = new Endpoint(); final List<TagAndValue<?>> searchable = row.getTagFamilies().get(0); - endpoint.setName((String) searchable.get(0).getValue()); - endpoint.setId((String) searchable.get(1).getValue()); + endpoint.setId((String) searchable.get(0).getValue()); + endpoint.setName((String) searchable.get(1).getValue()); return endpoint; } } @@ -158,9 +158,9 @@ public class BanyanDBMetadataQueryDAO extends AbstractBanyanDBDAO implements IMe final List<TagAndValue<?>> searchable = row.getTagFamilies().get(0); service.setName((String) searchable.get(0).getValue()); service.setId((String) searchable.get(1).getValue()); - String layerName = Layer.valueOf(((Number) searchable.get(2).getValue()).intValue()).name(); + service.setGroup((String) searchable.get(2).getValue()); + String layerName = Layer.valueOf(((Number) searchable.get(3).getValue()).intValue()).name(); service.getLayers().add(layerName); - service.setGroup((String) searchable.get(3).getValue()); final List<TagAndValue<?>> data = row.getTagFamilies().get(1); service.setShortName((String) data.get(0).getValue()); return service; diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBTraceQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBTraceQueryDAO.java index c5bb950bc6..66053e268d 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBTraceQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBTraceQueryDAO.java @@ -58,43 +58,43 @@ public class BanyanDBTraceQueryDAO extends AbstractBanyanDBDAO implements ITrace public void apply(StreamQuery query) { if (minDuration != 0) { // duration >= minDuration - query.appendCondition(gte("duration", minDuration)); + query.appendCondition(gte(SegmentRecord.LATENCY, minDuration)); } if (maxDuration != 0) { // duration <= maxDuration - query.appendCondition(lte("duration", maxDuration)); + query.appendCondition(lte(SegmentRecord.LATENCY, maxDuration)); } if (!Strings.isNullOrEmpty(serviceId)) { - query.appendCondition(eq("service_id", serviceId)); + query.appendCondition(eq(SegmentRecord.SERVICE_ID, serviceId)); } if (!Strings.isNullOrEmpty(serviceInstanceId)) { - query.appendCondition(eq("service_instance_id", serviceInstanceId)); + query.appendCondition(eq(SegmentRecord.SERVICE_INSTANCE_ID, serviceInstanceId)); } if (!Strings.isNullOrEmpty(endpointId)) { - query.appendCondition(eq("endpoint_id", endpointId)); + query.appendCondition(eq(SegmentRecord.ENDPOINT_ID, endpointId)); } switch (traceState) { case ERROR: - query.appendCondition(eq("state", TraceStateStorage.ERROR.getState())); + query.appendCondition(eq(SegmentRecord.IS_ERROR, TraceStateStorage.ERROR.getState())); break; case SUCCESS: - query.appendCondition(eq("state", TraceStateStorage.SUCCESS.getState())); + query.appendCondition(eq(SegmentRecord.IS_ERROR, TraceStateStorage.SUCCESS.getState())); break; default: - query.appendCondition(eq("state", TraceStateStorage.ALL.getState())); + query.appendCondition(eq(SegmentRecord.IS_ERROR, TraceStateStorage.ALL.getState())); break; } switch (queryOrder) { case BY_START_TIME: - query.setOrderBy(new StreamQuery.OrderBy("start_time", StreamQuery.OrderBy.Type.DESC)); + query.setOrderBy(new StreamQuery.OrderBy(SegmentRecord.START_TIME, StreamQuery.OrderBy.Type.DESC)); break; case BY_DURATION: - query.setOrderBy(new StreamQuery.OrderBy("duration", StreamQuery.OrderBy.Type.DESC)); + query.setOrderBy(new StreamQuery.OrderBy(SegmentRecord.LATENCY, StreamQuery.OrderBy.Type.DESC)); break; } @@ -118,7 +118,7 @@ public class BanyanDBTraceQueryDAO extends AbstractBanyanDBDAO implements ITrace } StreamQueryResponse resp = query(SegmentRecord.INDEX_NAME, - ImmutableList.of("trace_id", "state", "endpoint_id", "duration", "start_time"), tsRange, q); + ImmutableList.of("trace_id", "is_error", "endpoint_id", "latency", "start_time"), tsRange, q); List<BasicTrace> basicTraces = resp.getElements().stream().map(new BasicTraceDeserializer()).collect(Collectors.toList()); @@ -131,7 +131,7 @@ public class BanyanDBTraceQueryDAO extends AbstractBanyanDBDAO implements ITrace @Override public List<SegmentRecord> queryByTraceId(String traceId) throws IOException { StreamQueryResponse resp = query(SegmentRecord.INDEX_NAME, - ImmutableList.of("trace_id", "state", "service_id", "service_instance_id", "endpoint_id", "duration", "start_time"), + ImmutableList.of("trace_id", "is_error", "service_id", "service_instance_id", "endpoint_id", "latency", "start_time"), new QueryBuilder() { @Override public void apply(StreamQuery query) { diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/endpoint_relation_server_side.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/endpoint_relation_server_side.json new file mode 100644 index 0000000000..0c59e84357 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/endpoint_relation_server_side.json @@ -0,0 +1,46 @@ +{ + "metadata": { + "name": "endpoint_relation_server_side", + "group": "default" + }, + "tag_families": [ + { + "name": "data", + "tags": [ + { + "name": "component_id", + "type": "TAG_TYPE_INT" + } + ] + }, + { + "name": "searchable", + "tags": [ + { + "name": "source_endpoint", + "type": "TAG_TYPE_STRING" + }, + { + "name": "dest_endpoint", + "type": "TAG_TYPE_STRING" + }, + { + "name": "entity_id", + "type": "TAG_TYPE_STRING" + } + ] + } + ], + "entity": { + "tag_names": [ + ] + }, + "opts": { + "shard_num": 2, + "ttl": { + "val": 7, + "unit": "DURATION_UNIT_DAY" + } + }, + "updated_at_nanoseconds": "2021-04-15T01:30:15.01Z" +} \ No newline at end of file diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/endpoint_traffic.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/endpoint_traffic.json new file mode 100644 index 0000000000..9b0d1f40ca --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/endpoint_traffic.json @@ -0,0 +1,37 @@ +{ + "metadata": { + "name": "endpoint_traffic", + "group": "default" + }, + "tag_families": [ + { + "name": "data", + "tags": [] + }, + { + "name": "searchable", + "tags": [ + { + "name": "service_id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "name", + "type": "TAG_TYPE_STRING" + } + ] + } + ], + "entity": { + "tag_names": [ + ] + }, + "opts": { + "shard_num": 2, + "ttl": { + "val": 7, + "unit": "DURATION_UNIT_DAY" + } + }, + "updated_at_nanoseconds": "2021-04-15T01:30:15.01Z" +} \ No newline at end of file diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/component_id.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/component_id.json new file mode 100644 index 0000000000..9b52f22ba2 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/component_id.json @@ -0,0 +1,12 @@ +{ + "metadata": { + "name": "component_id", + "group": "default" + }, + "tags": [ + "component_id" + ], + "type": "TYPE_INVERTED", + "location": "LOCATION_SERIES", + "updated_at": "2021-04-15T01:30:15.01Z" +} diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dest_endpoint.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dest_endpoint.json new file mode 100644 index 0000000000..affb1fdf17 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dest_endpoint.json @@ -0,0 +1,12 @@ +{ + "metadata": { + "name": "dest_endpoint", + "group": "default" + }, + "tags": [ + "dest_endpoint" + ], + "type": "TYPE_INVERTED", + "location": "LOCATION_SERIES", + "updated_at": "2021-04-15T01:30:15.01Z" +} diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dest_service_id.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dest_service_id.json new file mode 100644 index 0000000000..3bb400392e --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dest_service_id.json @@ -0,0 +1,12 @@ +{ + "metadata": { + "name": "dest_service_id", + "group": "default" + }, + "tags": [ + "dest_service_id" + ], + "type": "TYPE_INVERTED", + "location": "LOCATION_SERIES", + "updated_at": "2021-04-15T01:30:15.01Z" +} diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/entity_id.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/entity_id.json new file mode 100644 index 0000000000..31ece658a6 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/entity_id.json @@ -0,0 +1,12 @@ +{ + "metadata": { + "name": "entity_id", + "group": "default" + }, + "tags": [ + "entity_id" + ], + "type": "TYPE_INVERTED", + "location": "LOCATION_SERIES", + "updated_at": "2021-04-15T01:30:15.01Z" +} diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/latency.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/latency.json new file mode 100644 index 0000000000..4eb445055f --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/latency.json @@ -0,0 +1,12 @@ +{ + "metadata": { + "name": "latency", + "group": "default" + }, + "tags": [ + "latency" + ], + "type": "TYPE_TREE", + "location": "LOCATION_SERIES", + "updated_at": "2021-04-15T01:30:15.01Z" +} diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/source_endpoint.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/source_endpoint.json new file mode 100644 index 0000000000..164962f91c --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/source_endpoint.json @@ -0,0 +1,12 @@ +{ + "metadata": { + "name": "source_endpoint", + "group": "default" + }, + "tags": [ + "source_endpoint" + ], + "type": "TYPE_INVERTED", + "location": "LOCATION_SERIES", + "updated_at": "2021-04-15T01:30:15.01Z" +} diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/source_service_id.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/source_service_id.json new file mode 100644 index 0000000000..f54b191164 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/source_service_id.json @@ -0,0 +1,12 @@ +{ + "metadata": { + "name": "source_service_id", + "group": "default" + }, + "tags": [ + "component_id" + ], + "type": "TYPE_INVERTED", + "location": "LOCATION_SERIES", + "updated_at": "2021-04-15T01:30:15.01Z" +} diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json index 23f89f19c4..10aa497e74 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json @@ -4,6 +4,10 @@ "group": "default" }, "tag_families": [ + { + "name": "data", + "tags": [] + }, { "name": "searchable", "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/segment.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/segment.json index 1317d9ecf0..066fa45c38 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/segment.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/segment.json @@ -21,7 +21,7 @@ "type": "TAG_TYPE_STRING" }, { - "name": "state", + "name": "is_error", "type": "TAG_TYPE_INT" }, { @@ -37,7 +37,7 @@ "type": "TAG_TYPE_STRING" }, { - "name": "duration", + "name": "latency", "type": "TAG_TYPE_INT" }, { @@ -79,7 +79,7 @@ "tag_names": [ "service_id", "service_instance_id", - "state" + "is_error" ] }, "opts": { diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_instance_relation_client_side.json similarity index 50% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_instance_relation_client_side.json index 23f89f19c4..1a6f380e62 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_instance_relation_client_side.json @@ -1,47 +1,40 @@ { "metadata": { - "name": "profile_task", + "name": "service_instance_relation_client_side", "group": "default" }, "tag_families": [ { - "name": "searchable", + "name": "data", "tags": [ { - "name": "id", - "type": "TAG_TYPE_STRING" + "name": "component_id", + "type": "TAG_TYPE_INT" }, { - "name": "service_id", + "name": "source_service_instance_id", "type": "TAG_TYPE_STRING" }, { - "name": "endpoint_name", + "name": "dest_service_instance_id", "type": "TAG_TYPE_STRING" - }, - { - "name": "start_time", - "type": "TAG_TYPE_INT" - }, - { - "name": "duration", - "type": "TAG_TYPE_INT" - }, - { - "name": "min_duration_threshold", - "type": "TAG_TYPE_INT" - }, + } + ] + }, + { + "name": "searchable", + "tags": [ { - "name": "dump_period", - "type": "TAG_TYPE_INT" + "name": "source_service_id", + "type": "TAG_TYPE_STRING" }, { - "name": "create_time", - "type": "TAG_TYPE_INT" + "name": "dest_service_id", + "type": "TAG_TYPE_STRING" }, { - "name": "max_sampling_count", - "type": "TAG_TYPE_INT" + "name": "entity_id", + "type": "TAG_TYPE_STRING" } ] } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_instance_relation_server_side.json similarity index 50% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_instance_relation_server_side.json index 23f89f19c4..2fa5c396b4 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_instance_relation_server_side.json @@ -1,47 +1,40 @@ { "metadata": { - "name": "profile_task", + "name": "service_instance_relation_server_side", "group": "default" }, "tag_families": [ { - "name": "searchable", + "name": "data", "tags": [ { - "name": "id", - "type": "TAG_TYPE_STRING" + "name": "component_id", + "type": "TAG_TYPE_INT" }, { - "name": "service_id", + "name": "source_service_instance_id", "type": "TAG_TYPE_STRING" }, { - "name": "endpoint_name", + "name": "dest_service_instance_id", "type": "TAG_TYPE_STRING" - }, - { - "name": "start_time", - "type": "TAG_TYPE_INT" - }, - { - "name": "duration", - "type": "TAG_TYPE_INT" - }, - { - "name": "min_duration_threshold", - "type": "TAG_TYPE_INT" - }, + } + ] + }, + { + "name": "searchable", + "tags": [ { - "name": "dump_period", - "type": "TAG_TYPE_INT" + "name": "source_service_id", + "type": "TAG_TYPE_STRING" }, { - "name": "create_time", - "type": "TAG_TYPE_INT" + "name": "dest_service_id", + "type": "TAG_TYPE_STRING" }, { - "name": "max_sampling_count", - "type": "TAG_TYPE_INT" + "name": "entity_id", + "type": "TAG_TYPE_STRING" } ] } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_relation_client_side.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_relation_client_side.json new file mode 100644 index 0000000000..b12e95adaa --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_relation_client_side.json @@ -0,0 +1,46 @@ +{ + "metadata": { + "name": "service_relation_client_side", + "group": "default" + }, + "tag_families": [ + { + "name": "data", + "tags": [ + { + "name": "component_id", + "type": "TAG_TYPE_INT" + } + ] + }, + { + "name": "searchable", + "tags": [ + { + "name": "source_service_id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "dest_service_id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "entity_id", + "type": "TAG_TYPE_STRING" + } + ] + } + ], + "entity": { + "tag_names": [ + ] + }, + "opts": { + "shard_num": 2, + "ttl": { + "val": 7, + "unit": "DURATION_UNIT_DAY" + } + }, + "updated_at_nanoseconds": "2021-04-15T01:30:15.01Z" +} \ No newline at end of file diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_relation_server_side.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_relation_server_side.json new file mode 100644 index 0000000000..8844639714 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_relation_server_side.json @@ -0,0 +1,46 @@ +{ + "metadata": { + "name": "service_relation_server_side", + "group": "default" + }, + "tag_families": [ + { + "name": "data", + "tags": [ + { + "name": "component_id", + "type": "TAG_TYPE_INT" + } + ] + }, + { + "name": "searchable", + "tags": [ + { + "name": "source_service_id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "dest_service_id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "entity_id", + "type": "TAG_TYPE_STRING" + } + ] + } + ], + "entity": { + "tag_names": [ + ] + }, + "opts": { + "shard_num": 2, + "ttl": { + "val": 7, + "unit": "DURATION_UNIT_DAY" + } + }, + "updated_at_nanoseconds": "2021-04-15T01:30:15.01Z" +} \ No newline at end of file diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_traffic.json similarity index 51% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_traffic.json index 23f89f19c4..ba0f1c07ed 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/service_traffic.json @@ -1,14 +1,23 @@ { "metadata": { - "name": "profile_task", + "name": "endpoint_traffic", "group": "default" }, "tag_families": [ + { + "name": "data", + "tags": [ + { + "name": "short_name", + "type": "TAG_TYPE_STRING" + } + ] + }, { "name": "searchable", "tags": [ { - "name": "id", + "name": "name", "type": "TAG_TYPE_STRING" }, { @@ -16,31 +25,11 @@ "type": "TAG_TYPE_STRING" }, { - "name": "endpoint_name", + "name": "service_group", "type": "TAG_TYPE_STRING" }, { - "name": "start_time", - "type": "TAG_TYPE_INT" - }, - { - "name": "duration", - "type": "TAG_TYPE_INT" - }, - { - "name": "min_duration_threshold", - "type": "TAG_TYPE_INT" - }, - { - "name": "dump_period", - "type": "TAG_TYPE_INT" - }, - { - "name": "create_time", - "type": "TAG_TYPE_INT" - }, - { - "name": "max_sampling_count", + "name": "layer", "type": "TAG_TYPE_INT" } ]
