[skywalking] branch e2e/python updated (3cb69e4 -> 649d3fe)

[wu...@apache.org]

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

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


    from 3cb69e4  Test: add E2E test for Python Agent
     add 749af3e  Alarm support multiple scope (#4769)
     add 649d3fe  Merge branch 'master' into e2e/python

No new revisions were added by this update.

Summary of changes:
 dist-material/alarm-settings.yml                   | 14 ++++
 docs/en/setup/backend/backend-alarm.md             | 40 ++++++----
 .../server/exporter/provider/MetricFormatter.java  | 33 ++++++++
 .../oal/rt/parser/ConditionExpression.java         |  5 +-
 .../skywalking/oal/rt/parser/DataColumn.java       |  5 +-
 .../skywalking/oal/rt/parser/EntryMethod.java      |  5 +-
 .../skywalking/oal/rt/parser/Expression.java       |  5 +-
 .../skywalking/oal/rt/parser/PersistenceField.java |  5 +-
 .../skywalking/oal/rt/parser/SourceColumn.java     |  5 +-
 .../oap/server/core/alarm/provider/AlarmRule.java  |  5 +-
 .../server/core/alarm/provider/NotifyHandler.java  | 57 +++++++++++++-
 .../oap/server/core/alarm/provider/Rules.java      |  5 +-
 .../core/alarm/provider/NotifyHandlerTest.java     | 90 ++++++++++++++++++++++
 .../oap/server/core/alarm/AlarmMessage.java        |  5 +-
 .../oap/server/core/alarm/EndpointMetaInAlarm.java |  7 +-
 ...Alarm.java => EndpointRelationMetaInAlarm.java} | 25 +++---
 .../core/alarm/ServiceInstanceMetaInAlarm.java     |  7 +-
 ...ava => ServiceInstanceRelationMetaInAlarm.java} | 25 +++---
 .../oap/server/core/alarm/ServiceMetaInAlarm.java  |  7 +-
 ...nAlarm.java => ServiceRelationMetaInAlarm.java} | 21 +++--
 .../oap/server/core/source/DatabaseAccess.java     |  3 +-
 .../oap/server/core/source/DefaultScopeDefine.java | 45 +++++++++++
 .../oap/server/core/source/EndpointRelation.java   |  3 +-
 .../oap/server/core/source/ScopeDefaultColumn.java |  3 +-
 .../core/source/ServiceInstanceRelation.java       |  3 +-
 .../oap/server/core/source/ServiceRelation.java    |  3 +-
 .../oap/query/graphql/GraphQLQueryConfig.java      |  2 +-
 27 files changed, 333 insertions(+), 100 deletions(-)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/{ServiceInstanceMetaInAlarm.java => EndpointRelationMetaInAlarm.java} (61%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/{ServiceInstanceMetaInAlarm.java => ServiceInstanceRelationMetaInAlarm.java} (63%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/{ServiceInstanceMetaInAlarm.java => ServiceRelationMetaInAlarm.java} (68%)