You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/12/08 08:47:53 UTC

[skywalking] branch master updated (fbf49b2 -> 4aa9f30)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from fbf49b2  Change the operation name of quartz-scheduler plugin (#5934)
     add 4aa9f30  Add alarm tests in the e2e (#5961)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e.yaml                         |  29 ++++++
 CHANGES.md                                         |   2 +
 .../oap/server/core/alarm/AlarmRecord.java         |  12 ++-
 .../core/alarm/AlarmStandardPersistence.java       |   4 +-
 .../apache/skywalking/e2e/SimpleQueryClient.java   |  41 ++++++--
 .../AlarmMatcher.java}                             |  26 +++--
 .../apache/skywalking/e2e/alarm/AlarmQuery.java}   |   6 +-
 .../AlarmsMatcher.java}                            |  31 +++---
 .../ProfileTasks.java => alarm/GetAlarm.java}      |  14 +--
 .../apache/skywalking/e2e/alarm/GetAlarmData.java} |   8 +-
 .../skywalking/e2e/alarm/HookAlarmMatcher.java     |  34 ++++---
 .../ServicesMatcher.java => alarm/HookAlarms.java} |  40 ++++----
 .../resources/{endpoints.gql => read-alarms.gql}   |  32 ++++--
 .../skywalking/e2e/controller/AlarmController.java |  80 +++++++++++++++
 .../alarm/alarm-settings.yml}                      |  45 +++++----
 .../docker/{meter => alarm}/docker-compose.yml     |   6 +-
 .../org/apache/skywalking/e2e/alarm/AlarmE2E.java  | 111 +++++++++++++++++++++
 .../expected/{meter => alarm}/services.yml         |   2 +-
 .../expected/alarm/silence-after-graphql.yml       |  34 +++++++
 .../expected/alarm/silence-after-webhook.yml       |  49 +++++++++
 .../expected/alarm/silence-before-graphql.yml      |  15 ++-
 .../topo.yml => alarm/silence-before-webhook.yml}  |  38 +++----
 22 files changed, 514 insertions(+), 145 deletions(-)
 copy test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/{metrics/MetricsValueMatcher.java => alarm/AlarmMatcher.java} (62%)
 copy test/{plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateAdditionFileException.java => e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/AlarmQuery.java} (84%)
 copy test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/{service/ServicesMatcher.java => alarm/AlarmsMatcher.java} (60%)
 copy test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/{profile/query/ProfileTasks.java => alarm/GetAlarm.java} (82%)
 copy test/{plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateFailedException.java => e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/GetAlarmData.java} (86%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java => test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/alarm/HookAlarmMatcher.java (50%)
 copy test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/{service/ServicesMatcher.java => alarm/HookAlarms.java} (57%)
 copy test/e2e/e2e-data/src/main/resources/{endpoints.gql => read-alarms.gql} (64%)
 create mode 100644 test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/AlarmController.java
 copy test/e2e/e2e-test/{src/test/resources/expected/profile/finished.yml => docker/alarm/alarm-settings.yml} (51%)
 mode change 100644 => 100755
 copy test/e2e/e2e-test/docker/{meter => alarm}/docker-compose.yml (90%)
 create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/alarm/AlarmE2E.java
 copy test/e2e/e2e-test/src/test/resources/expected/{meter => alarm}/services.yml (95%)
 create mode 100644 test/e2e/e2e-test/src/test/resources/expected/alarm/silence-after-graphql.yml
 create mode 100644 test/e2e/e2e-test/src/test/resources/expected/alarm/silence-after-webhook.yml
 copy apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.plugin.loader.InstrumentationLoader => test/e2e/e2e-test/src/test/resources/expected/alarm/silence-before-graphql.yml (65%)
 mode change 100755 => 100644
 copy test/e2e/e2e-test/src/test/resources/expected/{cluster/topo.yml => alarm/silence-before-webhook.yml} (60%)