[skywalking] branch enhance/log updated (f719b1b -> 5cb86f1)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch enhance/log
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from f719b1b  Enhance gRPC log appender to allow layout pattern
     add 6c6a8a7  Add E2E test for VM monitoring that the metrics from Promethues node-exporter via OTEL. (#6404)
     add 5cb86f1  Merge branch 'master' into enhance/log

No new revisions were added by this update.

Summary of changes:
 CHANGES.md                                         |  1 +
 .../apache/skywalking/e2e/SimpleQueryClient.java   |  3 +-
 .../skywalking/e2e/metrics/MetricsQuery.java       | 18 ++++++
 .../skywalking/e2e/metrics/ReadMetricsQuery.java   |  2 +
 .../e2e-data/src/main/resources/read-metrics.gql   |  2 +-
 .../docker/promOtelVM/Dockerfile.nodeExporter      | 17 ++----
 .../{zabbix => promOtelVM}/docker-compose.yml      | 23 +++++---
 .../docker/promOtelVM/otel-collector-config.yaml   | 49 ++++++++--------
 .../PromOtelVME2E.java}                            | 65 +++++++++++++---------
 .../expected/{log => promOtelVM}/services.yml      |  2 +-
 10 files changed, 108 insertions(+), 74 deletions(-)
 copy oap-server/server-configuration/configuration-apollo/src/test/resources/application.yml => test/e2e/e2e-test/docker/promOtelVM/Dockerfile.nodeExporter (75%)
 mode change 100755 => 100644
 copy test/e2e/e2e-test/docker/{zabbix => promOtelVM}/docker-compose.yml (72%)
 copy apm-webapp/src/main/resources/application.yml => test/e2e/e2e-test/docker/promOtelVM/otel-collector-config.yaml (60%)
 mode change 100755 => 100644
 copy test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/{zabbix/ZabbixE2E.java => promOtelVM/PromOtelVME2E.java} (62%)
 copy test/e2e/e2e-test/src/test/resources/expected/{log => promOtelVM}/services.yml (96%)