From 6b59977060cb100eeb65f8464f3fce0fd0487573 Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Wed, 12 Mar 2025 22:40:37 +0800 Subject: [PATCH] Remove banyandb config from data-generator and profile-exporter's application.yml (#13099) --- .../src/main/resources/application.yml | 50 +------------------ tools/profile-exporter/application.yml | 30 +---------- 2 files changed, 2 insertions(+), 78 deletions(-) diff --git a/oap-server/server-tools/data-generator/src/main/resources/application.yml b/oap-server/server-tools/data-generator/src/main/resources/application.yml index c7fbcbfc37..2e5a5eae61 100755 --- a/oap-server/server-tools/data-generator/src/main/resources/application.yml +++ b/oap-server/server-tools/data-generator/src/main/resources/application.yml @@ -157,55 +157,7 @@ storage: maxSizeOfBatchSql: ${SW_STORAGE_MAX_SIZE_OF_BATCH_SQL:2000} asyncBatchPersistentPoolSize: ${SW_STORAGE_ASYNC_BATCH_PERSISTENT_POOL_SIZE:4} banyandb: - # Targets is the list of BanyanDB servers, separated by commas. - # Each target is a BanyanDB server in the format of `host:port` - # If the BanyanDB is deployed as a standalone server, the target should be the IP address or domain name and port of the BanyanDB server. - # If the BanyanDB is deployed in a cluster, the targets should be the IP address or domain name and port of the `liaison` nodes, separated by commas. - targets: ${SW_STORAGE_BANYANDB_TARGETS:127.0.0.1:17912} - # The max number of records in a bulk write request. - # Bigger value can improve the write performance, but also increase the OAP and BanyanDB Server memory usage. - maxBulkSize: ${SW_STORAGE_BANYANDB_MAX_BULK_SIZE:10000} - # The minimum seconds between two bulk flushes. - # If the data in a bulk is less than maxBulkSize, the data will be flushed after this period. - # If the data in a bulk is more than maxBulkSize, the data will be flushed immediately. - # Bigger value can reduce the write pressure on BanyanDB Server, but also increase the latency of the data. - flushInterval: ${SW_STORAGE_BANYANDB_FLUSH_INTERVAL:15} - # The timeout seconds of a bulk flush. - flushTimeout: ${SW_STORAGE_BANYANDB_FLUSH_TIMEOUT:10} - # The shard number of `measure` groups that store the metrics data. - metricsShardsNumber: ${SW_STORAGE_BANYANDB_METRICS_SHARDS_NUMBER:1} - # The shard number of `stream` groups that store the trace, log and profile data. - recordShardsNumber: ${SW_STORAGE_BANYANDB_RECORD_SHARDS_NUMBER:1} - # The multiplier of the number of shards of the super dataset. - # Super dataset is a special dataset that stores the trace or log data that is too large to be stored in the normal dataset. - # If the normal dataset has `n` shards, the super dataset will have `n * superDatasetShardsFactor` shards. - # For example, supposing `recordShardsNumber` is 3, and `superDatasetShardsFactor` is 2, - # `segment-default` is a normal dataset that has 3 shards, and `segment-minute` is a super dataset that has 6 shards. - superDatasetShardsFactor: ${SW_STORAGE_BANYANDB_SUPERDATASET_SHARDS_FACTOR:2} - # The number of threads that write data to BanyanDB concurrently. - # Bigger value can improve the write performance, but also increase the OAP and BanyanDB Server CPU usage. - concurrentWriteThreads: ${SW_STORAGE_BANYANDB_CONCURRENT_WRITE_THREADS:15} - # The maximum size of dataset when the OAP loads cache, such as network aliases. - resultWindowMaxSize: ${SW_STORAGE_BANYANDB_QUERY_MAX_WINDOW_SIZE:10000} - # The maximum size of metadata per query. - metadataQueryMaxSize: ${SW_STORAGE_BANYANDB_QUERY_MAX_SIZE:10000} - # The maximum size of trace segments per query. - segmentQueryMaxSize: ${SW_STORAGE_BANYANDB_QUERY_SEGMENT_SIZE:200} - # The max number of profile task query in a request. - profileTaskQueryMaxSize: ${SW_STORAGE_BANYANDB_QUERY_PROFILE_TASK_SIZE:200} - # The batch size of query profiling data. - profileDataQueryBatchSize: ${SW_STORAGE_BANYANDB_QUERY_PROFILE_DATA_BATCH_SIZE:100} - # Data is stored in BanyanDB in segments. A segment is a time range of data. - # The segment interval is the time range of a segment. - # The value should be less or equal to data TTL relevant settings. - segmentIntervalDays: ${SW_STORAGE_BANYANDB_SEGMENT_INTERVAL_DAYS:1} - # The super dataset segment interval is the time range of a segment in the super dataset. - superDatasetSegmentIntervalDays: ${SW_STORAGE_BANYANDB_SUPER_DATASET_SEGMENT_INTERVAL_DAYS:1} - # Specific groups settings. - # For example, {"group1": {"blockIntervalHours": 4, "segmentIntervalDays": 1}} - # Please refer to https://github.com/apache/skywalking-banyandb/blob/${BANYANDB_RELEASE}/docs/crud/group.md#create-operation - # for group setting details. - specificGroupSettings: ${SW_STORAGE_BANYANDB_SPECIFIC_GROUP_SETTINGS:""} + # Since 10.2.0, the banyandb configuration is separated to an independent configuration file: `bydb.yaml`. agent-analyzer: selector: ${SW_AGENT_ANALYZER:default} diff --git a/tools/profile-exporter/application.yml b/tools/profile-exporter/application.yml index d47f5d3137..0750659556 100644 --- a/tools/profile-exporter/application.yml +++ b/tools/profile-exporter/application.yml @@ -49,35 +49,7 @@ storage: dataSource.useServerPrepStmts: ${SW_DATA_SOURCE_USE_SERVER_PREP_STMTS:true} metadataQueryMaxSize: ${SW_STORAGE_MYSQL_QUERY_MAX_SIZE:5000} banyandb: - targets: ${SW_STORAGE_BANYANDB_TARGETS:127.0.0.1:17912} - maxBulkSize: ${SW_STORAGE_BANYANDB_MAX_BULK_SIZE:10000} - flushInterval: ${SW_STORAGE_BANYANDB_FLUSH_INTERVAL:15} - flushTimeout: ${SW_STORAGE_BANYANDB_FLUSH_TIMEOUT:10} - concurrentWriteThreads: ${SW_STORAGE_BANYANDB_CONCURRENT_WRITE_THREADS:15} - resultWindowMaxSize: ${SW_STORAGE_BANYANDB_QUERY_MAX_WINDOW_SIZE:10000} - metadataQueryMaxSize: ${SW_STORAGE_BANYANDB_QUERY_MAX_SIZE:10000} - segmentQueryMaxSize: ${SW_STORAGE_BANYANDB_QUERY_SEGMENT_SIZE:200} - profileTaskQueryMaxSize: ${SW_STORAGE_BANYANDB_QUERY_PROFILE_TASK_SIZE:200} - profileDataQueryBatchSize: ${SW_STORAGE_BANYANDB_QUERY_PROFILE_DATA_BATCH_SIZE:100} - sslTrustCAPath: ${SW_STORAGE_BANYANDB_SSL_TRUST_CA_PATH:""} - grNormalShardNum: ${SW_STORAGE_BANYANDB_GR_NORMAL_SHARD_NUM:1} - grNormalSIDays: ${SW_STORAGE_BANYANDB_GR_NORMAL_SI_DAYS:1} - grNormalTTLDays: ${SW_STORAGE_BANYANDB_GR_NORMAL_TTL_DAYS:3} - grSuperShardNum: ${SW_STORAGE_BANYANDB_GR_SUPER_SHARD_NUM:2} - grSuperSIDays: ${SW_STORAGE_BANYANDB_GR_SUPER_SI_DAYS:1} - grSuperTTLDays: ${SW_STORAGE_BANYANDB_GR_SUPER_TTL_DAYS:3} - gmMinuteShardNum: ${SW_STORAGE_BANYANDB_GM_MINUTE_SHARD_NUM:2} - gmMinuteSIDays: ${SW_STORAGE_BANYANDB_GM_MINUTE_SI_DAYS:1} - gmMinuteTTLDays: ${SW_STORAGE_BANYANDB_GM_MINUTE_TTL_DAYS:7} - gmHourShardNum: ${SW_STORAGE_BANYANDB_GM_HOUR_SHARD_NUM:1} - gmHourSIDays: ${SW_STORAGE_BANYANDB_GM_HOUR_SI_DAYS:5} - gmHourTTLDays: ${SW_STORAGE_BANYANDB_GM_HOUR_TTL_DAYS:15} - gmDayShardNum: ${SW_STORAGE_BANYANDB_GM_DAY_SHARD_NUM:1} - gmDaySIDays: ${SW_STORAGE_BANYANDB_GM_DAY_SI_DAYS:15} - gmDayTTLDays: ${SW_STORAGE_BANYANDB_GM_DAY_TTL_DAYS:15} - gmIndexShardNum: ${SW_STORAGE_BANYANDB_GM_INDEX_SHARD_NUM:2} - gmIndexSIDays: ${SW_STORAGE_BANYANDB_GM_INDEX_SI_DAYS:15} - gmIndexTTLDays: ${SW_STORAGE_BANYANDB_GM_INDEX_TTL_DAYS:15} + # Since 10.2.0, the banyandb configuration is separated to an independent configuration file: `bydb.yaml`. telemetry: selector: ${SW_TELEMETRY:none}