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/10/15 02:42:49 UTC
[incubator-skywalking] branch h2-storage updated (bacc1b7 ->
84e44b8)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch h2-storage
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from bacc1b7 Merge branch 'master' into h2-storage
add 9e208d0 Fixed the bug of the getValues method in metric query. (#1739)
add b643190 Add alarm timestamp. (#1741)
add ef63bc6 The heartbeat implementation for all the scopes. (#1742)
add 59961b5 Update link to Skywalking Logo in README.md (#1751)
add 3f8af95 Alarm silence init wrong. (#1752)
add 7c192b1 Alarm query and alarm persistence test. (#1753)
add 966d5f5 Fixed the bugs, #1750, #1749, #1748, #1746, #1745 (#1755)
add 474b25e Set assemble based on assemble setting files. (#1756)
add a81b992 Set the function attribute for indicator and use AVG function to be the default value. (#1757)
add 84e44b8 Merge branch 'master' into h2-storage
No new revisions were added by this update.
Summary of changes:
README.md | 2 +-
oap-server/server-alarm-plugin/pom.xml | 8 ++-
.../oap/server/core/alarm/provider/Rules.java | 11 +--
.../server/core/alarm/provider/RulesReader.java | 70 +++++++++---------
.../server/core/alarm/provider/RunningRule.java | 23 ++----
.../skywalking/oap/server/core/CoreModule.java | 1 +
.../oap/server/core/CoreModuleProvider.java | 1 +
.../oap/server/core/alarm/AlarmMessage.java | 2 +-
.../oap/server/core/alarm/AlarmRecord.java | 8 ++-
.../core/alarm/AlarmStandardPersistence.java | 11 ++-
.../core/analysis/indicator/CPMIndicator.java | 10 ++-
.../core/analysis/indicator/CountIndicator.java | 3 +-
.../analysis/indicator/DoubleAvgIndicator.java | 3 +-
.../core/analysis/indicator/PercentIndicator.java | 3 +-
.../core/analysis/indicator/PxxIndicator.java | 3 +-
.../core/analysis/indicator/SumIndicator.java | 10 ++-
.../analysis/manual/segment/SegmentRecord.java | 2 +
.../oap/server/core/query/AlarmQueryService.java | 56 +++++++++++++++
.../oap/server/core/query/MetricQueryService.java | 7 +-
.../server/core/query/entity}/AlarmMessage.java | 8 ++-
.../entity/{Topology.java => AlarmTrend.java} | 13 +++-
.../query/entity/{LogEntity.java => Alarms.java} | 15 ++--
.../oap/server/core/query/entity/Attribute.java | 7 ++
.../oap/server/core/query/entity/BasicTrace.java | 21 ++++--
.../oap/server/core/query/entity/Call.java | 3 +
.../oap/server/core/query/entity/ClusterBrief.java | 3 +
.../oap/server/core/query/entity/Endpoint.java | 3 +
.../oap/server/core/query/entity/IntValues.java | 3 +
.../oap/server/core/query/entity/KVInt.java | 3 +
.../oap/server/core/query/entity/KeyValue.java | 3 +
.../oap/server/core/query/entity/Language.java | 3 +
.../oap/server/core/query/entity/LogEntity.java | 12 +++-
.../oap/server/core/query/entity/Node.java | 3 +
.../oap/server/core/query/entity/Order.java | 3 +
.../oap/server/core/query/entity/Pagination.java | 3 +
.../oap/server/core/query/entity/QueryOrder.java | 3 +
.../oap/server/core/query/entity/Ref.java | 3 +
.../oap/server/core/query/entity/RefType.java | 3 +
.../oap/server/core/query/entity/Service.java | 3 +
.../server/core/query/entity/ServiceInstance.java | 16 +++--
.../oap/server/core/query/entity/Span.java | 48 +++++++------
.../oap/server/core/query/entity/Step.java | 3 +
.../server/core/query/entity/Thermodynamic.java | 12 +++-
.../oap/server/core/query/entity/TopNEntity.java | 3 +
.../oap/server/core/query/entity/Topology.java | 12 +++-
.../oap/server/core/query/entity/Trace.java | 9 ++-
.../oap/server/core/query/entity/TraceBrief.java | 12 +++-
.../oap/server/core/query/entity/TraceState.java | 3 +
.../service/EndpointInventoryRegister.java | 12 ++++
.../service/IEndpointInventoryRegister.java | 2 +
.../service/INetworkAddressInventoryRegister.java | 2 +
.../service/IServiceInstanceInventoryRegister.java | 2 +
.../service/IServiceInventoryRegister.java | 2 +
.../service/NetworkAddressInventoryRegister.java | 15 ++++
.../service/ServiceInstanceInventoryRegister.java | 30 +++++---
.../register/service/ServiceInventoryRegister.java | 15 ++++
.../register/worker/RegisterPersistentWorker.java | 2 +-
.../skywalking/oap/server/core/source/Scope.java | 9 ++-
.../oap/server/core/storage/StorageModule.java | 2 +-
.../IAlarmQueryDAO.java} | 11 +--
oap-server/server-library/library-util/pom.xml | 8 +++
.../oap/server/library/util/TimeBucketUtils.java | 12 +++-
.../oap/server/library/util/TimestampUtils.java} | 18 ++---
.../library-util}/src/test/resources/log4j2.xml | 0
.../oap/query/graphql/GraphQLQueryProvider.java | 2 +-
.../query/graphql/resolver/AggregationQuery.java | 3 +
.../oap/query/graphql/resolver/AlarmQuery.java | 34 +++++++--
.../oap/query/graphql/resolver/MetadataQuery.java | 3 +
.../oap/query/graphql/resolver/MetricQuery.java | 3 +
.../oap/query/graphql/resolver/TopologyQuery.java | 3 +
.../oap/query/graphql/resolver/TraceQuery.java | 3 +
.../oap/query/graphql/type/AlarmTrend.java | 26 -------
.../skywalking/oap/query/graphql/type/Alarms.java | 26 -------
.../v5/InstanceDiscoveryServiceHandler.java | 12 ++--
...estCase.java => InstanceHeartBeatTestCase.java} | 17 +++--
.../listener/endpoint/MultiScopesSpanListener.java | 2 +-
.../listener/segment/SegmentSpanListener.java | 1 -
.../alarm-settings-sample.yml} | 16 +++--
.../{resources => assembly}/alarm-settings.yml | 39 +++++-----
.../server-starter/src/main/assembly/assembly.xml | 5 +-
.../src/main/resources/alarm-settings.yml | 40 ++++++-----
.../server-starter/src/main/resources/log4j2.xml | 1 +
.../StorageModuleElasticsearchProvider.java | 1 +
.../elasticsearch/query/AlarmQueryEsDAO.java | 82 ++++++++++++++++++++++
.../elasticsearch/query/MetricQueryEsDAO.java | 30 ++++++--
.../elasticsearch/query/TraceQueryEsDAO.java | 1 +
86 files changed, 672 insertions(+), 290 deletions(-)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AlarmQueryService.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}/AlarmMessage.java (88%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/{Topology.java => AlarmTrend.java} (83%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/{LogEntity.java => Alarms.java} (82%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{IRegisterLockDAO.java => query/IAlarmQueryDAO.java} (68%)
copy oap-server/server-library/library-util/src/{main/java/org/apache/skywalking/oap/server/library/util/StringUtils.java => test/java/org/apache/skywalking/oap/server/library/util/TimestampUtils.java} (67%)
copy oap-server/{server-storage-plugin/storage-elasticsearch-plugin => server-library/library-util}/src/test/resources/log4j2.xml (100%)
delete mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/AlarmTrend.java
delete mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Alarms.java
copy oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/{ApplicationRegisterHandlerTestCase.java => InstanceHeartBeatTestCase.java} (64%)
copy oap-server/server-starter/src/main/{resources/alarm-settings.yml => assembly/alarm-settings-sample.yml} (85%)
copy oap-server/server-starter/src/main/{resources => assembly}/alarm-settings.yml (54%)
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java