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 2018/09/25 12:39:40 UTC
[incubator-skywalking] branch mesh-source-dispatch updated (00bb7c6
-> 8f55c0f)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch mesh-source-dispatch
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 00bb7c6 Merge branch 'mesh-source-dispatch' of https://github.com/apache/incubator-skywalking into mesh-source-dispatch
add 7c619e3 Fix elastic search plugin not work. (#1691)
add 7d3e699 Adjust agent setting (#1682)
add e83e175 Meta data query implementation are all finished. (#1692)
add 53b9e7f Implementation of aggregation query. (#1702)
add 933ae20 Alarm module code core ready (#1644)
add 8f55c0f Merge branch 'master' into mesh-source-dispatch
No new revisions were added by this update.
Summary of changes:
.../network/trace/component/ComponentsDefine.java | 2 +
.../skywalking/apm/agent/SkyWalkingAgent.java | 51 +++++--
.../elasticsearch-5.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../optional-plugins/trace-ignore-plugin/README.md | 17 ---
.../trace-ignore-plugin/README_CN.md | 18 ---
.../optional-plugins/trace-ignore-plugin/pom.xml | 29 ----
docs/en/setup/service-agent/java-agent/README.md | 2 +-
.../agent-optional-plugins/trace-ignore-plugin.md | 6 +-
.../core/alarm/provider/AlarmMessageFormatter.java | 97 ++++++++++++
.../oap/server/core/alarm/provider/AlarmRule.java | 1 +
.../server/core/alarm/provider/RulesReader.java | 1 +
.../server/core/alarm/provider/RunningRule.java | 13 +-
.../core/alarm/provider/WebhookCallback.java | 61 ++++++++
.../alarm/provider/AlarmMessageFormatterTest.java | 83 +++++++++++
.../core/alarm/provider/AlarmRuleInitTest.java | 3 +
.../core/alarm/provider/RunningRuleTest.java | 12 +-
.../core/alarm/provider/WebhookCallbackTest.java | 122 +++++++++++++++
.../src/test/resources/alarm-settings.yml | 1 +
.../skywalking/oap/server/core/CoreModule.java | 1 +
.../oap/server/core/CoreModuleProvider.java | 1 +
.../oap/server/core/alarm/AlarmMessage.java | 7 +
.../server/core/query/AggregationQueryService.java | 110 ++++++++++++++
.../server/core/query/MetadataQueryService.java | 20 +--
.../oap/server/core/query/entity/Call.java | 2 +
.../oap/server/core/query/entity/Endpoint.java | 4 +
.../server/core/query/entity/LanguageTrans.java | 64 ++++++++
.../oap/server/core/query/entity}/Order.java | 2 +-
.../query/entity/{Service.java => TopNEntity.java} | 5 +-
.../server/core/register/EndpointInventory.java | 4 +-
.../core/register/ServiceInstanceInventory.java | 20 ++-
.../oap/server/core/storage/StorageModule.java | 2 +-
.../core/storage/TimePyramidTableNameBuilder.java | 3 -
.../oap/server/core/storage/annotation/Column.java | 2 -
.../annotation/StorageAnnotationListener.java | 2 +-
.../oap/server/core/storage/model/Model.java | 5 +-
.../oap/server/core/storage/model/ModelColumn.java | 9 +-
.../server/core/storage/model/ModelInstaller.java | 2 +-
...tricQueryDAO.java => IAggregationQueryDAO.java} | 19 ++-
.../core/storage/query/IMetadataQueryDAO.java | 13 +-
.../oap/query/graphql/GraphQLQueryProvider.java | 2 +-
.../query/graphql/resolver/AggregationQuery.java | 64 +++++++-
.../oap/query/graphql/resolver/AlarmQuery.java | 1 +
.../oap/query/graphql/resolver/MetadataQuery.java | 18 +--
.../oap/query/graphql/type/AlarmMessage.java | 2 +
.../skywalking/oap/query/graphql/type/Scope.java | 28 ----
.../oap/query/graphql/type/TopNCondition.java | 30 ----
.../oap/query/graphql/type/TopNEntity.java | 25 ----
.../src/main/resources/query-protocol | 2 +-
.../listener/endpoint/MultiScopesSpanListener.java | 3 -
.../StorageModuleElasticsearchProvider.java | 1 +
.../MatchCNameBuilder.java} | 13 +-
.../elasticsearch/base/StorageEsInstaller.java | 26 +++-
.../elasticsearch/query/AggregationQueryEsDAO.java | 137 +++++++++++++++++
.../elasticsearch/query/MetadataQueryEsDAO.java | 166 ++++++++++++++-------
55 files changed, 1039 insertions(+), 298 deletions(-)
delete mode 100644 apm-sniffer/optional-plugins/trace-ignore-plugin/README.md
delete mode 100644 apm-sniffer/optional-plugins/trace-ignore-plugin/README_CN.md
create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java
create mode 100644 oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java
create mode 100644 oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LanguageTrans.java
rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Order.java (93%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/{Service.java => TopNEntity.java} (95%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/{IMetricQueryDAO.java => IAggregationQueryDAO.java} (52%)
delete mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Scope.java
delete mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TopNCondition.java
delete mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TopNEntity.java
copy oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/{lock/RegisterLockIndex.java => base/MatchCNameBuilder.java} (80%)
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java