Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
29dbcf46
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
29dbcf46
编写于
10月 12, 2021
作者:
W
wankai123
提交者:
GitHub
10月 12, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace e2e cases to e2e-v2: Meter (#7912)
上级
7f7f604b
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
179 addition
and
2 deletion
+179
-2
.github/workflows/e2e.yaml
.github/workflows/e2e.yaml
+2
-2
CHANGES.md
CHANGES.md
+1
-0
test/e2e-v2/cases/meter/docker-compose.yml
test/e2e-v2/cases/meter/docker-compose.yml
+39
-0
test/e2e-v2/cases/meter/e2e.yaml
test/e2e-v2/cases/meter/e2e.yaml
+58
-0
test/e2e-v2/cases/meter/expected/metrics-has-value.yml
test/e2e-v2/cases/meter/expected/metrics-has-value.yml
+19
-0
test/e2e-v2/cases/meter/expected/service-instance.yml
test/e2e-v2/cases/meter/expected/service-instance.yml
+40
-0
test/e2e-v2/cases/meter/expected/service.yml
test/e2e-v2/cases/meter/expected/service.yml
+20
-0
未找到文件。
.github/workflows/e2e.yaml
浏览文件 @
29dbcf46
...
...
@@ -51,6 +51,8 @@ jobs:
config-file
:
lua/e2e.yaml
-
name
:
Gateway
config-file
:
gateway/e2e.yaml
-
name
:
Meter
config-file
:
meter/e2e.yaml
steps
:
-
uses
:
actions/checkout@v2
with
:
...
...
@@ -71,8 +73,6 @@ jobs:
strategy
:
matrix
:
case
:
-
name
:
Meter
class
:
org.apache.skywalking.e2e.meter.MeterE2E
-
name
:
Zabbix
class
:
org.apache.skywalking.e2e.zabbix.ZabbixE2E
steps
:
...
...
CHANGES.md
浏览文件 @
29dbcf46
...
...
@@ -14,6 +14,7 @@ Release Notes.
*
Add component definition for
`Apache-Kylin`
.
*
Enhance
`get`
generation mechanism of OAL engine, support map type of source's field.
*
Replace e2e cases to e2e-v2: Gateway.
*
Replace e2e cases to e2e-v2: Meter.
*
Add
`tag`
(Map) into All, Service, ServiceInstance and Endpoint sources.
*
Fix
`funcParamExpression`
and
`literalExpression`
can't be used in the same aggregation function.
*
Support cast statement in the OAL core engine.
...
...
test/e2e-v2/cases/meter/docker-compose.yml
0 → 100644
浏览文件 @
29dbcf46
# 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.
version
:
'
2.1'
services
:
oap
:
environment
:
SW_METER_ANALYZER_ACTIVE_FILES
:
spring-sleuth
extends
:
file
:
../../script/docker-compose/base-compose.yml
service
:
oap
ports
:
-
12800
provider
:
extends
:
file
:
../../script/docker-compose/base-compose.yml
service
:
provider
depends_on
:
oap
:
condition
:
service_healthy
ports
:
-
9090
networks
:
e2e
:
test/e2e-v2/cases/meter/e2e.yaml
0 → 100644
浏览文件 @
29dbcf46
# 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.
# This file is used to show how to write configuration files and can be used to test.
setup
:
env
:
compose
file
:
docker-compose.yml
timeout
:
1200
init-system-environment
:
../../script/env
steps
:
-
name
:
install yq
command
:
bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh yq
-
name
:
install swctl
command
:
bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh swctl
-
name
:
install etcdctl
command
:
bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh etcdctl
trigger
:
action
:
http
interval
:
3s
times
:
10
url
:
http://${provider_host}:${provider_9090}/users
method
:
POST
body
:
'
{"id":"123","name":"skywalking"}'
headers
:
"
Content-Type"
:
"
application/json"
verify
:
retry
:
count
:
20
interval
:
3s
cases
:
# service list
-
query
:
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls
expected
:
expected/service.yml
# service instance list
-
query
:
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql instance list --service-name=e2e-service-provider
expected
:
expected/service-instance.yml
# service instance metrics linear
-
query
:
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name=meter_jvm_memory_max --instance-name=provider1 --service-name=e2e-service-provider |yq e 'to_entries' -
expected
:
expected/metrics-has-value.yml
-
query
:
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name=meter_jvm_threads_live --instance-name=provider1 --service-name=e2e-service-provider |yq e 'to_entries' -
expected
:
expected/metrics-has-value.yml
-
query
:
swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name=meter_process_files_max --instance-name=provider1 --service-name=e2e-service-provider |yq e 'to_entries' -
expected
:
expected/metrics-has-value.yml
test/e2e-v2/cases/meter/expected/metrics-has-value.yml
0 → 100644
浏览文件 @
29dbcf46
# 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.
{{
- contains .
}}
-
key
:
{{
notEmpty .key
}}
value
:
{{
ge .value 1
}}
{{
- end
}}
test/e2e-v2/cases/meter/expected/service-instance.yml
0 → 100644
浏览文件 @
29dbcf46
# Licensed to 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. Apache Software Foundation (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.
{{
- contains .
}}
-
id
:
{{
b64enc "e2e-service-provider"
}}
.1_{{ b64enc "provider1" }}
name
:
provider1
attributes
:
{{
- contains .attributes
}}
-
name
:
OS Name
value
:
Linux
-
name
:
hostname
value
:
{{
notEmpty .value
}}
-
name
:
Process No.
value
:
"
1"
-
name
:
Start Time
value
:
{{
notEmpty .value
}}
-
name
:
JVM Arguments
value
:
'
{{
notEmpty
.value
}}'
-
name
:
Jar Dependencies
value
:
'
{{
notEmpty
.value
}}'
-
name
:
ipv4s
value
:
{{
notEmpty .value
}}
{{
- end
}}
language
:
JAVA
instanceuuid
:
{{
b64enc "e2e-service-provider"
}}
.1_{{ b64enc "provider1" }}
{{
- end
}}
test/e2e-v2/cases/meter/expected/service.yml
0 → 100644
浏览文件 @
29dbcf46
# 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.
{{
- contains .
}}
-
id
:
{{
b64enc "e2e-service-provider"
}}
.1
name
:
e2e-service-provider
group
:
"
"
{{
- end
}}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录