From bdfe6168ccd610b4c087634029028f51f569391d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 3 Oct 2023 19:04:09 -0500 Subject: [PATCH 1/4] Disable Istio relative e2e (#11371) --- .github/workflows/skywalking.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index bfa47123a50c..cefde605cf3d 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -560,6 +560,13 @@ jobs: ISTIO_VERSION=1.18.0 KUBERNETES_VERSION=25 + # TODO, disable Istio relative e2e tests temporarily, + # as they are blocked by the GHA resource limitation. + # - name: Rover with Istio Process 1.15.0 + # config: test/e2e-v2/cases/rover/process/istio/e2e.yaml + # env: ISTIO_VERSION=1.15.0 + # runs-on: ubuntu-20.04 + - name: Satellite config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml - name: Auth @@ -587,11 +594,6 @@ jobs: - name: MariaDB Prometheus and slowsql config: test/e2e-v2/cases/mariadb/mariadb-slowsql/e2e.yaml - - name: Rover with Istio Process 1.15.0 - config: test/e2e-v2/cases/rover/process/istio/e2e.yaml - env: ISTIO_VERSION=1.15.0 - runs-on: ubuntu-20.04 - - name: Zipkin ES config: test/e2e-v2/cases/zipkin/es/e2e.yaml - name: Zipkin ES Sharding @@ -832,7 +834,9 @@ jobs: [[ ${unitResults} == 'success' ]] || [[ ${execute} != 'true' && ${unitResults} == 'skipped' ]] || exit -3; [[ ${integrationResults} == 'success' ]] || [[ ${execute} != 'true' && ${integrationResults} == 'skipped' ]] || exit -4; [[ ${e2eResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eResults} == 'skipped' ]] || exit -5; - [[ ${e2eIstioResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioResults} == 'skipped' ]] || exit -6; + # TODO, disable Istio relative e2e tests temporarily, + # as they are blocked by the GHA resource limitation. + # [[ ${e2eIstioResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioResults} == 'skipped' ]] || exit -6; [[ ${e2eJavaVersionResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eJavaVersionResults} == 'skipped' ]] || exit -7; [[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8; From d6187a1bf816be197c54525897c87a3c7c623e8a Mon Sep 17 00:00:00 2001 From: block666 <47653926+smartboy37597@users.noreply.github.com> Date: Wed, 4 Oct 2023 09:28:20 +0800 Subject: [PATCH 2/4] Remove dashboard json header (#11364) --- .../apisix/apisix-endpoint.json | 16 ---------------- .../apisix/apisix-instance.json | 16 ---------------- .../apisix/apisix-root.json | 16 ---------------- .../apisix/apisix-service.json | 16 ---------------- .../aws_dynamodb/aws_dynamodb-endpoint.json | 16 ---------------- .../aws_dynamodb/aws_dynamodb-root.json | 16 ---------------- .../aws_dynamodb/aws_dynamodb-service.json | 17 ----------------- .../aws_eks/aws_eks-cluster.json | 16 ---------------- .../aws_eks/aws_eks-node.json | 16 ---------------- .../aws_eks/aws_eks-root.json | 16 ---------------- .../aws_eks/aws_eks-service.json | 16 ---------------- .../aws_gateway/aws_gateway-root.json | 16 ---------------- .../aws_gateway/aws_gateway_endpoint.json | 16 ---------------- .../aws_gateway/aws_gateway_service.json | 16 ---------------- .../aws_s3/aws_s3-root.json | 16 ---------------- .../aws_s3/aws_s3-service.json | 16 ---------------- .../custom/placeholder.json | 16 ---------------- .../elasticsearch/elasticsearch-cluster.json | 16 ---------------- .../elasticsearch/elasticsearch-index.json | 16 ---------------- .../elasticsearch/elasticsearch-node.json | 16 ---------------- .../elasticsearch/elasticsearch-root.json | 16 ---------------- .../faas/faas-function-relation.json | 16 ---------------- .../faas/faas-function.json | 16 ---------------- .../faas/faas-instance-relation.json | 16 ---------------- .../faas/faas-instance.json | 16 ---------------- .../faas/faas-root.json | 16 ---------------- .../general/general-endpoint-relation.json | 16 ---------------- .../general/general-endpoint.json | 16 ---------------- .../general/general-instance-relation.json | 16 ---------------- .../general/general-instance.json | 16 ---------------- .../general/general-root.json | 16 ---------------- .../general/general-service-relation.json | 16 ---------------- .../general/general-service.json | 16 ---------------- .../mesh/mesh-proces-relation.json | 16 ---------------- .../mesh/mesh-process.json | 16 ---------------- .../mesh-data-plane-process-relation.json | 16 ---------------- .../mesh_dp/mesh-data-plane-root.json | 16 ---------------- .../mongodb/mongodb-cluster.json | 17 +---------------- .../mongodb/mongodb-node.json | 17 +---------------- .../mongodb/mongodb-root.json | 17 +---------------- .../mysql/mysql-instance.json | 16 ---------------- .../mysql/mysql-root.json | 16 ---------------- .../mysql/mysql-service.json | 16 ---------------- .../os_linux/linux-root.json | 16 ---------------- .../os_linux/linux-service.json | 16 ---------------- .../postgresql/postgresql-instance.json | 16 ---------------- .../postgresql/postgresql-root.json | 16 ---------------- .../postgresql/postgresql-service.json | 16 ---------------- .../redis/redis-instance.json | 16 ---------------- .../redis/redis-root.json | 16 ---------------- .../redis/redis-service.json | 16 ---------------- .../so11y_oap/so11y-instance.json | 16 ---------------- .../so11y_oap/so11y-service.json | 16 ---------------- .../so11y_satellite/so11y-root.json | 16 ---------------- .../virtual_cache/virtual-cache-root.json | 16 ---------------- .../virtual_cache/virtual-cache-service.json | 16 ---------------- .../virtual_database/virtual-database-root.json | 16 ---------------- .../virtual-database-service.json | 16 ---------------- .../virtual_mq/virtual-mq-endpoint.json | 16 ---------------- .../virtual_mq/virtual-mq-root.json | 16 ---------------- .../virtual_mq/virtual-mq-service.json | 16 ---------------- 61 files changed, 3 insertions(+), 977 deletions(-) diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-endpoint.json index 7a7a1da398ef..e0dcd55a9965 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-endpoint.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-endpoint.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-instance.json index 672e1f4aaaf6..338c83195233 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-instance.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-root.json index 2d748d309602..c5f502911375 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-service.json index a913a2a683eb..0af81253f1d5 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/apisix/apisix-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-endpoint.json index 4e48dd62cd68..e9bac6741815 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-endpoint.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-endpoint.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-root.json index e7a86ac089e4..29b598ccf4db 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-service.json index c7e48c0ffe06..2867df9a635b 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_dynamodb/aws_dynamodb-service.json @@ -1,20 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-cluster.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-cluster.json index 8411668c75fd..89e7f0725b8f 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-cluster.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-cluster.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-node.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-node.json index 0f9d29a662b0..a369269824f2 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-node.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-node.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-root.json index d5e8206817eb..86544a67e9a4 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-service.json index a1bff067025f..043d6775e714 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_eks/aws_eks-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway-root.json index 45e75bd851b3..cb989c9e8445 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway_endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway_endpoint.json index e492a8f4636d..bc201e320b4f 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway_endpoint.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway_endpoint.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway_service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway_service.json index 9f1d4b5c6b9f..ce05d8f4612e 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway_service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_gateway/aws_gateway_service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_s3/aws_s3-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_s3/aws_s3-root.json index 459071991fe2..31f0ba333d12 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_s3/aws_s3-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_s3/aws_s3-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_s3/aws_s3-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_s3/aws_s3-service.json index 5a5455d7a939..798c19d4f016 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_s3/aws_s3-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/aws_s3/aws_s3-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/custom/placeholder.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/custom/placeholder.json index 761f0db45ea8..3fa5da175d70 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/custom/placeholder.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/custom/placeholder.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ /** * Put the custom ui-template here diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-cluster.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-cluster.json index b9ffa6a37564..fa6c8a877abc 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-cluster.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-cluster.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-index.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-index.json index c957c02438f4..62e2b0abb976 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-index.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-index.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-node.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-node.json index fb31907eff91..8c5e8eb7099f 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-node.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-node.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-root.json index 9ae919b0386b..0cdf29671187 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/elasticsearch/elasticsearch-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json index ea0da055ddc3..61f538748615 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json index a325954cbdee..93b19c5d64f0 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json index cf4b5c2396c7..a48d7b873128 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json index 259bca1a76d6..9852787f6a4e 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json index ccfe41b89f80..b5baadef23de 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json index 37725ee28b12..d1d77ab04f57 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint-relation.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json index 4d04cba146bf..722f558568d2 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-endpoint.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance-relation.json index 5c4afe507184..c2d7f0a9ced4 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance-relation.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json index 633de7bb874f..bc51b96b8b13 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json index 9619a8a3ccd0..cb13a3d35758 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service-relation.json index 93dc78d305bb..fd91c048176a 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service-relation.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json index 5e95d56b29cd..4f4b0892eaea 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json index 85ee56393ea0..424ad754c9a0 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-proces-relation.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-process.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-process.json index 74e377457de1..40f29b81551c 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-process.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-process.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-process-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-process-relation.json index ea79597c7b0d..1cb792b9bdf5 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-process-relation.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-process-relation.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-root.json index 1472696a8875..b316213231de 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-cluster.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-cluster.json index 0a8948898e19..0379198b6142 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-cluster.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-cluster.json @@ -1,19 +1,4 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + [ { "id":"MongoDB-Cluster", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-node.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-node.json index 7c6cca4671ac..548bf4070bea 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-node.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-node.json @@ -1,19 +1,4 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + [ { "id":"MongoDB-Node", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-root.json index 0dd6daf092d5..c35634149dc1 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mongodb/mongodb-root.json @@ -1,19 +1,4 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + [ { "id":"MongoDB-Root", diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-instance.json index 5908d31ad0a5..9f4223bec9ec 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-instance.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-root.json index 594429d3cdd1..42328ad7a613 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-service.json index 9d132513e26d..1f81ed054111 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mysql/mysql-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json index 1e320e2083c5..50a9d1179d37 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json index 32f3accfcef1..d6c27d5d6abf 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/os_linux/linux-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-instance.json index 96f8b6ef2da5..9377df5e6234 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-instance.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-root.json index b0b9990680a5..96488279d644 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json index f8ebd990ecf3..3feb29c5e885 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/postgresql/postgresql-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-instance.json index 5aaf4b12a6ca..e0c2596cb09f 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-instance.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-root.json index 177ebd1a978c..8600aa321743 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json index 619235b340fc..eba57561739d 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/redis/redis-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json index 992660ef6f36..5161f51eee7d 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-instance.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json index 30e21bddf5a8..4797e9b94245 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_oap/so11y-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_satellite/so11y-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_satellite/so11y-root.json index a27d0ddde019..3a5663accea6 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_satellite/so11y-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/so11y_satellite/so11y-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-root.json index 5a7e11ff1980..0b2db169104e 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json index 4d4417e18f70..5154f30a3f29 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_cache/virtual-cache-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json index 2fb61f61a8b5..5f0eaba1f245 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json index 1193dc2d1db6..a57ff92c3cc9 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json index 05e185e1f34c..4f6e06f16b90 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-endpoint.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-root.json index cad7f83be38a..b48090e430c8 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-root.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-root.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json index e524eb6db1f0..4aae7fb7fed0 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_mq/virtual-mq-service.json @@ -1,19 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ [ { From 338ebcaaa105fb37672161c2e73745e0d0fe3143 Mon Sep 17 00:00:00 2001 From: Jiajing LU Date: Wed, 4 Oct 2023 09:24:41 -0500 Subject: [PATCH 3/4] Update BanyanDB Java Client to 0.5.0 (#11370) --- docs/en/changes/changes.md | 2 + .../setup/backend/configuration-vocabulary.md | 3 +- docs/en/setup/backend/storages/banyandb.md | 7 ++-- oap-server-bom/pom.xml | 2 +- .../src/main/resources/application.yml | 3 +- .../banyandb/BanyanDBStorageClient.java | 4 +- .../banyandb/BanyanDBStorageConfig.java | 14 ++++++- .../banyandb/BanyanDBStorageProvider.java | 2 +- .../measure/BanyanDBMetadataQueryDAO.java | 39 +++++++++++-------- .../script/docker-compose/base-compose.yml | 2 +- test/e2e-v2/script/env | 2 +- 11 files changed, 49 insertions(+), 31 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 5c0fe0f22c87..6cb4d3ccfcf7 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -13,6 +13,8 @@ including `ui_template，ui_menu，continuous_profiling_policy`. * Add a release mechanism for alarm windows when it is expired in case of OOM. * Fix Zipkin trace receiver response: make the HTTP status code from `200` to `202`. +* Update BanyanDB Java Client to 0.5.0. +* Fix getInstances query in the BanyanDB Metadata DAO. #### UI diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md index c125103eb7e3..961dde11e2dc 100644 --- a/docs/en/setup/backend/configuration-vocabulary.md +++ b/docs/en/setup/backend/configuration-vocabulary.md @@ -139,8 +139,7 @@ The Configuration Vocabulary lists all available configurations provided by `app | - | - | maxSizeOfBatchSql | The maximum size of batch size of SQL execution | SW_STORAGE_MAX_SIZE_OF_BATCH_SQL | 2000 | | - | - | asyncBatchPersistentPoolSize | async flush data into database thread size | SW_STORAGE_ASYNC_BATCH_PERSISTENT_POOL_SIZE | 4 | | - | banyandb | - | BanyanDB storage. | - | - | -| - | - | host | Host of the BanyanDB. | SW_STORAGE_BANYANDB_HOST | 127.0.0.1 | -| - | - | port | Port of the BanyanDB. | SW_STORAGE_BANYANDB_PORT | 17912 | +| - | - | targets | Hosts with ports of the BanyanDB. | SW_STORAGE_BANYANDB_TARGETS | 127.0.0.1:17912 | | - | - | maxBulkSize | The maximum size of write entities in a single batch write call. | SW_STORAGE_BANYANDB_MAX_BULK_SIZE | 5000 | | - | - | flushInterval | Period of flush interval. In the timeunit of seconds. | SW_STORAGE_BANYANDB_FLUSH_INTERVAL | 15 | | - | - | metricsShardsNumber | Shards Number for measure/metrics. | SW_STORAGE_BANYANDB_METRICS_SHARDS_NUMBER | 1 | diff --git a/docs/en/setup/backend/storages/banyandb.md b/docs/en/setup/backend/storages/banyandb.md index 40e368bf2d37..c7271aef2fdf 100644 --- a/docs/en/setup/backend/storages/banyandb.md +++ b/docs/en/setup/backend/storages/banyandb.md @@ -3,11 +3,12 @@ [BanyanDB](https://github.com/apache/skywalking-banyandb) is a dedicated storage implementation developed by the SkyWalking Team and the community. Activate BanyanDB as the storage, and set storage provider to **banyandb**. +The OAP requires BanyanDB 0.5 server. As BanyanDB is still in the beta phase, we don't provide any compatibility besides the required version. + ```yaml storage: banyandb: - host: ${SW_STORAGE_BANYANDB_HOST:127.0.0.1} - port: ${SW_STORAGE_BANYANDB_PORT:17912} + targets: ${SW_STORAGE_BANYANDB_TARGETS:127.0.0.1:17912} maxBulkSize: ${SW_STORAGE_BANYANDB_MAX_BULK_SIZE:5000} flushInterval: ${SW_STORAGE_BANYANDB_FLUSH_INTERVAL:15} metricsShardsNumber: ${SW_STORAGE_BANYANDB_METRICS_SHARDS_NUMBER:1} @@ -22,4 +23,4 @@ storage: ``` For more details, please refer to the documents of [BanyanDB](https://skywalking.apache.org/docs/skywalking-banyandb/next/readme/) -and [BanyanDB Java Client](https://github.com/apache/skywalking-banyandb-java-client) subprojects. \ No newline at end of file +and [BanyanDB Java Client](https://github.com/apache/skywalking-banyandb-java-client) subprojects. diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index 963bcedf2803..32b421bcba8f 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -72,7 +72,7 @@ 3.0.0 4.4.13 1.21 - 0.4.0 + 0.5.0 2.8.1 2.4.6.RELEASE 1.5.3 diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index 7ac32a390ef9..a38a53231190 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -213,8 +213,7 @@ storage: maxSizeOfBatchSql: ${SW_STORAGE_MAX_SIZE_OF_BATCH_SQL:2000} asyncBatchPersistentPoolSize: ${SW_STORAGE_ASYNC_BATCH_PERSISTENT_POOL_SIZE:4} banyandb: - host: ${SW_STORAGE_BANYANDB_HOST:127.0.0.1} - port: ${SW_STORAGE_BANYANDB_PORT:17912} + targets: ${SW_STORAGE_BANYANDB_TARGETS:127.0.0.1:17912} maxBulkSize: ${SW_STORAGE_BANYANDB_MAX_BULK_SIZE:5000} flushInterval: ${SW_STORAGE_BANYANDB_FLUSH_INTERVAL:15} metricsShardsNumber: ${SW_STORAGE_BANYANDB_METRICS_SHARDS_NUMBER:1} diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java index 136786865d98..f09fb7c312dc 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java @@ -55,8 +55,8 @@ public class BanyanDBStorageClient implements Client, HealthCheckable { final BanyanDBClient client; private final DelegatedHealthChecker healthChecker = new DelegatedHealthChecker(); - public BanyanDBStorageClient(String host, int port) { - this.client = new BanyanDBClient(host, port); + public BanyanDBStorageClient(String... targets) { + this.client = new BanyanDBClient(targets); } @Override diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java index 39267d1b7f01..91617f64daa5 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java @@ -18,6 +18,8 @@ package org.apache.skywalking.oap.server.storage.plugin.banyandb; +import com.google.common.base.Splitter; +import com.google.common.collect.Iterables; import lombok.Getter; import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; @@ -25,8 +27,12 @@ @Getter @Setter public class BanyanDBStorageConfig extends ModuleConfig { - private String host = "127.0.0.1"; - private int port = 17912; + /** + * A comma-separated list of BanyanDB targets. + * + * @since 9.7.0 + */ + private String targets = "127.0.0.1:17912"; /** * The maximum size of write entities in a single batch write call. */ @@ -96,4 +102,8 @@ public class BanyanDBStorageConfig extends ModuleConfig { * @since 9.4.0 */ private String specificGroupSettings; + + public String[] getTargetArray() { + return Iterables.toArray(Splitter.on(",").omitEmptyStrings().trimResults().split(this.targets), String.class); + } } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java index d0ffcd613740..eed76a31b464 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java @@ -118,7 +118,7 @@ public void onInitialized(final BanyanDBStorageConfig initialized) { public void prepare() throws ServiceNotProvidedException, ModuleStartException { this.registerServiceImplementation(StorageBuilderFactory.class, new StorageBuilderFactory.Default()); - this.client = new BanyanDBStorageClient(config.getHost(), config.getPort()); + this.client = new BanyanDBStorageClient(config.getTargetArray()); this.modelInstaller = new BanyanDBIndexInstaller(client, getManager(), this.config); // Stream diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java index 21aede89a83c..ff8df6cd30cf 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java @@ -19,10 +19,12 @@ package org.apache.skywalking.oap.server.storage.plugin.banyandb.measure; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import org.apache.commons.lang3.StringUtils; +import org.apache.skywalking.banyandb.v1.client.AbstractCriteria; import org.apache.skywalking.banyandb.v1.client.DataPoint; import org.apache.skywalking.banyandb.v1.client.MeasureQuery; import org.apache.skywalking.banyandb.v1.client.MeasureQueryResponse; @@ -92,12 +94,12 @@ public BanyanDBMetadataQueryDAO(BanyanDBStorageClient client) { @Override public List listServices() throws IOException { MeasureQueryResponse resp = query(ServiceTraffic.INDEX_NAME, - SERVICE_TRAFFIC_TAGS, - Collections.emptySet(), new QueryBuilder() { - @Override - protected void apply(MeasureQuery query) { - } - }); + SERVICE_TRAFFIC_TAGS, + Collections.emptySet(), new QueryBuilder() { + @Override + protected void apply(MeasureQuery query) { + } + }); final List services = new ArrayList<>(); MetadataRegistry.Schema schema = MetadataRegistry.INSTANCE.findMetadata(ServiceTraffic.INDEX_NAME, DownSampling.Minute); @@ -144,8 +146,8 @@ public ServiceInstance getInstance(String instanceId) throws IOException { new QueryBuilder() { @Override protected void apply(MeasureQuery query) { - query.and(eq(InstanceTraffic.SERVICE_ID, id.getServiceId())) - .and(eq(InstanceTraffic.NAME, id.getName())); + query.and(eq(InstanceTraffic.SERVICE_ID, id.getServiceId())) + .and(eq(InstanceTraffic.NAME, id.getName())); } }); MetadataRegistry.Schema schema = MetadataRegistry.INSTANCE.findMetadata(InstanceTraffic.INDEX_NAME, DownSampling.Minute); @@ -155,14 +157,19 @@ protected void apply(MeasureQuery query) { @Override public List getInstances(List instanceIds) throws IOException { MeasureQueryResponse resp = query(InstanceTraffic.INDEX_NAME, - INSTANCE_TRAFFIC_TAGS, - Collections.emptySet(), - new QueryBuilder() { - @Override - protected void apply(MeasureQuery query) { - query.and(in(InstanceTraffic.ID, instanceIds)); - } - }); + INSTANCE_TRAFFIC_TAGS, + Collections.emptySet(), + new QueryBuilder() { + @Override + protected void apply(MeasureQuery query) { + List instanceRelationsQueryConditions = new ArrayList<>(instanceIds.size()); + for (final String instanceId : instanceIds) { + final IDManager.ServiceInstanceID.InstanceIDDefinition def = IDManager.ServiceInstanceID.analysisId(instanceId); + and(Lists.newArrayList(eq(InstanceTraffic.SERVICE_ID, def.getServiceId()), eq(InstanceTraffic.NAME, def.getName()))); + } + query.criteria(or(instanceRelationsQueryConditions)); + } + }); MetadataRegistry.Schema schema = MetadataRegistry.INSTANCE.findMetadata(InstanceTraffic.INDEX_NAME, DownSampling.Minute); return resp.getDataPoints().stream().map(e -> buildInstance(e, schema)).collect(Collectors.toList()); } diff --git a/test/e2e-v2/script/docker-compose/base-compose.yml b/test/e2e-v2/script/docker-compose/base-compose.yml index 1a78645d3ea8..4551c0c1bdf1 100644 --- a/test/e2e-v2/script/docker-compose/base-compose.yml +++ b/test/e2e-v2/script/docker-compose/base-compose.yml @@ -33,7 +33,7 @@ services: SW_STORAGE_ES_CLUSTER_NODES: es:9200 SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest?allowMultiQueries=true SW_STORAGE_INFLUXDB_URL: http://influxdb:8086 - SW_STORAGE_BANYANDB_HOST: "banyandb" + SW_STORAGE_BANYANDB_TARGETS: banyandb:17912 SW_CONFIG_ETCD_PERIOD: 1 SW_CONFIG_ETCD_ENDPOINTS: http://etcd:2379 SW_CLUSTER_ETCD_ENDPOINTS: http://etcd:2379 diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env index 2c5956f986eb..a8431f5296b6 100644 --- a/test/e2e-v2/script/env +++ b/test/e2e-v2/script/env @@ -23,6 +23,6 @@ SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449 SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016 SW_KUBERNETES_COMMIT_SHA=e2c61c6774cf377b23516fca6f8a1e119d3191c5 SW_ROVER_COMMIT=fc8d074c6d34ecfee585a7097cbd5aef1ca680a5 -SW_BANYANDB_COMMIT=df34a83663d66af9687ff484884ceae669c83980 +SW_BANYANDB_COMMIT=63be6e80bef82ea274d7352cc7a461b757d28355 SW_CTL_COMMIT=9d2d0edccda2afe5cf24f1e632142f40e80e8fa4 From 383dd1e9a19d431be18a1eb5ed34b60261b6f278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 4 Oct 2023 22:06:23 -0500 Subject: [PATCH 4/4] Fix icons display in trace tree diagram. (#11374) --- docs/en/changes/changes.md | 3 ++- skywalking-ui | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 6cb4d3ccfcf7..736fb55dde24 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -23,7 +23,8 @@ * Fix the display height of the link tree structure. * Replace the name by shortName on service widget. * Refactor: update pagination style. No visualization style change. -* Apply MQE on K8s layer UI-templates +* Apply MQE on K8s layer UI-templates. +* Fix icons display in trace tree diagram. #### Documentation diff --git a/skywalking-ui b/skywalking-ui index 102436ca5183..e42734ba80e1 160000 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 102436ca5183a4dbe39fd538b7048890917cf077 +Subproject commit e42734ba80e1ada3784880b8b70cafc69e234b79