This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push: new 630d54d963 Fix hierarchy matching rule and add hierarchy env config and sync UI (#12120) 630d54d963 is described below commit 630d54d963b2138e1355d32caa4526b5d5f57aa4 Author: Wan Kai <wankai...@foxmail.com> AuthorDate: Wed Apr 17 12:35:16 2024 +0800 Fix hierarchy matching rule and add hierarchy env config and sync UI (#12120) --- docs/en/changes/changes.md | 1 + docs/en/concepts-and-designs/service-hierarchy-configuration.md | 4 ++-- docs/en/setup/backend/configuration-vocabulary.md | 3 ++- oap-server/server-starter/src/main/resources/application.yml | 4 ++++ oap-server/server-starter/src/main/resources/hierarchy-definition.yml | 4 ++-- skywalking-ui | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 8789812c14..96182ba96a 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -138,6 +138,7 @@ * Remove the General metric mode and related logical code. * Remove metrics for unreal nodes in the topology. * Enhance the Trace widget for batch consuming spans. +* Clean the unused elements in the UI-templates. #### Documentation diff --git a/docs/en/concepts-and-designs/service-hierarchy-configuration.md b/docs/en/concepts-and-designs/service-hierarchy-configuration.md index 3daef37358..c09c8c1d1e 100644 --- a/docs/en/concepts-and-designs/service-hierarchy-configuration.md +++ b/docs/en/concepts-and-designs/service-hierarchy-configuration.md @@ -38,10 +38,10 @@ auto-matching-rules: short-name: "{ (u, l) -> u.shortName == l.shortName }" # remove the k8s namespace from the lower service short name # this rule is only works on k8s env. - lower-short-name-remove-ns: "{ (u, l) -> u.shortName == l.shortName.substring(0, l.shortName.lastIndexOf('.')) }" + lower-short-name-remove-ns: "{ (u, l) -> { if(l.shortName.lastIndexOf('.') > 0) return u.shortName == l.shortName.substring(0, l.shortName.lastIndexOf('.')); return false; } }" # the short name of the upper remove port is equal to the short name of the lower service with fqdn suffix # this rule is only works on k8s env. - lower-short-name-with-fqdn: "{ (u, l) -> u.shortName.substring(0, u.shortName.lastIndexOf(':')) == l.shortName.concat('.svc.cluster.local') }" + lower-short-name-with-fqdn: "{ (u, l) -> { if(u.shortName.lastIndexOf(':') > 0) return u.shortName.substring(0, u.shortName.lastIndexOf(':')) == l.shortName.concat('.svc.cluster.local'); return false; } }" layer-levels: # The hierarchy level of the service layer, the level is used to define the order of the service layer for UI presentation. diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md index 2d843308d6..a76c44746f 100644 --- a/docs/en/setup/backend/configuration-vocabulary.md +++ b/docs/en/setup/backend/configuration-vocabulary.md @@ -49,6 +49,7 @@ The Configuration Vocabulary lists all available configurations provided by `app | - | - | maxThreadCountOfQueryEBPFProfilingData | The maximum thread count of query the eBPF profiling data from database. [...] | - | - | uiMenuRefreshInterval | The period(in seconds) of refreshing the status of all UI menu items. [...] | - | - | serviceCacheRefreshInterval | The period(in seconds) of refreshing the service cache. [...] +| - | - | enableHierarchy | If disable the hierarchy, the service and instance hierarchy relation will not be built. And the query of hierarchy will return empty result. All the hierarchy relations are defined in the `hierarchy-definition.yml`. Notice: some of the configurations only available for kubern [...] | cluster | standalone | - | Standalone is not suitable for running on a single node running. No configuration available. [...] | - | zookeeper | namespace | The namespace, represented by root path, isolates the configurations in Zookeeper. [...] | - | - | hostPort | Hosts and ports of Zookeeper Cluster. [...] @@ -280,7 +281,7 @@ The Configuration Vocabulary lists all available configurations provided by `app | - | - | port | DCS server binding port. [...] | - | - | clusterName | Cluster name when reading the latest configuration from DSC server. [...] | - | - | period | The period of reading data from DSC server by the OAP (in seconds). [...] -| - | - | maxInboundMessageSize | The max inbound message size of gRPC. [...] +| - | - | maxInboundMessageSize | The max inbound message size of gRPC. [...] | - | apollo | apolloMeta | `apollo.meta` in Apollo. [...] | - | - | apolloCluster | `apollo.cluster` in Apollo. [...] | - | - | apolloEnv | `env` in Apollo. [...] diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index ff1a4a5de0..59ec8ccc5b 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -136,6 +136,10 @@ core: trainingPeriodHttpUriRecognitionPattern: ${SW_CORE_TRAINING_PERIOD_HTTP_URI_RECOGNITION_PATTERN:60} # The max number of HTTP URIs per service for further URI pattern recognition. maxHttpUrisNumberPerService: ${SW_CORE_MAX_HTTP_URIS_NUMBER_PER_SVR:3000} + # If disable the hierarchy, the service and instance hierarchy relation will not be built. And the query of hierarchy will return empty result. + # All the hierarchy relations are defined in the `hierarchy-definition.yml`. + # Notice: some of the configurations only available for kubernetes environments. + enableHierarchy: ${SW_CORE_ENABLE_HIERARCHY:true} storage: selector: ${SW_STORAGE:h2} elasticsearch: diff --git a/oap-server/server-starter/src/main/resources/hierarchy-definition.yml b/oap-server/server-starter/src/main/resources/hierarchy-definition.yml index 3ddb09058e..cf210dbdbd 100644 --- a/oap-server/server-starter/src/main/resources/hierarchy-definition.yml +++ b/oap-server/server-starter/src/main/resources/hierarchy-definition.yml @@ -80,10 +80,10 @@ auto-matching-rules: short-name: "{ (u, l) -> u.shortName == l.shortName }" # remove the k8s namespace from the lower service short name # this rule is only works on k8s env. - lower-short-name-remove-ns: "{ (u, l) -> u.shortName == l.shortName.substring(0, l.shortName.lastIndexOf('.')) }" + lower-short-name-remove-ns: "{ (u, l) -> { if(l.shortName.lastIndexOf('.') > 0) return u.shortName == l.shortName.substring(0, l.shortName.lastIndexOf('.')); return false; } }" # the short name of the upper remove port is equal to the short name of the lower service with fqdn suffix # this rule is only works on k8s env. - lower-short-name-with-fqdn: "{ (u, l) -> u.shortName.substring(0, u.shortName.lastIndexOf(':')) == l.shortName.concat('.svc.cluster.local') }" + lower-short-name-with-fqdn: "{ (u, l) -> { if(u.shortName.lastIndexOf(':') > 0) return u.shortName.substring(0, u.shortName.lastIndexOf(':')) == l.shortName.concat('.svc.cluster.local'); return false; } }" # The hierarchy level of the service layer, the level is used to define the order of the service layer for UI presentation. # The level of the upper service should greater than the level of the lower service in `hierarchy` section. diff --git a/skywalking-ui b/skywalking-ui index 7f6e4d09c0..13b2693f29 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 7f6e4d09c05a59c67564a8e601e2890a8bd83a2b +Subproject commit 13b2693f291903349ebaffa661092e2747141f1c