This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-helm.git
The following commit(s) were added to refs/heads/master by this push:
new dcffdfa Update Chart.yaml (#164)
dcffdfa is described below
commit dcffdfab6702c2cb2aaae1f307b74791e4ea1bbc
Author: Gao Hongtao <[email protected]>
AuthorDate: Wed Aug 13 07:51:43 2025 +0800
Update Chart.yaml (#164)
---
.github/workflows/e2e.ci.yaml | 12 +--
CHANGES.md | 5 ++
chart/skywalking/Chart.yaml | 2 +-
test/e2e/e2e-banyandb-cluster.yaml | 94 ++++++++++++++--------
test/e2e/e2e-banyandb-standalone.yaml | 94 ++++++++++++++--------
test/e2e/e2e-elasticsearch.yaml | 94 ++++++++++++++--------
test/e2e/env | 13 ++-
test/e2e/{env => env.swck} | 0
.../dependency-services-instance-productpage.yml | 1 +
.../expected/dependency-services-productpage.yml | 19 ++++-
test/e2e/expected/dependency-services-reviews.yml | 11 +++
test/e2e/expected/metrics-has-value.yml | 29 ++++---
...rvices-instance-productpage.yml => kind28.yaml} | 39 ++++-----
test/e2e/swck/oap-agent-adapter-hpa.yaml | 2 +-
test/e2e/swck/oap-agent-banyandb.yaml | 2 +-
test/e2e/swck/oap-ui-agent-elasticsearch.yaml | 2 +-
test/e2e/swck/oap-ui-agent-oapserverconfig.yaml | 2 +-
test/e2e/swck/oap-ui-agent-satellite.yaml | 2 +-
18 files changed, 265 insertions(+), 158 deletions(-)
diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml
index d9e211d..bbfe900 100644
--- a/.github/workflows/e2e.ci.yaml
+++ b/.github/workflows/e2e.ci.yaml
@@ -26,7 +26,7 @@ on:
env:
SKIP_TEST: true
- ISTIO_VERSION: 1.7.1
+ ISTIO_VERSION: 1.24.0
jobs:
als:
@@ -53,13 +53,13 @@ jobs:
config: test/e2e/swck/oap-ui-agent-satellite.yaml
name: ${{ matrix.test.name }}
env:
- OAP_TAG: ddbed6d091c4c20dbb43294fbd03778bdbb8471a
+ OAP_TAG: bf04afdb2a841c60d5e27f5a9fc62d0879a5600c
OAP_REPO: ghcr.io/apache/skywalking/oap
- UI_TAG: ddbed6d091c4c20dbb43294fbd03778bdbb8471a
+ UI_TAG: bf04afdb2a841c60d5e27f5a9fc62d0879a5600c
UI_REPO: ghcr.io/apache/skywalking/ui
SATELLITE_TAG: v35bfaff6352b4dc351a706772796a1f79b651c14
SATELLITE_REPO: ghcr.io/apache/skywalking-satellite/skywalking-satellite
- BANYANDB_TAG: 0e734c462571dcf55dbb7761211c07d8b156521e
+ BANYANDB_TAG: 7e5b2d0404e8ad6d5835eee6fe589a2544d0decb
BANYANDB_REPO: ghcr.io/apache/skywalking-banyandb
steps:
- uses: actions/checkout@v2
@@ -72,9 +72,9 @@ jobs:
- name: Setup go
uses: actions/setup-go@v4
with:
- go-version: '1.20'
+ go-version: '1.24'
- name: ${{ matrix.test.name }}
- uses:
apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
+ uses:
apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115
with:
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
- if: ${{ failure() }}
diff --git a/CHANGES.md b/CHANGES.md
index 97ad7c9..9aa2f70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,11 @@ Changes by Version
==================
Release Notes.
+4.8.0
+------------------
+
+- Bump up BanyanDB Helm version to 0.5.0.
+
4.7.0
------------------
diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
index c7b34e6..974f155 100644
--- a/chart/skywalking/Chart.yaml
+++ b/chart/skywalking/Chart.yaml
@@ -40,6 +40,6 @@ dependencies:
condition: postgresql.enabled
- name: skywalking-banyandb-helm
alias: banyandb
- version: 0.5.0-rc0
+ version: 0.5.0-rc2
repository: oci://registry-1.docker.io/apache
condition: banyandb.enabled
diff --git a/test/e2e/e2e-banyandb-cluster.yaml
b/test/e2e/e2e-banyandb-cluster.yaml
index 16c8960..55bad01 100644
--- a/test/e2e/e2e-banyandb-cluster.yaml
+++ b/test/e2e/e2e-banyandb-cluster.yaml
@@ -17,7 +17,7 @@
setup:
env: kind
- file: kind.yaml
+ file: kind28.yaml
init-system-environment: env
kind:
expose-ports:
@@ -113,69 +113,87 @@ verify:
expected: expected/service-endpoint-reviews.yml
# service metrics: e2e::productpage
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_sla --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sla --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_cpm --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_cpm --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_resp_time --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_resp_time --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_apdex --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_apdex --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
# service metrics: e2e::reviews
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_sla --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sla --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_cpm --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_cpm --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_resp_time --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_resp_time --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_apdex --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_apdex --service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sidecar_internal_req_latency_nanos
--service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sidecar_internal_resp_latency_nanos
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# service instance metrics: e2e::productpage
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_resp_time
--service-name=e2e::productpage --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_resp_time
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_cpm --service-name=e2e::productpage
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_cpm --service-name=e2e::productpage
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_sla --service-name=e2e::productpage
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sla --service-name=e2e::productpage
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
# service instance metrics: e2e::reviews
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_resp_time --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_resp_time
--service-name=e2e::reviews --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
+ )
+ expected: expected/metrics-has-value.yml
+ - query: |
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_cpm --service-name=e2e::reviews
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_cpm --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sla --service-name=e2e::reviews
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_sla --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sidecar_internal_req_latency_nanos
--service-name=e2e::reviews --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
+ expected: expected/metrics-has-value.yml
+ - query: |
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sidecar_internal_resp_latency_nanos
--service-name=e2e::reviews --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
+ )
expected: expected/metrics-has-value.yml
# service endpoint metrics: e2e::productpage GET:/productpage
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_cpm --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_cpm --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_resp_time --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_resp_time --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_sla --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sla --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
# service endpoint metrics: e2e::reviews GET:/reviews/0
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_cpm --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_cpm --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_resp_time --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_resp_time --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sla --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_sla --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sidecar_internal_req_latency_nanos
--endpoint-name=GET:/reviews/0 --service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sidecar_internal_resp_latency_nanos
--endpoint-name=GET:/reviews/0 --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# dependency service
@@ -187,24 +205,32 @@ verify:
expected: expected/dependency-services-instance-productpage.yml
# service relation metrics
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_relation_client_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_relation_client_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_relation_server_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_client_sidecar_internal_req_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_server_sidecar_internal_req_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_relation_server_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_client_sidecar_internal_resp_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_server_sidecar_internal_resp_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# service instance relation metrics, e2e::productpage -> e2e::reviews
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_relation_client_cpm \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_relation_client_cpm \
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' - ) \
--dest-service-name=e2e::reviews --dest-instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' - ) \
- |yq e 'to_entries' -
+
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_relation_server_cpm \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_relation_server_cpm \
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' - ) \
--dest-service-name=e2e::reviews --dest-instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' - ) \
- |yq e 'to_entries' -
- expected: expected/metrics-has-value.yml
+
+ expected: expected/metrics-has-value.yml
diff --git a/test/e2e/e2e-banyandb-standalone.yaml
b/test/e2e/e2e-banyandb-standalone.yaml
index 9c218cb..49beeaa 100644
--- a/test/e2e/e2e-banyandb-standalone.yaml
+++ b/test/e2e/e2e-banyandb-standalone.yaml
@@ -17,7 +17,7 @@
setup:
env: kind
- file: kind.yaml
+ file: kind28.yaml
init-system-environment: env
kind:
expose-ports:
@@ -113,69 +113,87 @@ verify:
expected: expected/service-endpoint-reviews.yml
# service metrics: e2e::productpage
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_sla --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sla --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_cpm --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_cpm --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_resp_time --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_resp_time --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_apdex --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_apdex --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
# service metrics: e2e::reviews
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_sla --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sla --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_cpm --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_cpm --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_resp_time --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_resp_time --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_apdex --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_apdex --service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sidecar_internal_req_latency_nanos
--service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sidecar_internal_resp_latency_nanos
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# service instance metrics: e2e::productpage
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_resp_time
--service-name=e2e::productpage --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_resp_time
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_cpm --service-name=e2e::productpage
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_cpm --service-name=e2e::productpage
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_sla --service-name=e2e::productpage
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sla --service-name=e2e::productpage
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
# service instance metrics: e2e::reviews
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_resp_time --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_resp_time
--service-name=e2e::reviews --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
+ )
+ expected: expected/metrics-has-value.yml
+ - query: |
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_cpm --service-name=e2e::reviews
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_cpm --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sla --service-name=e2e::reviews
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_sla --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sidecar_internal_req_latency_nanos
--service-name=e2e::reviews --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
+ expected: expected/metrics-has-value.yml
+ - query: |
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sidecar_internal_resp_latency_nanos
--service-name=e2e::reviews --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
+ )
expected: expected/metrics-has-value.yml
# service endpoint metrics: e2e::productpage GET:/productpage
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_cpm --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_cpm --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_resp_time --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_resp_time --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_sla --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sla --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
# service endpoint metrics: e2e::reviews GET:/reviews/0
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_cpm --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_cpm --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_resp_time --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_resp_time --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sla --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_sla --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sidecar_internal_req_latency_nanos
--endpoint-name=GET:/reviews/0 --service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sidecar_internal_resp_latency_nanos
--endpoint-name=GET:/reviews/0 --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# dependency service
@@ -187,24 +205,32 @@ verify:
expected: expected/dependency-services-instance-productpage.yml
# service relation metrics
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_relation_client_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_relation_client_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_relation_server_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_client_sidecar_internal_req_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_server_sidecar_internal_req_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_relation_server_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_client_sidecar_internal_resp_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_server_sidecar_internal_resp_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# service instance relation metrics, e2e::productpage -> e2e::reviews
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_relation_client_cpm \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_relation_client_cpm \
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' - ) \
--dest-service-name=e2e::reviews --dest-instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' - ) \
- |yq e 'to_entries' -
+
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_relation_server_cpm \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_relation_server_cpm \
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' - ) \
--dest-service-name=e2e::reviews --dest-instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' - ) \
- |yq e 'to_entries' -
- expected: expected/metrics-has-value.yml
+
+ expected: expected/metrics-has-value.yml
diff --git a/test/e2e/e2e-elasticsearch.yaml b/test/e2e/e2e-elasticsearch.yaml
index 39870d8..9e735fb 100644
--- a/test/e2e/e2e-elasticsearch.yaml
+++ b/test/e2e/e2e-elasticsearch.yaml
@@ -17,7 +17,7 @@
setup:
env: kind
- file: kind.yaml
+ file: kind28.yaml
init-system-environment: env
kind:
expose-ports:
@@ -108,69 +108,87 @@ verify:
expected: expected/service-endpoint-reviews.yml
# service metrics: e2e::productpage
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_sla --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sla --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_cpm --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_cpm --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_resp_time --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_resp_time --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_apdex --service-name=e2e::productpage |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_apdex --service-name=e2e::productpage
expected: expected/metrics-has-value.yml
# service metrics: e2e::reviews
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_sla --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sla --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_cpm --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_cpm --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_resp_time --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_resp_time --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_apdex --service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_apdex --service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sidecar_internal_req_latency_nanos
--service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_sidecar_internal_resp_latency_nanos
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# service instance metrics: e2e::productpage
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_resp_time
--service-name=e2e::productpage --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_resp_time
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_cpm --service-name=e2e::productpage
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_cpm --service-name=e2e::productpage
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_sla --service-name=e2e::productpage
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sla --service-name=e2e::productpage
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
# service instance metrics: e2e::reviews
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_resp_time --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_resp_time
--service-name=e2e::reviews --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
+ )
+ expected: expected/metrics-has-value.yml
+ - query: |
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_cpm --service-name=e2e::reviews
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_cpm --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sla --service-name=e2e::reviews
--instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_sla --service-name=e2e::reviews
--instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sidecar_internal_req_latency_nanos
--service-name=e2e::reviews --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
- ) |yq e 'to_entries' -
+ )
+ expected: expected/metrics-has-value.yml
+ - query: |
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_sidecar_internal_resp_latency_nanos
--service-name=e2e::reviews --instance-name=$( \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' -
+ )
expected: expected/metrics-has-value.yml
# service endpoint metrics: e2e::productpage GET:/productpage
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_cpm --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_cpm --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_resp_time --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_resp_time --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_sla --endpoint-name=GET:/productpage
--service-name=e2e::productpage |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sla --endpoint-name=GET:/productpage
--service-name=e2e::productpage
expected: expected/metrics-has-value.yml
# service endpoint metrics: e2e::reviews GET:/reviews/0
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_cpm --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_cpm --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_resp_time --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_resp_time --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sla --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=endpoint_sla --endpoint-name=GET:/reviews/0
--service-name=e2e::reviews |yq e 'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sidecar_internal_req_latency_nanos
--endpoint-name=GET:/reviews/0 --service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=endpoint_sidecar_internal_resp_latency_nanos
--endpoint-name=GET:/reviews/0 --service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# dependency service
@@ -182,24 +200,32 @@ verify:
expected: expected/dependency-services-instance-productpage.yml
# service relation metrics
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_relation_client_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_relation_client_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_relation_server_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_client_sidecar_internal_req_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_server_sidecar_internal_req_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
expected: expected/metrics-has-value.yml
- - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_relation_server_cpm
--service-name=e2e::productpage --dest-service-name=e2e::reviews |yq e
'to_entries' -
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_client_sidecar_internal_resp_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
+ expected: expected/metrics-has-value.yml
+ - query: swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_server_sidecar_internal_resp_latency_nanos
--service-name=e2e::productpage --dest-service-name=e2e::reviews
expected: expected/metrics-has-value.yml
# service instance relation metrics, e2e::productpage -> e2e::reviews
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_relation_client_cpm \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_relation_client_cpm \
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' - ) \
--dest-service-name=e2e::reviews --dest-instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' - ) \
- |yq e 'to_entries' -
+
expected: expected/metrics-has-value.yml
- query: |
- swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics linear --name=service_instance_relation_server_cpm \
+ swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
metrics exec --expression=service_instance_relation_server_cpm \
--service-name=e2e::productpage --instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::productpage | yq e '.[0].name' - ) \
--dest-service-name=e2e::reviews --dest-instance-name=$( \
swctl --display yaml
--base-url=http://${service_skywalking_ui_host}:${service_skywalking_ui_80}/graphql
instance list --service-name=e2e::reviews | yq e '.[0].name' - ) \
- |yq e 'to_entries' -
- expected: expected/metrics-has-value.yml
+
+ expected: expected/metrics-has-value.yml
diff --git a/test/e2e/env b/test/e2e/env
index fd128cc..373a447 100644
--- a/test/e2e/env
+++ b/test/e2e/env
@@ -13,14 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SW_AGENT_JAVA_COMMIT=fbdfc42b4d825ba33205d646ddaaaad20c005cb8
-SW_AGENT_SATELLITE_COMMIT=1f3c08a5af19f8522f2a40d9339c45fa816bfe07
+SW_AGENT_JAVA_COMMIT=f0245864e4388a388fe7445b56b6ce7cedc94aaf
SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa
-SW_AGENT_NODEJS_COMMIT=e755659c7f308d3b5589619778c8360308cb14f8
-SW_AGENT_GO_COMMIT=4af380c2db6243106b0fc650b6003ce3b3eb82a0
-SW_AGENT_PYTHON_COMMIT=50388c55428d742d73d9733278f04173585de80d
+SW_AGENT_NODEJS_COMMIT=4f9a91dad3dfd8cfe5ba8f7bd06b39e11eb5e65e
+SW_AGENT_GO_COMMIT=154de50628e82e590941585411299459e352317d
+SW_AGENT_PYTHON_COMMIT=c76a6ec51a478ac91abb20ec8f22a99b8d4d6a58
SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
-SW_KUBERNETES_COMMIT_SHA=0f3ec68e5a7e1608cec8688716b848ed15e971e5
+SW_KUBERNETES_COMMIT_SHA=6fe5e6f0d3b7686c6be0457733e825ee68cb9b35
-SW_CTL_COMMIT=9d2d0edccda2afe5cf24f1e632142f40e80e8fa4
+SW_CTL_COMMIT=7bbac156e74e8fdc0c5bd6f377be9f0b30420176
diff --git a/test/e2e/env b/test/e2e/env.swck
similarity index 100%
copy from test/e2e/env
copy to test/e2e/env.swck
diff --git a/test/e2e/expected/dependency-services-instance-productpage.yml
b/test/e2e/expected/dependency-services-instance-productpage.yml
index 959380f..ed31a89 100644
--- a/test/e2e/expected/dependency-services-instance-productpage.yml
+++ b/test/e2e/expected/dependency-services-instance-productpage.yml
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+debuggingtrace: null
nodes:
{{- contains .nodes }}
- id: {{ notEmpty .id }}
diff --git a/test/e2e/expected/dependency-services-productpage.yml
b/test/e2e/expected/dependency-services-productpage.yml
index eb43aca..07b003e 100644
--- a/test/e2e/expected/dependency-services-productpage.yml
+++ b/test/e2e/expected/dependency-services-productpage.yml
@@ -13,24 +13,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+debuggingtrace: null
nodes:
{{- contains .nodes }}
- id: {{ b64enc "e2e::reviews"}}.1
name: e2e::reviews
type: http
isreal: true
+ layers:
+ - MESH
- id: {{ b64enc "e2e::productpage"}}.1
name: e2e::productpage
type: http
isreal: true
+ layers:
+ - MESH
- id: {{ b64enc "e2e::details" }}.1
name: e2e::details
type: http
isreal: true
+ layers:
+ - MESH
- id: {{ b64enc "e2e::istio-ingressgateway" }}.1
name: e2e::istio-ingressgateway
type: http
isreal: true
+ layers:
+ - MESH
{{- end }}
calls:
{{- contains .calls }}
@@ -39,8 +48,10 @@ calls:
- http
target: {{ b64enc "e2e::productpage"}}.1
targetcomponents:
+ {{- contains .targetcomponents }}
- http
- mtls
+ {{- end }}
id: {{ b64enc "e2e::istio-ingressgateway"}}.1-{{ b64enc
"e2e::productpage"}}.1
detectpoints:
- CLIENT
@@ -50,8 +61,10 @@ calls:
- http
target: {{ b64enc "e2e::details"}}.1
targetcomponents:
+ {{- contains .targetcomponents }}
- http
- mtls
+ {{- end }}
id: {{ b64enc "e2e::productpage"}}.1-{{ b64enc "e2e::details"}}.1
detectpoints:
- CLIENT
@@ -61,8 +74,10 @@ calls:
- http
target: {{ b64enc "e2e::reviews"}}.1
targetcomponents:
- - http
- - mtls
+ {{- contains .targetcomponents }}
+ - http
+ - mtls
+ {{- end }}
id: {{ b64enc "e2e::productpage" }}.1-{{ b64enc "e2e::reviews"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e/expected/dependency-services-reviews.yml
b/test/e2e/expected/dependency-services-reviews.yml
index 0ccdaec..7dd6601 100644
--- a/test/e2e/expected/dependency-services-reviews.yml
+++ b/test/e2e/expected/dependency-services-reviews.yml
@@ -13,20 +13,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+debuggingtrace: null
nodes:
{{- contains .nodes }}
- id: {{ b64enc "e2e::reviews"}}.1
name: e2e::reviews
type: http
isreal: true
+ layers:
+ - MESH
- id: {{ b64enc "e2e::ratings"}}.1
name: e2e::ratings
type: http
isreal: true
+ layers:
+ - MESH
- id: {{ b64enc "e2e::productpage" }}.1
name: e2e::productpage
type: http
isreal: true
+ layers:
+ - MESH
{{- end }}
calls:
{{- contains .calls }}
@@ -35,8 +42,10 @@ calls:
- http
target: {{ b64enc "e2e::reviews"}}.1
targetcomponents:
+ {{- contains .targetcomponents }}
- http
- mtls
+ {{- end }}
id: {{ b64enc "e2e::productpage"}}.1-{{ b64enc "e2e::reviews"}}.1
detectpoints:
- CLIENT
@@ -46,8 +55,10 @@ calls:
- http
target: {{ b64enc "e2e::ratings"}}.1
targetcomponents:
+ {{- contains .targetcomponents }}
- http
- mtls
+ {{- end }}
id: {{ b64enc "e2e::reviews" }}.1-{{ b64enc "e2e::ratings"}}.1
detectpoints:
- CLIENT
diff --git a/test/e2e/expected/metrics-has-value.yml
b/test/e2e/expected/metrics-has-value.yml
index ceb5b00..37b19de 100644
--- a/test/e2e/expected/metrics-has-value.yml
+++ b/test/e2e/expected/metrics-has-value.yml
@@ -13,13 +13,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- contains . }}
-- key: {{ notEmpty .key }}
- value:
- value: 0
- isemptyvalue: true
-- key: {{ notEmpty .key }}
- value:
- value: {{ ge .value.value 1 }}
- isemptyvalue: false
-{{- end }}
\ No newline at end of file
+debuggingtrace: null
+type: TIME_SERIES_VALUES
+results:
+ {{- contains .results }}
+ - metric:
+ labels: []
+ values:
+ {{- contains .values }}
+ - id: {{ notEmpty .id }}
+ value: {{ .value }}
+ owner: null
+ traceid: null
+ - id: {{ notEmpty .id }}
+ value: null
+ owner: null
+ traceid: null
+ {{- end}}
+ {{- end}}
+error: null
diff --git a/test/e2e/expected/dependency-services-instance-productpage.yml
b/test/e2e/kind28.yaml
similarity index 52%
copy from test/e2e/expected/dependency-services-instance-productpage.yml
copy to test/e2e/kind28.yaml
index 959380f..28d8844 100644
--- a/test/e2e/expected/dependency-services-instance-productpage.yml
+++ b/test/e2e/kind28.yaml
@@ -13,29 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# this config file contains all config fields with comments
+# NOTE: this is not a particularly useful config file
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
nodes:
-{{- contains .nodes }}
-- id: {{ notEmpty .id }}
- name: {{ notEmpty .name }}
- serviceid: {{ b64enc "e2e::reviews" }}.1
- servicename: e2e::reviews
- type: ""
- isreal: true
-- id: {{ notEmpty .id }}
- name: {{ notEmpty .name }}
- serviceid: {{ b64enc "e2e::productpage" }}.1
- servicename: e2e::productpage
- type: ""
- isreal: true
-{{- end }}
-calls:
-{{- contains .calls }}
-- source: {{ notEmpty .source }}
- sourcecomponents: []
- target: {{ notEmpty .target }}
- targetcomponents: []
- id: {{ notEmpty .source }}-{{ notEmpty .target }}
- detectpoints:
- - CLIENT
- - SERVER
-{{- end }}
+ # the control plane node config
+ - role: control-plane
+ image:
kindest/node:v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251
+ # the three workers
+ - role: worker
+ image:
kindest/node:v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251
+ - role: worker
+ image:
kindest/node:v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251
+ - role: worker
+ image:
kindest/node:v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251
diff --git a/test/e2e/swck/oap-agent-adapter-hpa.yaml
b/test/e2e/swck/oap-agent-adapter-hpa.yaml
index 68aab9c..b3c30cf 100644
--- a/test/e2e/swck/oap-agent-adapter-hpa.yaml
+++ b/test/e2e/swck/oap-agent-adapter-hpa.yaml
@@ -16,7 +16,7 @@
setup:
env: kind
file: ../kind.yaml
- init-system-environment: ../env
+ init-system-environment: ../env.swck
kind:
expose-ports:
- namespace: skywalking-system
diff --git a/test/e2e/swck/oap-agent-banyandb.yaml
b/test/e2e/swck/oap-agent-banyandb.yaml
index 05156ee..aa3ccd5 100644
--- a/test/e2e/swck/oap-agent-banyandb.yaml
+++ b/test/e2e/swck/oap-agent-banyandb.yaml
@@ -16,7 +16,7 @@
setup:
env: kind
file: ../kind.yaml
- init-system-environment: ../env
+ init-system-environment: ../env.swck
kind:
expose-ports:
- namespace: skywalking-system
diff --git a/test/e2e/swck/oap-ui-agent-elasticsearch.yaml
b/test/e2e/swck/oap-ui-agent-elasticsearch.yaml
index bc5dde7..85e4e6a 100644
--- a/test/e2e/swck/oap-ui-agent-elasticsearch.yaml
+++ b/test/e2e/swck/oap-ui-agent-elasticsearch.yaml
@@ -16,7 +16,7 @@
setup:
env: kind
file: ../kind.yaml
- init-system-environment: ../env
+ init-system-environment: ../env.swck
kind:
expose-ports:
- namespace: skywalking-system
diff --git a/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
b/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
index d93630e..88db1b3 100644
--- a/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
+++ b/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
@@ -16,7 +16,7 @@
setup:
env: kind
file: ../kind.yaml
- init-system-environment: ../env
+ init-system-environment: ../env.swck
kind:
expose-ports:
- namespace: skywalking-system
diff --git a/test/e2e/swck/oap-ui-agent-satellite.yaml
b/test/e2e/swck/oap-ui-agent-satellite.yaml
index 5eff1be..0526dec 100644
--- a/test/e2e/swck/oap-ui-agent-satellite.yaml
+++ b/test/e2e/swck/oap-ui-agent-satellite.yaml
@@ -16,7 +16,7 @@
setup:
env: kind
file: ../kind.yaml
- init-system-environment: ../env
+ init-system-environment: ../env.swck
kind:
expose-ports:
- namespace: skywalking-system
