You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2024/04/25 05:45:31 UTC
(skywalking) 02/02: Merge remote-tracking branch 'origin/master' into bump-banyandb-api
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch bump-banyandb-api
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit ad80d9cca7a862b719f7dd8229cb9bfe01b77c3c
Merge: d7c47357fd fe2c4b5f3f
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Apr 25 13:15:01 2024 +0800
Merge remote-tracking branch 'origin/master' into bump-banyandb-api
.github/workflows/skywalking.yaml | 6 +-
.licenserc.yaml | 9 +-
dist-material/alarm-settings.yml | 2 +-
dist-material/release-docs/LICENSE | 115 +-
docs/en/api/metrics-query-expression.md | 84 +-
docs/en/api/promql-service.md | 32 +-
docs/en/changes/changes.md | 44 +
docs/en/concepts-and-designs/oal.md | 7 +-
.../service-hierarchy-configuration.md | 4 +-
docs/en/concepts-and-designs/service-hierarchy.md | 195 +-
.../setup/backend/backend-activemq-monitoring.md | 107 +
docs/en/setup/backend/backend-alarm.md | 4 +-
.../en/setup/backend/backend-mongodb-monitoring.md | 34 +-
docs/en/setup/backend/backend-mysql-monitoring.md | 24 +-
docs/en/setup/backend/backend-redis-monitoring.md | 24 +-
docs/en/setup/backend/configuration-vocabulary.md | 4 +-
docs/en/setup/backend/exporter.md | 2 +-
docs/en/setup/backend/opentelemetry-receiver.md | 2 +
docs/en/swip/SWIP-8.md | 100 +
docs/en/swip/readme.md | 3 +-
docs/menu.yml | 2 +
oap-server-bom/pom.xml | 14 +-
.../skywalking/oap/meter/analyzer/Analyzer.java | 24 +-
.../oap/meter/analyzer/dsl/AnalyzerTest.java | 38 +-
.../provider/grpc/GRPCMetricsExporter.java | 191 +-
.../exporter/src/main/proto/metric-exporter.proto | 26 +-
.../exporter/provider/grpc/GRPCExporterTest.java | 67 +-
...ueMetrics.java => MockLabeledValueMetrics.java} | 14 +-
.../provider/grpc/MockMetricExportServiceImpl.java | 41 +-
.../server/exporter/provider/grpc/MockMetrics.java | 2 +-
.../apache/skywalking/mqe/rt/grammar/MQEParser.g4 | 20 +-
.../apache/skywalking/mqe/rt/MQEVisitorBase.java | 96 +-
.../mqe/rt/operation/AggregateLabelsOp.java | 81 +-
.../apache/skywalking/mqe/rt/operation/LROp.java | 60 +-
.../mqe/rt/operation/LogicalFunctionOp.java | 2 -
.../apache/skywalking/mqe/rt/type/MQEValues.java | 2 +-
.../apache/skywalking/mqe/rt/type/Metadata.java | 5 +
.../skywalking/mqe/rt/AggregateLabelsOpTest.java | 69 +-
.../skywalking/mqe/rt/AggregationOpTest.java | 48 +-
.../org/apache/skywalking/mqe/rt/BinaryOpTest.java | 46 +-
.../apache/skywalking/mqe/rt/CompareOPTest.java | 48 +-
.../mqe/rt/MathematicalFunctionOpTest.java | 7 +-
.../org/apache/skywalking/mqe/rt/MockData.java | 6 +
.../server/core/alarm/provider/RunningRule.java | 13 +-
.../provider/expr/rt/AlarmMQEVerifyVisitor.java | 39 +-
.../alarm/provider/expr/rt/AlarmMQEVisitor.java | 82 +-
.../core/alarm/provider/RunningRuleTest.java | 102 +-
.../apache/skywalking/oap/server/core/Const.java | 3 +
.../skywalking/oap/server/core/analysis/Layer.java | 7 +-
.../service/ServiceRelationClientSideMetrics.java | 1 -
.../service/ServiceRelationServerSideMetrics.java | 1 -
.../analysis/meter/function/BucketedValues.java | 6 +-
.../meter/function/PercentileFunction.java | 317 ---
.../avg/AvgHistogramPercentileFunction.java | 38 +-
.../sum/SumHistogramPercentileFunction.java | 38 +-
.../server/core/analysis/metrics/DataLabel.java | 92 +
.../server/core/analysis/metrics/DataTable.java | 37 +-
.../oap/server/core/analysis/metrics/Metrics.java | 10 +-
.../analysis/metrics/MultiIntValuesHolder.java | 2 +
.../core/analysis/metrics/PercentileMetrics.java | 6 +-
...centileMetrics.java => PercentileMetrics2.java} | 41 +-
.../ui/template/UITemplateInitializer.java | 1 +
.../server/core/query/AggregationQueryService.java | 4 +
.../oap/server/core/query/MetricsQueryService.java | 24 +-
.../oap/server/core/query/RecordQueryService.java | 4 +
.../oap/server/core/storage/annotation/Column.java | 8 +
.../storage/annotation/ValueColumnMetadata.java | 14 +-
.../server/core/storage/model/StorageModels.java | 3 +-
.../core/storage/query/IMetricsQueryDAO.java | 169 +-
.../meter/function/PercentileFunctionTest.java | 233 --
.../function/avg/AvgHistogramFunctionTest.java | 3 -
.../avg/AvgHistogramPercentileFunctionTest.java | 30 +-
.../sum/SumHistogramPercentileFunctionTest.java | 32 +-
.../core/storage/query/MetricsQueryUtilTest.java | 54 +-
.../agent/kafka/module/KafkaFetcherConfig.java | 5 -
.../skywalking/promql/rt/grammar/PromQLParser.g4 | 2 +-
.../oap/query/promql/entity/LabelName.java | 4 +
.../oap/query/promql/entity/LabelValuePair.java | 2 +-
.../promql/entity/codec/MetricInfoSerializer.java | 2 +-
.../promql/entity/response/LabelsQueryRsp.java | 3 +-
.../oap/query/promql/handler/PromQLApiHandler.java | 308 ++-
.../query/promql/rt/PromQLExprQueryVisitor.java | 159 +-
.../oap/query/promql/rt/PromQLMatchVisitor.java | 12 +-
.../query/promql/rt/result/MatcherSetResult.java | 3 +-
.../rt/parser/PromQLExprQueryVisitorTest.java | 19 +-
.../oap/query/graphql/mqe/rt/MQEVisitor.java | 106 +-
.../graphql/resolver/MetricsExpressionQuery.java | 8 +-
.../oap/query/graphql/resolver/MetricsQuery.java | 8 +-
.../src/main/resources/query-protocol | 2 +-
.../envoy/als/istio/IstioServiceEntryRegistry.java | 4 +
.../otlp/OpenTelemetryMetricRequestProcessor.java | 18 +-
.../zabbix/provider/ZabbixMetricsTest.java | 12 +-
.../src/main/resources/application.yml | 6 +-
.../src/main/resources/hierarchy-definition.yml | 8 +-
.../src/main/resources/log-mal-rules/nginx.yaml | 2 +-
.../src/main/resources/oal/browser.oal | 14 +-
.../server-starter/src/main/resources/oal/core.oal | 26 +-
.../otel-rules/activemq/activemq-broker.yaml | 97 +
.../otel-rules/activemq/activemq-cluster.yaml | 95 +
.../otel-rules/activemq/activemq-destination.yaml | 79 +
.../src/main/resources/otel-rules/apisix.yaml | 24 +-
.../otel-rules/mongodb/mongodb-cluster.yaml | 16 +-
.../resources/otel-rules/mongodb/mongodb-node.yaml | 8 +-
.../resources/otel-rules/mysql/mysql-service.yaml | 34 +-
.../resources/otel-rules/nginx/nginx-endpoint.yaml | 2 +-
.../resources/otel-rules/nginx/nginx-instance.yaml | 2 +-
.../resources/otel-rules/nginx/nginx-service.yaml | 16 +-
.../otel-rules/postgresql/postgresql-instance.yaml | 10 +-
.../otel-rules/postgresql/postgresql-service.yaml | 20 +-
.../resources/otel-rules/redis/redis-service.yaml | 34 +-
.../src/main/resources/otel-rules/windows.yaml | 6 +-
.../activemq/activemq-broker.json | 355 +++
.../activemq/activemq-cluster.json | 509 ++++
.../activemq/activemq-destination.json | 226 ++
.../activemq/activemq-root.json | 46 +
.../apisix/apisix-endpoint.json | 20 +-
.../apisix/apisix-instance.json | 69 +-
.../apisix/apisix-root.json | 87 +-
.../apisix/apisix-service.json | 63 +-
.../aws_dynamodb/aws_dynamodb-endpoint.json | 467 ++--
.../aws_dynamodb/aws_dynamodb-root.json | 74 +-
.../aws_dynamodb/aws_dynamodb-service.json | 654 +++--
.../aws_eks/aws_eks-cluster.json | 50 +-
.../aws_eks/aws_eks-node.json | 72 -
.../aws_eks/aws_eks-root.json | 22 +-
.../aws_eks/aws_eks-service.json | 27 -
.../aws_gateway/aws_gateway-root.json | 22 +-
.../aws_gateway/aws_gateway_endpoint.json | 34 -
.../aws_gateway/aws_gateway_service.json | 42 -
.../aws_s3/aws_s3-root.json | 22 +-
.../aws_s3/aws_s3-service.json | 57 -
.../bookkeeper/bookkeeper-cluster.json | 127 +-
.../bookkeeper/bookkeeper-node.json | 81 -
.../bookkeeper/bookkeeper-root.json | 10 +-
.../browser/browser-app.json | 120 +-
.../browser/browser-page.json | 59 +-
.../browser/browser-root.json | 25 +-
.../browser/browser-version.json | 36 +-
.../clickhouse/clickhouse-instance.json | 1621 ++++++-------
.../clickhouse/clickhouse-root.json | 5 +-
.../clickhouse/clickhouse-service.json | 1439 +++++------
.../elasticsearch/elasticsearch-cluster.json | 570 +++--
.../elasticsearch/elasticsearch-index.json | 938 ++++----
.../elasticsearch/elasticsearch-node.json | 1462 +++++------
.../elasticsearch/elasticsearch-root.json | 74 +-
.../general/general-endpoint-relation.json | 19 +-
.../general/general-endpoint.json | 49 +-
.../general/general-instance-relation.json | 37 +-
.../general/general-instance.json | 234 --
.../general/general-root.json | 30 +-
.../general/general-service-relation.json | 52 +-
.../general/general-service.json | 118 +-
.../ui-initialized-templates/k8s/k8s-cluster.json | 93 +-
.../ui-initialized-templates/k8s/k8s-node.json | 47 +-
.../ui-initialized-templates/k8s/k8s-root.json | 28 +-
.../k8s_service/K8S-Endpoint.json | 31 +-
.../k8s_service/K8S-Service-Instance-Relation.json | 202 +-
.../k8s_service/K8S-Service-Relation.json | 228 +-
.../k8s_service/k8s-process-relation.json | 2541 +++++++++-----------
.../k8s_service/k8s-service-pod.json | 128 +-
.../k8s_service/k8s-service-root.json | 31 +-
.../k8s_service/k8s-service-service.json | 228 +-
.../kafka/kafka-broker.json | 1225 +++++-----
.../kafka/kafka-cluster.json | 508 ++--
.../ui-initialized-templates/kafka/kafka-root.json | 89 +-
.../resources/ui-initialized-templates/menu.yaml | 5 +
.../mesh/mesh-endpoint.json | 17 +-
.../mesh/mesh-instance-relation.json | 47 +-
.../mesh/mesh-instance.json | 72 -
.../mesh/mesh-proces-relation.json | 179 +-
.../mesh/mesh-process.json | 27 +-
.../ui-initialized-templates/mesh/mesh-root.json | 31 +-
.../mesh/mesh-service-relation.json | 93 +-
.../mesh/mesh-service.json | 89 +-
.../mesh_cp/mesh-control-plane-root.json | 8 -
.../mesh_cp/mesh-control-plane-service.json | 58 -
.../mesh_dp/mesh-data-plane-instance.json | 47 -
.../mesh_dp/mesh-data-plane-process-relation.json | 191 +-
.../mesh_dp/mesh-data-plane-root.json | 23 +-
.../mesh_dp/mesh-data-plane-service.json | 16 +-
.../mongodb/mongodb-cluster.json | 548 ++---
.../mongodb/mongodb-node.json | 1070 ++++-----
.../mongodb/mongodb-root.json | 71 +-
.../mysql/mysql-instance.json | 441 ++--
.../ui-initialized-templates/mysql/mysql-root.json | 92 +-
.../mysql/mysql-service.json | 677 +++---
.../nginx/nginx-endpoint.json | 33 +-
.../nginx/nginx-instance.json | 49 +-
.../nginx/nginx-service.json | 73 +-
.../os_linux/linux-root.json | 23 +-
.../os_linux/linux-service.json | 65 +-
.../os_windows/windows-root.json | 22 +-
.../os_windows/windows-service.json | 455 ++--
.../postgresql/postgresql-instance.json | 1275 +++++-----
.../postgresql/postgresql-root.json | 88 +-
.../postgresql/postgresql-service.json | 1064 ++++----
.../pulsar/pulsar-broker.json | 98 +-
.../pulsar/pulsar-cluster.json | 123 +-
.../pulsar/pulsar-root.json | 10 +-
.../rabbitmq/rabbitmq-cluster.json | 219 +-
.../rabbitmq/rabbitmq-node.json | 202 --
.../rabbitmq/rabbitmq-root.json | 18 +-
.../redis/redis-instance.json | 418 ++--
.../ui-initialized-templates/redis/redis-root.json | 74 +-
.../redis/redis-service.json | 491 ++--
.../rocketmq/rocketmq-broker.json | 33 -
.../rocketmq/rocketmq-cluster.json | 147 +-
.../rocketmq/rocketmq-root.json | 87 +-
.../rocketmq/rocketmq-topic.json | 98 +-
.../so11y_oap/so11y-instance.json | 94 +-
.../so11y_oap/so11y-service.json | 6 -
.../so11y_satellite/so11y-root.json | 30 +-
.../virtual_cache/virtual-cache-root.json | 22 +-
.../virtual_cache/virtual-cache-service.json | 121 +-
.../virtual_database/virtual-database-root.json | 7 -
.../virtual_database/virtual-database-service.json | 23 +-
.../virtual_mq/virtual-mq-endpoint.json | 31 +-
.../virtual_mq/virtual-mq-root.json | 17 -
.../virtual_mq/virtual-mq-service.json | 38 +-
.../oap/server/starter/UITemplateCheckerTest.java | 9 +-
.../banyandb/measure/BanyanDBMetricsQueryDAO.java | 55 +-
.../elasticsearch/query/MetricsQueryEsDAO.java | 47 +-
.../jdbc/common/dao/JDBCMetricsQueryDAO.java | 64 +-
.../plugin/jdbc/mysql/MySQLTableInstaller.java | 3 -
pom.xml | 4 +-
test/e2e-v2/cases/activemq/activemq-cases.yaml | 133 +
test/e2e-v2/cases/activemq/config/amq/activemq.xml | 130 +
.../config/amq/config.yaml} | 39 +-
test/e2e-v2/cases/activemq/docker-compose.yml | 100 +
test/e2e-v2/cases/{rocketmq => activemq}/e2e.yaml | 2 +-
.../expected/endpoint.yml} | 17 +-
.../expected/instance.yml} | 19 +-
.../metrics-has-value-label-destinationname.yml} | 2 +-
.../metrics-has-value-label-destinationtype.yml} | 2 +-
.../metrics-has-value-label-serviceinstanceid.yml} | 2 +-
.../expected/metrics-has-value.yml} | 4 +-
.../expected/service.yml} | 20 +-
.../otel-collector-config.yaml} | 47 +-
test/e2e-v2/cases/alarm/alarm-settings.yml | 2 +-
test/e2e-v2/cases/apisix/apisix-cases.yaml | 4 +-
.../metrics-has-connection-value-label.yml | 4 +-
.../expected/metrics-has-latency-value-label.yml | 153 +-
.../expected/metrics-has-status-value-label.yml | 2 +-
.../expected/metrics-has-value-percentile.yml | 119 +-
.../expected/metrics-has-value-label.yml | 2 +-
.../cases/elasticsearch/elasticsearch-cases.yaml | 22 +-
.../expected/metrics-has-value-label-breaker.yml} | 2 +-
.../expected/metrics-has-value-label-color.yml} | 2 +-
.../expected/metrics-has-value-label-gc.yml} | 2 +-
.../expected/metrics-has-value-label-mount.yml} | 2 +-
.../expected/metrics-has-value-label-node.yml} | 8 +-
.../expected/metrics-has-value-label-pool.yml} | 2 +-
.../expected/metrics-has-value-label-primary.yml} | 2 +-
.../expected/metrics-has-value-percentile.yml | 2 +-
test/e2e-v2/cases/istio/metrics/e2e.yaml | 4 +-
.../metrics/expected/metrics-has-value-label.yml | 2 +-
.../expected/metrics-has-value-gc-label.yml | 6 +-
.../expected/metrics-has-value-instance-label.yml | 6 +-
.../expected/metrics-has-value-jvm-label.yml | 4 +-
.../expected/metrics-has-value-service-label.yml | 4 +-
.../expected/metrics-has-value-source-label.yml | 8 +-
test/e2e-v2/cases/mariadb/mariadb-cases.yaml | 22 +-
.../expected/metrics-has-value-percentile.yml | 47 -
.../expected/metrics-has-value-label-assert.yml} | 2 +-
.../expected/metrics-has-value-label-count.yml} | 2 +-
...cs-has-value-label-csr-service_instance_id.yml} | 4 +-
.../expected/metrics-has-value-label-csr.yml} | 2 +-
...s-value-label-database-service_instance_id.yml} | 4 +-
...cs-has-value-label-doc-service_instance_id.yml} | 4 +-
.../expected/metrics-has-value-label-doc.yml} | 2 +-
.../expected/metrics-has-value-label-ins.yml} | 2 +-
...has-value-label-legacy-service_instance_id.yml} | 4 +-
.../expected/metrics-has-value-label-legacy.yml} | 2 +-
.../expected/metrics-has-value-label-member.yml} | 2 +-
.../expected/metrics-has-value-label-op.yml} | 2 +-
.../expected/metrics-has-value-label-version.yml} | 4 +-
.../mongodb/expected/metrics-has-value-label.yml | 2 +-
test/e2e-v2/cases/mongodb/mongodb-cases.yaml | 44 +-
test/e2e-v2/cases/mqe/docker-compose.yml | 2 +
.../expected/{relabels-OP.yml => labels-old.yml} | 6 +-
test/e2e-v2/cases/mqe/expected/relabels-OP.yml | 6 +-
.../cases/mqe/expected/relabels-binary-OP.yml | 10 +-
test/e2e-v2/cases/mqe/mqe-cases.yaml | 8 +-
.../e2e-v2/cases/mqe}/oal/core.oal | 5 +-
test/e2e-v2/cases/mysql/mysql-cases.yaml | 22 +-
test/e2e-v2/cases/nginx/e2e.yaml | 30 +-
...-has-value-label-level-service_instance_id.yml} | 4 +-
.../expected/metrics-has-value-label-level.yml} | 2 +-
...value-label-percentile-service_instance_id.yml} | 4 +-
....yml => metrics-has-value-label-percentile.yml} | 2 +-
...etrics-has-value-label-service_instance_id.yml} | 2 +-
...-has-value-label-state-service_instance_id.yml} | 4 +-
.../expected/metrics-has-value-label-state.yml} | 2 +-
...has-value-label-status-service_instance_id.yml} | 4 +-
.../expected/metrics-has-value-label-status.yml} | 2 +-
...s-has-value-label-type-service_instance_id.yml} | 4 +-
.../expected/metrics-has-value-label-type.yml} | 2 +-
.../expected/metrics-has-value-label-datname.yml} | 2 +-
.../expected/metrics-has-value-label.yml | 2 +-
test/e2e-v2/cases/postgresql/postgresql-cases.yaml | 42 +-
.../expected/metrics-has-client-value-label.yml | 4 +-
.../expected/metrics-has-http1-value-label.yml | 8 +-
.../expected/metrics-has-server-value-label.yml | 2 +-
test/e2e-v2/cases/promql/docker-compose.yml | 4 +-
.../expected/endpoint-labeled-metric-label.yml | 5 +-
.../expected/endpoint-metric-labeled-matrix.yml | 6 +-
...el.yml => service-labeled-metric-label-old.yml} | 0
...abel.yml => service-labeled-metric-label-p.yml} | 3 +-
.../expected/service-labeled-metric-label.yml | 4 +-
.../service-metric-labeled-compare-matrix.yml | 2 +-
.../expected/service-metric-labeled-matrix.yml | 6 +-
...r.yml => service-metric-labeled-vector-old.yml} | 12 +-
.../expected/service-metric-labeled-vector.yml | 6 +-
.../e2e-v2/cases/promql}/oal/core.oal | 5 +-
test/e2e-v2/cases/promql/promql-cases.yaml | 20 +-
.../metrics-has-value-instance-bookie-label.yml | 4 +-
.../metrics-has-value-instance-broker-label.yml | 4 +-
.../expected/metrics-has-value-instance-label.yml | 4 +-
.../expected/metrics-has-value-service-label.yml | 4 +-
.../cases/rabbitmq/otel-collector-config.yaml | 5 +-
.../redis/expected/metrics-has-value-label.yml | 35 -
.../expected/metrics-single-value.yml} | 9 +-
test/e2e-v2/cases/redis/redis-cases.yaml | 31 +-
test/e2e-v2/cases/rocketmq/e2e.yaml | 2 +-
.../expected/metrics-has-value-empty-label.yml | 24 +-
.../expected/metrics-has-value-group-label.yml | 2 +-
.../expected/metrics-has-value-label-brokerIP.yml} | 2 +-
.../rocketmq/expected/metrics-has-value-label.yml | 8 +-
test/e2e-v2/cases/rocketmq/rocketmq-cases.yaml | 10 +-
.../expected/metrics-has-value-percentile.yml | 2 +-
.../so11y/expected/metrics-has-value-label.yml | 2 +-
.../expected/metrics-has-value-percentile.yml} | 12 +-
test/e2e-v2/cases/so11y/so11y-cases.yaml | 4 +-
.../expected/metrics-has-value-percentile.yml | 2 +-
... => metrics-has-average-value-label-zabbix.yml} | 6 +-
.../expected/metrics-has-average-value-label.yml | 6 +-
.../metrics-has-mountpoint-value-label.yml | 6 +-
.../vm/expected/metrics-has-vfs-value-label.yml | 8 +-
.../cases/vm/prometheus-node-exporter/e2e.yaml | 5 +-
test/e2e-v2/cases/vm/vm-cases.yaml | 3 -
test/e2e-v2/cases/vm/zabbix/e2e.yaml | 3 +
test/e2e-v2/cases/win/win-cases.yaml | 2 +-
342 files changed, 13654 insertions(+), 17079 deletions(-)
diff --cc oap-server-bom/pom.xml
index b386c5f78e,9003f243f9..ada03f89ec
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@@ -72,8 -72,8 +72,8 @@@
<awaitility.version>3.0.0</awaitility.version>
<httpcore.version>4.4.13</httpcore.version>
<commons-compress.version>1.21</commons-compress.version>
- <banyandb-java-client.version>0.5.0</banyandb-java-client.version>
+ <banyandb-java-client.version>0.6.0-SNAPSHOT</banyandb-java-client.version>
- <kafka-clients.version>2.8.1</kafka-clients.version>
+ <kafka-clients.version>3.4.0</kafka-clients.version>
<spring-kafka-test.version>2.4.6.RELEASE</spring-kafka-test.version>
<consul.client.version>1.5.3</consul.client.version>
<commons-net.version>3.9.0</commons-net.version>