Merge branch 'master' into master

Author: wu-sheng

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/tcp/k8s/K8sALSServiceMeshTCPAnalysis.java

@@ -20,7 +20,6 @@
 
 import com.google.common.base.Strings;
 import io.envoyproxy.envoy.config.core.v3.Address;
-import io.envoyproxy.envoy.config.core.v3.SocketAddress;
 import io.envoyproxy.envoy.data.accesslog.v3.AccessLogCommon;
 import io.envoyproxy.envoy.data.accesslog.v3.TCPAccessLogEntry;
 import io.envoyproxy.envoy.service.accesslog.v3.StreamAccessLogsMessage;
@@ -33,6 +32,7 @@
 import org.apache.skywalking.oap.server.receiver.envoy.als.Role;
 import org.apache.skywalking.oap.server.receiver.envoy.als.ServiceMetaInfo;
 import org.apache.skywalking.oap.server.receiver.envoy.als.istio.IstioServiceEntryRegistry;
+import org.apache.skywalking.oap.server.receiver.envoy.als.k8s.Addresses;
 import org.apache.skywalking.oap.server.receiver.envoy.als.k8s.K8SServiceRegistry;
 import org.apache.skywalking.oap.server.receiver.envoy.als.tcp.AbstractTCPAccessLogAnalyzer;
 
@@ -101,9 +101,9 @@ protected Result analyzeSideCar(final Result previousResult, final TCPAccessLogE
             properties.hasDownstreamDirectRemoteAddress()
                 ? properties.getDownstreamDirectRemoteAddress()
                 : properties.getDownstreamRemoteAddress();
-        final ServiceMetaInfo downstreamService = find(downstreamRemoteAddress.getSocketAddress().getAddress());
+        final ServiceMetaInfo downstreamService = find(Addresses.getAddressIP(downstreamRemoteAddress));
         final Address downstreamLocalAddress = properties.getDownstreamLocalAddress();
-        final ServiceMetaInfo localService = find(downstreamLocalAddress.getSocketAddress().getAddress());
+        final ServiceMetaInfo localService = find(Addresses.getAddressIP(downstreamLocalAddress));
 
         if (cluster.startsWith("inbound|")) {
             // Server side
@@ -124,8 +124,7 @@ protected Result analyzeSideCar(final Result previousResult, final TCPAccessLogE
             newResult.hasDownstreamMetrics(true);
         } else if (cluster.startsWith("outbound|")) {
             // sidecar(client side) -> sidecar
-            final Address upstreamRemoteAddress = properties.getUpstreamRemoteAddress();
-            final ServiceMetaInfo destService = find(upstreamRemoteAddress.getSocketAddress().getAddress());
+            final ServiceMetaInfo destService = find(Addresses.getAddressIP(properties.getUpstreamRemoteAddress()));
 
             final TCPServiceMeshMetric metric = newAdapter(entry, downstreamService, destService).adaptToUpstreamMetrics().build();
 
@@ -154,16 +153,14 @@ protected Result analyzeProxy(final Result previousResult, final TCPAccessLogEnt
             return previousResult;
         }
 
-        final var downstreamLocalAddressSocketAddress = downstreamLocalAddress.getSocketAddress();
-        final var ingress = find(downstreamLocalAddressSocketAddress.getAddress());
+        final var ingress = find(Addresses.getAddressIP(downstreamLocalAddress));
 
         final var newResult = previousResult.toBuilder();
         final var previousMetrics = previousResult.getMetrics();
         final var metrics = previousMetrics.getTcpMetricsBuilder();
 
         if (!previousResult.hasDownstreamMetrics()) {
-            final SocketAddress downstreamRemoteAddressSocketAddress = downstreamRemoteAddress.getSocketAddress();
-            final ServiceMetaInfo outside = find(downstreamRemoteAddressSocketAddress.getAddress());
+            final ServiceMetaInfo outside = find(Addresses.getAddressIP(downstreamRemoteAddress));
 
             final TCPServiceMeshMetric.Builder metric = newAdapter(entry, outside, ingress).adaptToDownstreamMetrics();
 
@@ -173,8 +170,7 @@ protected Result analyzeProxy(final Result previousResult, final TCPAccessLogEnt
         }
 
         if (!previousResult.hasUpstreamMetrics()) {
-            final SocketAddress upstreamRemoteAddressSocketAddress = upstreamRemoteAddress.getSocketAddress();
-            final ServiceMetaInfo targetService = find(upstreamRemoteAddressSocketAddress.getAddress());
+            final ServiceMetaInfo targetService = find(Addresses.getAddressIP(upstreamRemoteAddress));
 
             final TCPServiceMeshMetric.Builder outboundMetric =
                 newAdapter(entry, ingress, targetService)

oap-server/server-starter/src/main/resources/ui-initialized-templates/banyandb/banyandb-root.json

@@ -29,10 +29,10 @@
           "graph": {
             "fontColor": "theme",
             "backgroundColor": "theme",
-            "content": "BanyanDB is a distributed time-series database with built-in self-monitoring for real-time tracking of system health, performance, and resource utilization.",
+            "content": "Provide BanyanDB monitoring through OpenTelemetry's Prometheus Receiver",
             "fontSize": 14,
             "textAlign": "left",
-            "url": "https://skywalking.apache.org/docs/main/next/en/setup/backend/backend-banyandb/"
+            "url": "https://skywalking.apache.org/docs/main/next/en/banyandb/dashboards-banyandb/"
           }
         }
       ],

oap-server/server-starter/src/main/resources/ui-initialized-templates/menu.yaml

@@ -259,7 +259,7 @@ menus:
         i18nKey: self_observability_satellite
       - title: BanyanDB Server
         layer: BANYANDB
-        description: BanyanDB is a time-series database designed for observability data storage and analysis.
+        description: Provide BanyanDB monitoring through OpenTelemetry's Prometheus Receiver.
         documentLink: https://skywalking.apache.org/docs/main/next/en/banyandb/dashboards-banyandb/
         i18nKey: self_observability_banyandb
       - title: SkyWalking Java Agent