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 d8fc911d6853e5660b4e25c0f232a1d248c93fc1 Author: Megrez Lu <[email protected]> AuthorDate: Fri Jan 21 14:12:07 2022 +0800 support events, profile_task and instance_traffic --- .../plugin/banyandb/BanyanDBIndexInstaller.java | 2 +- .../storage/plugin/banyandb/StreamMetaInfo.java | 4 +- .../schema/NetworkAddressAliasBuilder.java | 7 ++- .../banyandb/schema/ProfileTaskRecordBuilder.java | 11 +++- .../plugin/banyandb/stream/BanyanDBBatchDAO.java | 3 +- .../plugin/banyandb/stream/BanyanDBMetricsDAO.java | 2 +- .../stream/BanyanDBNetworkAddressAliasDAO.java | 8 +-- .../stream/BanyanDBProfileTaskQueryDAO.java | 9 ++- .../plugin/banyandb/stream/BanyanDBRecordDAO.java | 2 +- .../src/main/resources/metadata/events.json | 70 ++++++++++++++++++++++ .../{segment/duration.json => create_time.json} | 4 +- .../index_rules/{segment => }/db.instance.json | 2 +- .../index_rules/{segment => }/db.type.json | 2 +- .../index_rules/{ui_template => }/disabled.json | 2 +- .../{segment/duration.json => dump_period.json} | 4 +- .../index_rules/{segment => }/duration.json | 2 +- .../{segment/duration.json => end_time.json} | 4 +- .../{ui_template/name.json => endpoint.json} | 4 +- .../index_rules/{segment => }/endpoint_id.json | 2 +- .../{segment/mq.broker.json => endpoint_name.json} | 4 +- .../index_rules/{segment => }/http.method.json | 2 +- .../index_rules/{ui_template/name.json => id.json} | 4 +- .../{segment/duration.json => last_ping.json} | 6 +- .../duration.json => last_update_time_bucket.json} | 6 +- .../duration.json => max_sampling_count.json} | 4 +- .../duration.json => min_duration_threshold.json} | 4 +- .../index_rules/{segment => }/mq.broker.json | 2 +- .../index_rules/{segment => }/mq.queue.json | 2 +- .../index_rules/{segment => }/mq.topic.json | 2 +- .../index_rules/{ui_template => }/name.json | 2 +- .../{ui_template/name.json => service.json} | 4 +- .../{ui_template/name.json => service_id.json} | 4 +- .../db.instance.json => service_instance.json} | 4 +- .../{segment/duration.json => start_time.json} | 4 +- .../index_rules/{segment => }/status_code.json | 2 +- .../index_rules/{segment => }/trace_id.json | 2 +- .../{ui_template/name.json => type.json} | 2 +- .../{ui_template/name.json => uuid.json} | 4 +- .../main/resources/metadata/instance_traffic.json | 47 +++++++++++++++ .../resources/metadata/network_address_alias.json | 50 ++++++++++++++++ .../src/main/resources/metadata/profile_task.json | 61 +++++++++++++++++++ 41 files changed, 305 insertions(+), 61 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 c9566b1549..6a8f789976 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/StreamMetaInfo.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/StreamMetaInfo.java index 9dda0ead72..de7af730ee 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/StreamMetaInfo.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/StreamMetaInfo.java @@ -103,6 +103,7 @@ public class StreamMetaInfo { try { InputStream is = StreamMetaInfo.class.getClassLoader().getResourceAsStream("metadata/" + name + ".json"); if (is == null) { + log.warn("fail to find definition for {}", name); return null; } String result = CharStreams.toString(new InputStreamReader(is, Charsets.UTF_8)); @@ -118,8 +119,9 @@ public class StreamMetaInfo { private static BanyandbDatabase.IndexRule parseIndexRulesFromJSON(String streamName, String name) { try { InputStream is = StreamMetaInfo.class.getClassLoader().getResourceAsStream(String.join("/", - new String[]{"metadata", "index_rules", streamName, name + ".json"})); + new String[]{"metadata", "index_rules", name + ".json"})); if (is == null) { + log.warn("fail to find index rules for {}", streamName); return null; } String result = CharStreams.toString(new InputStreamReader(is, Charsets.UTF_8)); diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/NetworkAddressAliasBuilder.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/NetworkAddressAliasBuilder.java index ee85a50b03..ca2d78d2ef 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/NetworkAddressAliasBuilder.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/NetworkAddressAliasBuilder.java @@ -35,9 +35,14 @@ public class NetworkAddressAliasBuilder extends BanyanDBStorageDataBuilder<Netwo @Override protected List<SerializableTag<BanyandbModel.TagValue>> dataTags(NetworkAddressAlias entity) { - List<SerializableTag<BanyandbModel.TagValue>> data = new ArrayList<>(); + List<SerializableTag<BanyandbModel.TagValue>> data = new ArrayList<>(3); + // 0 - time_bucket + data.add(TagAndValue.longField(entity.getTimeBucket())); + // 1 - address data.add(TagAndValue.stringField(entity.getAddress())); + // 2 - represent_service_id data.add(TagAndValue.stringField(entity.getRepresentServiceId())); + // 3 - represent_service_instance_id data.add(TagAndValue.stringField(entity.getRepresentServiceInstanceId())); 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/ProfileTaskRecordBuilder.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ProfileTaskRecordBuilder.java index bc91290976..23a5bf8fdf 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ProfileTaskRecordBuilder.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/schema/ProfileTaskRecordBuilder.java @@ -30,14 +30,23 @@ public class ProfileTaskRecordBuilder extends BanyanDBStorageDataBuilder<Profile @Override protected List<SerializableTag<BanyandbModel.TagValue>> searchableTags(ProfileTaskRecord entity) { List<SerializableTag<BanyandbModel.TagValue>> searchable = new ArrayList<>(9); + // 0 - id searchable.add(TagAndValue.stringField(entity.id())); + // 1 - service_id searchable.add(TagAndValue.stringField(entity.getServiceId())); + // 2 - endpoint_name searchable.add(TagAndValue.stringField(entity.getEndpointName())); + // 3 - start_time searchable.add(TagAndValue.longField(entity.getStartTime())); + // 4 - duration searchable.add(TagAndValue.longField(entity.getDuration())); + // 5 - min_duration_threshold searchable.add(TagAndValue.longField(entity.getMinDurationThreshold())); - searchable.add(TagAndValue.longField(entity.getDuration())); + // 6 - dump_period + searchable.add(TagAndValue.longField(entity.getDumpPeriod())); + // 7 - create_time searchable.add(TagAndValue.longField(entity.getCreateTime())); + // 8 - max_sampling_count searchable.add(TagAndValue.longField(entity.getMaxSamplingCount())); return searchable; } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBatchDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBatchDAO.java index 9404996887..040b031828 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBatchDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBatchDAO.java @@ -62,9 +62,10 @@ public class BanyanDBBatchDAO extends AbstractDAO<BanyanDBStorageClient> impleme if (CollectionUtils.isNotEmpty(prepareRequests)) { return CompletableFuture.allOf(prepareRequests.stream().map(prepareRequest -> { - if (prepareRequest instanceof InsertRequest) { + if (prepareRequest instanceof BanyanDBStreamInsertRequest) { // TODO: return CompletableFuture<Void> this.bulkProcessor.add(((BanyanDBStreamInsertRequest) prepareRequest).getStreamWrite()); + } else { } return CompletableFuture.completedFuture(null); }).toArray(CompletableFuture[]::new)); diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetricsDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetricsDAO.java index 5aa1b7657d..f1ed5b8d61 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetricsDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBMetricsDAO.java @@ -45,7 +45,7 @@ public class BanyanDBMetricsDAO<T extends Metrics> implements IMetricsDAO { public InsertRequest prepareBatchInsert(Model model, Metrics metrics) throws IOException { StreamWrite.StreamWriteBuilder builder = this.storageBuilder.entity2Storage((T) metrics) .name(model.getName()) - .timestamp(TimeBucket.getTimeBucket(metrics.getTimeBucket(), model.getDownsampling())); + .timestamp(TimeBucket.getTimestamp(metrics.getTimeBucket(), model.getDownsampling())); return new BanyanDBStreamInsertRequest(builder.build()); } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBNetworkAddressAliasDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBNetworkAddressAliasDAO.java index 33aec37bac..d5006ea689 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBNetworkAddressAliasDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBNetworkAddressAliasDAO.java @@ -62,13 +62,13 @@ public class BanyanDBNetworkAddressAliasDAO extends AbstractBanyanDBDAO implemen // searchable - last_update_time_bucket model.setLastUpdateTimeBucket(((Number) searchable.get(0).getValue()).longValue()); final List<TagAndValue<?>> data = row.getTagFamilies().get(1); - // data - time_bucket + // data 0 - time_bucket model.setTimeBucket(((Number) data.get(0).getValue()).longValue()); - // data - address + // data 1 - address model.setAddress((String) data.get(1).getValue()); - // data - represent_service_id + // data 2 - represent_service_id model.setRepresentServiceId((String) data.get(2).getValue()); - // data - represent_service_instance_id + // data 3 - represent_service_instance_id model.setRepresentServiceInstanceId((String) data.get(3).getValue()); return model; } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBProfileTaskQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBProfileTaskQueryDAO.java index 1cbaea95af..93cc99c6c3 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBProfileTaskQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBProfileTaskQueryDAO.java @@ -29,6 +29,7 @@ import org.apache.skywalking.oap.server.core.query.type.ProfileTask; import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO; import org.apache.skywalking.oap.server.library.util.StringUtil; import org.apache.skywalking.oap.server.storage.plugin.banyandb.BanyanDBStorageClient; +import org.apache.skywalking.oap.server.storage.plugin.banyandb.StreamMetaInfo; import java.io.IOException; import java.util.List; @@ -39,8 +40,6 @@ import java.util.stream.Collectors; * {@link org.apache.skywalking.oap.server.core.profile.ProfileTaskRecord} is a stream */ public class BanyanDBProfileTaskQueryDAO extends AbstractBanyanDBDAO implements IProfileTaskQueryDAO { - public static final String ID = "profile_task_query_id"; - public BanyanDBProfileTaskQueryDAO(BanyanDBStorageClient client) { super(client); } @@ -48,7 +47,7 @@ public class BanyanDBProfileTaskQueryDAO extends AbstractBanyanDBDAO implements @Override public List<ProfileTask> getTaskList(String serviceId, String endpointName, Long startTimeBucket, Long endTimeBucket, Integer limit) throws IOException { StreamQueryResponse resp = query(ProfileTaskRecord.INDEX_NAME, - ImmutableList.of(ID, ProfileTaskRecord.SERVICE_ID, ProfileTaskRecord.ENDPOINT_NAME, + ImmutableList.of(StreamMetaInfo.ID, ProfileTaskRecord.SERVICE_ID, ProfileTaskRecord.ENDPOINT_NAME, ProfileTaskRecord.START_TIME, ProfileTaskRecord.DURATION, ProfileTaskRecord.MIN_DURATION_THRESHOLD, ProfileTaskRecord.DUMP_PERIOD, ProfileTaskRecord.CREATE_TIME, ProfileTaskRecord.MAX_SAMPLING_COUNT), new QueryBuilder() { @Override @@ -87,13 +86,13 @@ public class BanyanDBProfileTaskQueryDAO extends AbstractBanyanDBDAO implements } StreamQueryResponse resp = query(ProfileTaskRecord.INDEX_NAME, - ImmutableList.of(ID, ProfileTaskRecord.SERVICE_ID, ProfileTaskRecord.ENDPOINT_NAME, + ImmutableList.of(StreamMetaInfo.ID, ProfileTaskRecord.SERVICE_ID, ProfileTaskRecord.ENDPOINT_NAME, ProfileTaskRecord.START_TIME, ProfileTaskRecord.DURATION, ProfileTaskRecord.MIN_DURATION_THRESHOLD, ProfileTaskRecord.DUMP_PERIOD, ProfileTaskRecord.CREATE_TIME, ProfileTaskRecord.MAX_SAMPLING_COUNT), new QueryBuilder() { @Override public void apply(StreamQuery query) { - query.appendCondition(eq(ID, id)); + query.appendCondition(eq(StreamMetaInfo.ID, id)); query.setLimit(1); } }); diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBRecordDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBRecordDAO.java index 400731d83e..d028fa91c3 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBRecordDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBRecordDAO.java @@ -37,7 +37,7 @@ public class BanyanDBRecordDAO<T extends Record> implements IRecordDAO { public InsertRequest prepareBatchInsert(Model model, Record record) throws IOException { StreamWrite.StreamWriteBuilder builder = storageBuilder.entity2Storage((T) record) .name(model.getName()) - .timestamp(TimeBucket.getTimeBucket(record.getTimeBucket(), model.getDownsampling())); + .timestamp(TimeBucket.getTimestamp(record.getTimeBucket(), model.getDownsampling())); return new BanyanDBStreamInsertRequest(builder.build()); } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/events.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/events.json new file mode 100644 index 0000000000..9c0f091ac2 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/events.json @@ -0,0 +1,70 @@ +{ + "metadata": { + "name": "events", + "group": "default" + }, + "tag_families": [ + { + "name": "data", + "tags": [ + { + "name": "message", + "type": "TAG_TYPE_STRING" + }, + { + "name": "parameters", + "type": "TAG_TYPE_STRING" + } + ] + }, + { + "name": "searchable", + "tags": [ + { + "name": "uuid", + "type": "TAG_TYPE_STRING" + }, + { + "name": "service", + "type": "TAG_TYPE_STRING" + }, + { + "name": "service_instance", + "type": "TAG_TYPE_STRING" + }, + { + "name": "endpoint", + "type": "TAG_TYPE_STRING" + }, + { + "name": "name", + "type": "TAG_TYPE_STRING" + }, + { + "name": "type", + "type": "TAG_TYPE_STRING" + }, + { + "name": "start_time", + "type": "TAG_TYPE_INT" + }, + { + "name": "end_time", + "type": "TAG_TYPE_INT" + } + ] + } + ], + "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/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/create_time.json similarity index 77% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/create_time.json index 9ae7387089..addab64e17 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/create_time.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "segment_duration", + "name": "create_time", "group": "default" }, "tags": [ - "duration" + "create_time" ], "type": "TYPE_TREE", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.instance.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/db.instance.json similarity index 84% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.instance.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/db.instance.json index d1b85c2be2..5d5c159c39 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.instance.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/db.instance.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_db.instance", + "name": "db.instance", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.type.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/db.type.json similarity index 85% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.type.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/db.type.json index 479751ba13..67914ee464 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.type.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/db.type.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_db.type", + "name": "db.type", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/disabled.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/disabled.json similarity index 83% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/disabled.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/disabled.json index 9146c34d11..8cfb12816a 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/disabled.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/disabled.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "ui_template_disabled", + "name": "disabled", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dump_period.json similarity index 77% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dump_period.json index 9ae7387089..25ae87f411 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/dump_period.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "segment_duration", + "name": "dump_period", "group": "default" }, "tags": [ - "duration" + "dump_period" ], "type": "TYPE_TREE", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/duration.json similarity index 84% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/duration.json index 9ae7387089..6f18db1359 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/duration.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_duration", + "name": "duration", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/end_time.json similarity index 77% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/end_time.json index 9ae7387089..951a1c88b9 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/end_time.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "segment_duration", + "name": "end_time", "group": "default" }, "tags": [ - "duration" + "end_time" ], "type": "TYPE_TREE", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint.json similarity index 79% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint.json index 067ca7f123..f9fefdddf0 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "ui_template_name", + "name": "endpoint", "group": "default" }, "tags": [ - "name" + "endpoint" ], "type": "TYPE_INVERTED", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/endpoint_id.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint_id.json similarity index 84% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/endpoint_id.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint_id.json index ca368266a8..7da3b0d2f5 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/endpoint_id.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint_id.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_endpoint_id", + "name": "endpoint_id", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.broker.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint_name.json similarity index 77% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.broker.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint_name.json index 4dca9074a5..0678ae4691 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.broker.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/endpoint_name.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "segment_mq.broker", + "name": "endpoint_name", "group": "default" }, "tags": [ - "mq.broker" + "endpoint_name" ], "type": "TYPE_INVERTED", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/http.method.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/http.method.json similarity index 84% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/http.method.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/http.method.json index 3b5794ec09..3001154bfc 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/http.method.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/http.method.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_http.method", + "name": "http.method", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/id.json similarity index 79% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/id.json index 067ca7f123..c90b39ac62 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/id.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "ui_template_name", + "name": "id", "group": "default" }, "tags": [ - "name" + "id" ], "type": "TYPE_INVERTED", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/last_ping.json similarity index 76% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/last_ping.json index 9ae7387089..7d063b2dd4 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/last_ping.json @@ -1,12 +1,12 @@ { "metadata": { - "name": "segment_duration", + "name": "last_ping", "group": "default" }, "tags": [ - "duration" + "last_ping" ], "type": "TYPE_TREE", "location": "LOCATION_SERIES", "updated_at": "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/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/last_update_time_bucket.json similarity index 69% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/last_update_time_bucket.json index 9ae7387089..bbde5cf37b 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/last_update_time_bucket.json @@ -1,12 +1,12 @@ { "metadata": { - "name": "segment_duration", + "name": "last_update_time_bucket", "group": "default" }, "tags": [ - "duration" + "last_update_time_bucket" ], "type": "TYPE_TREE", "location": "LOCATION_SERIES", "updated_at": "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/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/max_sampling_count.json similarity index 73% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/max_sampling_count.json index 9ae7387089..1fb14a84c2 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/max_sampling_count.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "segment_duration", + "name": "max_sampling_count", "group": "default" }, "tags": [ - "duration" + "max_sampling_count" ], "type": "TYPE_TREE", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/min_duration_threshold.json similarity index 70% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/min_duration_threshold.json index 9ae7387089..f359e2d5ba 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/min_duration_threshold.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "segment_duration", + "name": "min_duration_threshold", "group": "default" }, "tags": [ - "duration" + "min_duration_threshold" ], "type": "TYPE_TREE", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.broker.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.broker.json similarity index 84% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.broker.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.broker.json index 4dca9074a5..0cfbd278dd 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.broker.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.broker.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_mq.broker", + "name": "mq.broker", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.queue.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.queue.json similarity index 85% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.queue.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.queue.json index 1b3126e056..0c589fc6e4 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.queue.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.queue.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_mq.queue", + "name": "mq.queue", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.topic.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.topic.json similarity index 85% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.topic.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.topic.json index ddae44b1a1..5dc51fcf66 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/mq.topic.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/mq.topic.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_mq.topic", + "name": "mq.topic", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/name.json similarity index 84% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/name.json index 067ca7f123..db25d029f2 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/name.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "ui_template_name", + "name": "name", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service.json similarity index 79% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service.json index 067ca7f123..4764f16eca 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "ui_template_name", + "name": "service", "group": "default" }, "tags": [ - "name" + "service" ], "type": "TYPE_INVERTED", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service_id.json similarity index 79% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service_id.json index 067ca7f123..76c3f67d22 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service_id.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "ui_template_name", + "name": "service_id", "group": "default" }, "tags": [ - "name" + "service_id" ], "type": "TYPE_INVERTED", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.instance.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service_instance.json similarity index 75% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.instance.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service_instance.json index d1b85c2be2..73d84e7151 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/db.instance.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/service_instance.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "segment_db.instance", + "name": "service_instance", "group": "default" }, "tags": [ - "db.instance" + "service_instance" ], "type": "TYPE_INVERTED", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/start_time.json similarity index 77% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/start_time.json index 9ae7387089..5a73ad12f4 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/duration.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/start_time.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "segment_duration", + "name": "start_time", "group": "default" }, "tags": [ - "duration" + "start_time" ], "type": "TYPE_TREE", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/status_code.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/status_code.json similarity index 84% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/status_code.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/status_code.json index 3e472a1669..ad034773f5 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/status_code.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/status_code.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_status_code", + "name": "status_code", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/trace_id.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/trace_id.json similarity index 84% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/trace_id.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/trace_id.json index 3ac579999c..2f84bfb489 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/segment/trace_id.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/trace_id.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "segment_trace_id", + "name": "trace_id", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/type.json similarity index 84% copy from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json copy to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/type.json index 067ca7f123..db25d029f2 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/type.json @@ -1,6 +1,6 @@ { "metadata": { - "name": "ui_template_name", + "name": "name", "group": "default" }, "tags": [ diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/uuid.json similarity index 79% rename from oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json rename to oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/uuid.json index 067ca7f123..4cd401c3dc 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/ui_template/name.json +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/index_rules/uuid.json @@ -1,10 +1,10 @@ { "metadata": { - "name": "ui_template_name", + "name": "uuid", "group": "default" }, "tags": [ - "name" + "uuid" ], "type": "TYPE_INVERTED", "location": "LOCATION_SERIES", diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/instance_traffic.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/instance_traffic.json new file mode 100644 index 0000000000..b63b29c2c2 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/instance_traffic.json @@ -0,0 +1,47 @@ +{ + "metadata": { + "name": "instance_traffic", + "group": "default" + }, + "tag_families": [ + { + "name": "data", + "tags": [ + { + "name": "data_binary", + "type": "TAG_TYPE_DATA_BINARY" + } + ] + }, + { + "name": "searchable", + "tags": [ + { + "name": "service_id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "last_ping", + "type": "TAG_TYPE_INT" + }, + { + "name": "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/network_address_alias.json b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/network_address_alias.json new file mode 100644 index 0000000000..6d46d97799 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/network_address_alias.json @@ -0,0 +1,50 @@ +{ + "metadata": { + "name": "network_address_alias", + "group": "default" + }, + "tag_families": [ + { + "name": "data", + "tags": [ + { + "name": "time_bucket", + "type": "TAG_TYPE_INT" + }, + { + "name": "address", + "type": "TAG_TYPE_STRING" + }, + { + "name": "represent_service_id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "represent_service_instance_id", + "type": "TAG_TYPE_STRING" + } + ] + }, + { + "name": "searchable", + "tags": [ + { + "name": "last_update_time_bucket", + "type": "TAG_TYPE_INT" + } + ] + } + ], + "entity": { + "tag_names": [ + ] + }, + "opts": { + "shard_num": 2, + "ttl": { + "val": 52000, + "unit": "DURATION_UNIT_WEEK" + } + }, + "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/profile_task.json new file mode 100644 index 0000000000..23f89f19c4 --- /dev/null +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/resources/metadata/profile_task.json @@ -0,0 +1,61 @@ +{ + "metadata": { + "name": "profile_task", + "group": "default" + }, + "tag_families": [ + { + "name": "searchable", + "tags": [ + { + "name": "id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "service_id", + "type": "TAG_TYPE_STRING" + }, + { + "name": "endpoint_name", + "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", + "type": "TAG_TYPE_INT" + } + ] + } + ], + "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
