Skip to content

Commit d331eb1

Browse files
authored
Add e2e test case for oal disable (#13295)
1 parent 1eb4067 commit d331eb1

File tree

5 files changed

+49
-1
lines changed

5 files changed

+49
-1
lines changed

test/e2e-v2/cases/kafka/kafka-monitoring/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ setup:
3131
verify:
3232
retry:
3333
count: 20
34-
interval: 3s
34+
interval: 10s
3535
cases:
3636
- includes:
3737
- ./kafka-cases.yaml

test/e2e-v2/cases/mqe/docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ services:
2222
service: oap
2323
volumes:
2424
- ./oal/core.oal:/skywalking/config/oal/core.oal
25+
- ./oal/disable.oal:/skywalking/config/oal/disable.oal
2526
environment:
2627
SW_API_PIPELINE_BASELINE_SERVICE_HOST: baseline-server
2728
depends_on:
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
type: UNKNOWN
17+
results: []
18+
error: 'Metric: [endpoint_cpm] does not exist.'
19+
debuggingtrace: null

test/e2e-v2/cases/mqe/mqe-cases.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,7 @@ cases:
118118
expected: expected/baseline-OP.yml
119119
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="baseline(service_percentile{p='95,99'},upper)" --service-name=e2e-service-provider
120120
expected: expected/baseline-label-OP.yml
121+
122+
# disable metrics
123+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression=endpoint_cpm --endpoint-name=POST:/users --service-name=e2e-service-provider
124+
expected: expected/disable-metrics.yml
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*
17+
*/
18+
19+
///////////////////////////////////////////////////////////////
20+
//
21+
// Disable unnecessary hard core stream, targeting @Stream#name
22+
//
23+
///////////////////////////////////////////////////////////////
24+
disable(endpoint_cpm);

0 commit comments

Comments
 (0)