This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 7447999b4c Fix wrong layer of metric `userError` in DynamoDB
monitoring. (#10518)
7447999b4c is described below
commit 7447999b4c5c3b9db44093b1323470d169e43f4d
Author: yswdqz <[email protected]>
AuthorDate: Thu Mar 9 15:09:55 2023 +0800
Fix wrong layer of metric `userError` in DynamoDB monitoring. (#10518)
---
docs/en/changes/changes.md | 3 ++-
.../otel-rules/aws-dynamodb/dynamodb-endpoint.yaml | 3 +--
.../aws_dynamodb/aws_dynamodb-endpoint.json | 30 +++-------------------
.../cases/aws/dynamodb/mock-data/data-1.json | 6 -----
4 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 1cbd24aaf3..2d47e90c9f 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -5,8 +5,9 @@
#### OAP Server
+* Fix wrong layer of metric `user error` in DynamoDB monitoring.
#### Documentation
-All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/169?closed=1)
+All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/169?closed=1)
\ No newline at end of file
diff --git
a/oap-server/server-starter/src/main/resources/otel-rules/aws-dynamodb/dynamodb-endpoint.yaml
b/oap-server/server-starter/src/main/resources/otel-rules/aws-dynamodb/dynamodb-endpoint.yaml
index 70ce6b4c7f..55dab28950 100644
---
a/oap-server/server-starter/src/main/resources/otel-rules/aws-dynamodb/dynamodb-endpoint.yaml
+++
b/oap-server/server-starter/src/main/resources/otel-rules/aws-dynamodb/dynamodb-endpoint.yaml
@@ -78,8 +78,7 @@ metricsRules:
exp:
amazonaws_com_AWS_DynamoDB_SystemErrors.tagMatch('Operation','GetItem|Scan|Query|BatchGetItem|TransactGetItems')
- name: endpoint_write_system_errors
exp:
amazonaws_com_AWS_DynamoDB_SystemErrors.tagMatch('Operation','PutItem|UpdateItem|DeleteItem|BatchWriteItem|TransactWriteItems')
- - name: endpoint_user_errors
- exp: amazonaws_com_AWS_DynamoDB_UserErrors
+
- name: endpoint_conditional_check_failed_requests
exp: amazonaws_com_AWS_DynamoDB_ConditionalCheckFailedRequests
- name: endpoint_transaction_conflict
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 00201d7087..4c57d8177b 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
@@ -106,31 +106,6 @@
"y":21,
"w":6,
"h":11,
- "i":"3",
- "type":"Widget",
- "metricTypes":[
- "readMetricsValues"
- ],
- "metrics":[
- "aws_dynamodb_endpoint_user_errors"
- ],
- "graph":{
- "type":"Line",
- "step":false,
- "smooth":false,
- "showSymbol":false,
- "showXAxis":true,
- "showYAxis":true
- },
- "widget":{
- "title":"User Error"
- }
- },
- {
- "x":12,
- "y":21,
- "w":6,
- "h":11,
"i":"4",
"type":"Widget",
"metricTypes":[
@@ -152,7 +127,7 @@
}
},
{
- "x":18,
+ "x":12,
"y":21,
"w":6,
"h":11,
@@ -340,7 +315,8 @@
"layer":"AWS_DYNAMODB",
"entity":"Endpoint",
"name":"AWS-DynamoDB-Endpoint",
- "id":"AWS-DynamoDB-Endpoint"
+ "id":"AWS-DynamoDB-Endpoint",
+ "isRoot":false
}
}
]
\ No newline at end of file
diff --git a/test/e2e-v2/cases/aws/dynamodb/mock-data/data-1.json
b/test/e2e-v2/cases/aws/dynamodb/mock-data/data-1.json
index 7df4ea5061..4ed05cc764 100644
--- a/test/e2e-v2/cases/aws/dynamodb/mock-data/data-1.json
+++ b/test/e2e-v2/cases/aws/dynamodb/mock-data/data-1.json
@@ -601,12 +601,6 @@
"value": {
"stringValue": "UserErrors"
}
- },
- {
- "key": "TableName",
- "value": {
- "stringValue": "test"
- }
}
]
}
