Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
53e42bce
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
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,发现更多精彩内容 >>
未验证
提交
53e42bce
编写于
11月 26, 2020
作者:
G
Gao Hongtao
提交者:
GitHub
11月 26, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Insert group name into services of so11y and istio relevant metrics (#5897)
上级
127782f1
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
38 addition
and
24 deletion
+38
-24
CHANGES.md
CHANGES.md
+4
-0
docs/en/setup/backend/backend-fetcher.md
docs/en/setup/backend/backend-fetcher.md
+4
-4
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java
...g/apache/skywalking/oap/meter/analyzer/MetricConvert.java
+3
-3
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rule.java
...e/skywalking/oap/meter/analyzer/prometheus/rule/Rule.java
+2
-2
oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/FunctionTest.java
...pache/skywalking/oap/meter/analyzer/dsl/FunctionTest.java
+7
-0
oap-server/server-bootstrap/src/main/resources/fetcher-prom-rules/self.yaml
...bootstrap/src/main/resources/fetcher-prom-rules/self.yaml
+2
-2
oap-server/server-bootstrap/src/main/resources/otel-oc-rules/istio-controlplane.yaml
.../src/main/resources/otel-oc-rules/istio-controlplane.yaml
+2
-0
oap-server/server-bootstrap/src/main/resources/otel-oc-rules/oap.yaml
...erver-bootstrap/src/main/resources/otel-oc-rules/oap.yaml
+2
-3
oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml
...rap/src/main/resources/ui-initialized-templates/istio.yml
+1
-0
oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/self-observability.yml
...resources/ui-initialized-templates/self-observability.yml
+1
-0
skywalking-ui
skywalking-ui
+1
-1
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/PythonE2E.java
...st/src/test/java/org/apache/skywalking/e2e/PythonE2E.java
+1
-1
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/kafka/KafkaE2E.java
...c/test/java/org/apache/skywalking/e2e/kafka/KafkaE2E.java
+2
-2
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/meter/MeterE2E.java
...c/test/java/org/apache/skywalking/e2e/meter/MeterE2E.java
+1
-1
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/simple/SimpleE2E.java
...test/java/org/apache/skywalking/e2e/simple/SimpleE2E.java
+2
-2
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/storage/StorageE2E.java
...st/java/org/apache/skywalking/e2e/storage/StorageE2E.java
+2
-2
test/e2e/e2e-test/src/test/resources/expected/simple/so11y-services.yml
...est/src/test/resources/expected/simple/so11y-services.yml
+1
-1
未找到文件。
CHANGES.md
浏览文件 @
53e42bce
...
...
@@ -54,10 +54,14 @@ Release Notes.
*
Fix "transaction too large error" when use TiDB as storage.
*
Add otel rules to ui template to observe Istio control plane.
*
Remove istio mixer
*
Insert group name into services of so11y and istio relevant metrics
#### UI
*
Fix incorrect label in radial chart in topology.
*
Replace node-sass with dart-sass.
*
Replace serviceFilter with serviceGroup
*
Removed "Les Miserables" from radial chart in topology.
*
Add the Promise dropdown option
#### Documentation
*
Add VNode FAQ doc.
...
...
docs/en/setup/backend/backend-fetcher.md
浏览文件 @
53e42bce
...
...
@@ -46,10 +46,10 @@ staticConfig:
# Labels assigned to all metrics fetched from the targets.
labels
:
[
<labelname>
:
<labelvalue> ...
]
#
insert group_name into metric name, for example, meter_<group_name>_<raw_metric_name>
group
:
<group_name
>
#
default metric level function appends to all expression in this file.
defaultMetricLevel
:
<exp
>
#
expSuffix is appended to all expression in this file.
expSuffix
:
<string
>
#
insert metricPrefix into metric name: <metricPrefix>_<raw_metric_name>
metricPrefix
:
<string
>
# Metrics rule allow you to recompute queries.
metricsRules
:
[
- <metric_rules>
]
...
...
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java
浏览文件 @
53e42bce
...
...
@@ -48,9 +48,9 @@ public class MetricConvert {
private
final
List
<
Analyzer
>
analyzers
;
public
MetricConvert
(
Rule
rule
,
MeterSystem
service
)
{
Preconditions
.
checkState
(!
Strings
.
isNullOrEmpty
(
rule
.
get
Group
()));
Preconditions
.
checkState
(!
Strings
.
isNullOrEmpty
(
rule
.
get
MetricPrefix
()));
this
.
analyzers
=
rule
.
getMetricsRules
().
stream
().
map
(
r
->
Analyzer
.
build
(
formatMetricName
(
rule
,
r
.
getName
()),
Strings
.
isEmpty
(
rule
.
getDefaultMetricLevel
())
?
r
.
getExp
()
:
String
.
format
(
"(%s).%s"
,
r
.
getExp
(),
rule
.
getDefaultMetricLevel
()),
service
))
Strings
.
isEmpty
(
rule
.
getExpSuffix
())
?
r
.
getExp
()
:
String
.
format
(
"(%s).%s"
,
r
.
getExp
(),
rule
.
getExpSuffix
()),
service
))
.
collect
(
toList
());
}
...
...
@@ -75,7 +75,7 @@ public class MetricConvert {
private
String
formatMetricName
(
Rule
rule
,
String
meterRuleName
)
{
StringJoiner
metricName
=
new
StringJoiner
(
"_"
);
metricName
.
add
(
"meter"
).
add
(
rule
.
getGroup
()).
add
(
meterRuleName
);
metricName
.
add
(
rule
.
getMetricPrefix
()).
add
(
meterRuleName
);
return
metricName
.
toString
();
}
}
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rule.java
浏览文件 @
53e42bce
...
...
@@ -33,7 +33,7 @@ public class Rule {
private
String
fetcherTimeout
;
private
String
metricsPath
;
private
StaticConfig
staticConfig
;
private
String
group
;
private
String
defaultMetricLevel
;
private
String
metricPrefix
;
private
String
expSuffix
;
private
List
<
MetricsRule
>
metricsRules
;
}
oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/FunctionTest.java
浏览文件 @
53e42bce
...
...
@@ -81,6 +81,13 @@ public class FunctionTest {
Result
.
success
(
SampleFamily
.
build
(
Sample
.
builder
().
labels
(
of
(
"region"
,
"zh"
)).
build
())),
false
,
},
{
"tag-append"
,
of
(
"instance_cpu_percentage"
,
SampleFamily
.
build
(
Sample
.
builder
().
labels
(
of
(
"region"
,
"us"
)).
build
())),
"instance_cpu_percentage.tag({tags -> tags.region = 'prefix::' + tags.region})"
,
Result
.
success
(
SampleFamily
.
build
(
Sample
.
builder
().
labels
(
of
(
"region"
,
"prefix::us"
)).
build
())),
false
,
},
{
"histogram"
,
of
(
"instance_cpu_percentage"
,
SampleFamily
.
build
(
...
...
oap-server/server-bootstrap/src/main/resources/fetcher-prom-rules/self.yaml
浏览文件 @
53e42bce
...
...
@@ -38,8 +38,8 @@ staticConfig:
sslCaFilePath
:
labels
:
service
:
oap-server
defaultMetricLevel
:
instance(['service'], ['instance'])
group
:
oap
expSuffix
:
tag({tags -> tags.service = 'oap::' + tags.service}).
instance(['service'], ['instance'])
metricPrefix
:
meter_
oap
metricsRules
:
-
name
:
instance_cpu_percentage
exp
:
(process_cpu_seconds_total * 100).sum(['service', 'instance']).rate('PT1M')
...
...
oap-server/server-bootstrap/src/main/resources/otel-oc-rules/istio-controlplane.yaml
浏览文件 @
53e42bce
...
...
@@ -30,6 +30,8 @@
# </pre>
group
:
istio
defaultMetricLevel
:
service(['cluster', 'app'])
expSuffix
:
tag({tags -> tags.cluster = 'istio-ctrl::' + tags.cluster}).service(['cluster', 'app'])
metricPrefix
:
meter_istio
metricsRules
:
## Resource usage
# Pilot Versions
...
...
oap-server/server-bootstrap/src/main/resources/otel-oc-rules/oap.yaml
浏览文件 @
53e42bce
...
...
@@ -28,9 +28,8 @@
# "-P6H3M" -- parses as "-6 hours and -3 minutes"
# "-P-6H+3M" -- parses as "+6 hours and -3 minutes"
# </pre>
group
:
oap
# Self-monitoring defaults to prometheus fetcher.
defaultMetricLevel
:
instance(['service'], ['host_name'])
expSuffix
:
tag({tags -> tags.service = 'oap::' + tags.service}).instance(['service'], ['host_name'])
metricPrefix
:
meter_oap
metricsRules
:
-
name
:
instance_cpu_percentage
exp
:
(process_cpu_seconds_total * 100).sum(['service', 'host_name']).rate('PT1M')
...
...
oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/istio.yml
浏览文件 @
53e42bce
...
...
@@ -30,6 +30,7 @@ templates:
{
"name": "Istio",
"type": "service",
"serviceGroup": "istio-ctrl",
"children": [
{
"name": "Control Plane",
...
...
oap-server/server-bootstrap/src/main/resources/ui-initialized-templates/self-observability.yml
浏览文件 @
53e42bce
...
...
@@ -26,6 +26,7 @@ templates:
{
"name": "SelfObservability",
"type": "service",
"serviceGroup": "oap",
"children": [
{
"name": "oap-server",
...
...
skywalking-ui
@
eb7717e9
比较
00fedacc
...
eb7717e9
Subproject commit
00fedacc5fe842f44952f58719fc6a9659147367
Subproject commit
eb7717e9daf5dd13eb561c4905301017470ec528
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/PythonE2E.java
浏览文件 @
53e42bce
...
...
@@ -101,7 +101,7 @@ public class PythonE2E extends SkyWalkingTestAdapter {
@RetryableTest
void
services
()
throws
Exception
{
List
<
Service
>
services
=
graphql
.
services
(
new
ServicesQuery
().
start
(
startTime
).
end
(
now
()));
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap-server"
)).
collect
(
Collectors
.
toList
());
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap
::oap
-server"
)).
collect
(
Collectors
.
toList
());
LOGGER
.
info
(
"services: {}"
,
services
);
load
(
"expected/python/services.yml"
).
as
(
ServicesMatcher
.
class
).
verify
(
services
);
...
...
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/kafka/KafkaE2E.java
浏览文件 @
53e42bce
...
...
@@ -109,7 +109,7 @@ public class KafkaE2E extends SkyWalkingTestAdapter {
void
services
()
throws
Exception
{
List
<
Service
>
services
=
graphql
.
services
(
new
ServicesQuery
().
start
(
startTime
).
end
(
now
()));
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap-server"
)).
collect
(
Collectors
.
toList
());
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap
::oap
-server"
)).
collect
(
Collectors
.
toList
());
LOGGER
.
info
(
"services: {}"
,
services
);
load
(
"expected/simple/services.yml"
).
as
(
ServicesMatcher
.
class
).
verify
(
services
);
...
...
@@ -171,7 +171,7 @@ public class KafkaE2E extends SkyWalkingTestAdapter {
void
so11y
()
throws
Exception
{
List
<
Service
>
services
=
graphql
.
services
(
new
ServicesQuery
().
start
(
startTime
).
end
(
now
()));
services
=
services
.
stream
().
filter
(
s
->
s
.
getLabel
().
equals
(
"oap-server"
)).
collect
(
Collectors
.
toList
());
services
=
services
.
stream
().
filter
(
s
->
s
.
getLabel
().
equals
(
"oap
::oap
-server"
)).
collect
(
Collectors
.
toList
());
LOGGER
.
info
(
"services: {}"
,
services
);
load
(
"expected/simple/so11y-services.yml"
).
as
(
ServicesMatcher
.
class
).
verify
(
services
);
for
(
final
Service
service
:
services
)
{
...
...
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/meter/MeterE2E.java
浏览文件 @
53e42bce
...
...
@@ -77,7 +77,7 @@ public class MeterE2E extends SkyWalkingTestAdapter {
void
meters
()
throws
Exception
{
List
<
Service
>
services
=
graphql
.
services
(
new
ServicesQuery
().
start
(
startTime
).
end
(
now
()));
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap-server"
)).
collect
(
Collectors
.
toList
());
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap
::oap
-server"
)).
collect
(
Collectors
.
toList
());
LOGGER
.
info
(
"services: {}"
,
services
);
load
(
"expected/meter/services.yml"
).
as
(
ServicesMatcher
.
class
).
verify
(
services
);
...
...
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/simple/SimpleE2E.java
浏览文件 @
53e42bce
...
...
@@ -141,7 +141,7 @@ public class SimpleE2E extends SkyWalkingTestAdapter {
void
services
()
throws
Exception
{
List
<
Service
>
services
=
graphql
.
services
(
new
ServicesQuery
().
start
(
startTime
).
end
(
now
()));
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap-server"
)).
collect
(
Collectors
.
toList
());
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap
::oap
-server"
)).
collect
(
Collectors
.
toList
());
LOGGER
.
info
(
"services: {}"
,
services
);
load
(
"expected/simple/services.yml"
).
as
(
ServicesMatcher
.
class
).
verify
(
services
);
...
...
@@ -203,7 +203,7 @@ public class SimpleE2E extends SkyWalkingTestAdapter {
void
so11y
()
throws
Exception
{
List
<
Service
>
services
=
graphql
.
services
(
new
ServicesQuery
().
start
(
startTime
).
end
(
now
()));
services
=
services
.
stream
().
filter
(
s
->
s
.
getLabel
().
equals
(
"oap-server"
)).
collect
(
Collectors
.
toList
());
services
=
services
.
stream
().
filter
(
s
->
s
.
getLabel
().
equals
(
"oap
::oap
-server"
)).
collect
(
Collectors
.
toList
());
LOGGER
.
info
(
"services: {}"
,
services
);
load
(
"expected/simple/so11y-services.yml"
).
as
(
ServicesMatcher
.
class
).
verify
(
services
);
for
(
final
Service
service
:
services
)
{
...
...
test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/storage/StorageE2E.java
浏览文件 @
53e42bce
...
...
@@ -123,7 +123,7 @@ public class StorageE2E extends SkyWalkingTestAdapter {
void
services
()
throws
Exception
{
List
<
Service
>
services
=
graphql
.
services
(
new
ServicesQuery
().
start
(
startTime
).
end
(
now
()));
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap-server"
)).
collect
(
Collectors
.
toList
());
services
=
services
.
stream
().
filter
(
s
->
!
s
.
getLabel
().
equals
(
"oap
::oap
-server"
)).
collect
(
Collectors
.
toList
());
LOGGER
.
info
(
"services: {}"
,
services
);
load
(
"expected/storage/services.yml"
).
as
(
ServicesMatcher
.
class
).
verify
(
services
);
...
...
@@ -233,7 +233,7 @@ public class StorageE2E extends SkyWalkingTestAdapter {
void
so11y
()
throws
Exception
{
List
<
Service
>
services
=
graphql
.
services
(
new
ServicesQuery
().
start
(
startTime
).
end
(
now
()));
services
=
services
.
stream
().
filter
(
s
->
s
.
getLabel
().
equals
(
"oap-server"
)).
collect
(
Collectors
.
toList
());
services
=
services
.
stream
().
filter
(
s
->
s
.
getLabel
().
equals
(
"oap
::oap
-server"
)).
collect
(
Collectors
.
toList
());
LOGGER
.
info
(
"services: {}"
,
services
);
load
(
"expected/simple/so11y-services.yml"
).
as
(
ServicesMatcher
.
class
).
verify
(
services
);
for
(
final
Service
service
:
services
)
{
...
...
test/e2e/e2e-test/src/test/resources/expected/simple/so11y-services.yml
浏览文件 @
53e42bce
...
...
@@ -15,4 +15,4 @@
services
:
-
key
:
not
null
label
:
"
oap-server"
label
:
"
oap
::oap
-server"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录