42eb8f7376
The prototype codes of alarm bridge only.
2018-08-28 17:25:04 +08:00
53e8608832
Merge branch 'master' into 6.0
...
# Conflicts:
# .gitignore
# LICENSE
# README.md
# README_ZH.md
# apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
# apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
# apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
# apm-application-toolkit/apm-toolkit-opentracing/pom.xml
# apm-application-toolkit/apm-toolkit-trace/pom.xml
# apm-application-toolkit/pom.xml
# apm-checkstyle/pom.xml
# apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml
# apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml
# apm-collector/apm-collector-agent/agent-grpc/pom.xml
# apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml
# apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml
# apm-collector/apm-collector-agent/agent-jetty/pom.xml
# apm-collector/apm-collector-agent/pom.xml
# apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-alarm/pom.xml
# apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-baseline/pom.xml
# apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-jvm/pom.xml
# apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-metric/pom.xml
# apm-collector/apm-collector-analysis/analysis-register/pom.xml
# apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml
# apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml
# apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml
# apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml
# apm-collector/apm-collector-analysis/pom.xml
# apm-collector/apm-collector-boot/pom.xml
# apm-collector/apm-collector-boot/src/main/resources/component-libraries.yml
# apm-collector/apm-collector-cache/collector-cache-caffeine-provider/pom.xml
# apm-collector/apm-collector-cache/collector-cache-define/pom.xml
# apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
# apm-collector/apm-collector-cache/pom.xml
# apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
# apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
# apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
# apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
# apm-collector/apm-collector-cluster/pom.xml
# apm-collector/apm-collector-component/client-component/pom.xml
# apm-collector/apm-collector-component/pom.xml
# apm-collector/apm-collector-component/server-component/pom.xml
# apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml
# apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml
# apm-collector/apm-collector-configuration/pom.xml
# apm-collector/apm-collector-core/pom.xml
# apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
# apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
# apm-collector/apm-collector-grpc-manager/pom.xml
# apm-collector/apm-collector-instrument/pom.xml
# apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
# apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
# apm-collector/apm-collector-jetty-manager/pom.xml
# apm-collector/apm-collector-naming/collector-naming-define/pom.xml
# apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml
# apm-collector/apm-collector-naming/pom.xml
# apm-collector/apm-collector-remote/collector-remote-define/pom.xml
# apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml
# apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml
# apm-collector/apm-collector-remote/pom.xml
# apm-collector/apm-collector-storage/collector-storage-define/pom.xml
# apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml
# apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml
# apm-collector/apm-collector-storage/collector-storage-shardingjdbc-provider/pom.xml
# apm-collector/apm-collector-storage/pom.xml
# apm-collector/apm-collector-thirdparty-receiver/pom.xml
# apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/pom.xml
# apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-define/pom.xml
# apm-collector/apm-collector-thirdparty-receiver/receiver-zipkin/receiver-zipkin-provider/pom.xml
# apm-collector/apm-collector-ui/collector-ui-define/pom.xml
# apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml
# apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
# apm-collector/apm-collector-ui/pom.xml
# apm-collector/pom.xml
# apm-commons/apm-datacarrier/pom.xml
# apm-commons/apm-util/pom.xml
# apm-commons/pom.xml
# apm-dist/pom.xml
# apm-protocol/apm-network/pom.xml
# apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
# apm-protocol/apm-ui-protocol/pom.xml
# apm-protocol/pom.xml
# apm-sniffer/apm-agent-core/pom.xml
# apm-sniffer/apm-agent/pom.xml
# apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml
# apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml
# apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml
# apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml
# apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml
# apm-sniffer/apm-test-tools/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml
# apm-sniffer/apm-toolkit-activation/pom.xml
# apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
# apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml
# apm-sniffer/optional-plugins/pom.xml
# apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml
# apm-sniffer/pom.xml
# apm-webapp/pom.xml
# docs/README.md
# docs/README_ZH.md
# docs/cn/Direct-uplink-CN.md
# docs/cn/How-to-build-CN.md
# docs/cn/Optional-plugins-CN.md
# docs/users.md
# pom.xml
2018-08-25 22:08:19 +08:00
60e829fa30
Add the function of the specified agent config
2018-08-25 21:41:42 +08:00
6e6e13b9f5
add the function of the specified agent config ( #1584 )
...
* Fix bug stop stopSpan when not createSpan
* Fix bug stop stopSpan when not createSpan
* change the agent log level to millisecond
* add the function of the specified-agent-config
* Update README_ZH.md
* Use -D to set the specified config path
* add docs
* update docs
* change method name
* add link
* change the function name
* change the key
* format doc
2018-08-25 19:00:27 +08:00
4b17685c11
Sync mvnw to 6.0 , provided by @adriancole
2018-08-22 22:50:50 +08:00
d0b951649f
Moves to Maven wrapper to stabilize the version in use ( #1569 )
...
* Moves to Maven wrapper to stabilize the version in use
This will ensure those building will have similar experience due to
having a fixed maven version.
* Updates most plugin versions and removes redundant configuration
* Sets up build enforcement for JDK 1.8 until further work occurs
2018-08-22 19:04:15 +08:00
c2df70674f
Adjust documents.
2018-08-20 10:55:13 +08:00
01e69ff0a6
Update document.
2018-08-19 21:35:55 +08:00
66df7e6f45
Update JVM Scope names.
2018-08-18 15:24:00 +08:00
ba68d50d11
Add a new section in guides document.
2018-08-16 20:43:49 +08:00
1e51702bab
Add component library settings document back.
2018-08-16 20:37:27 +08:00
550563aa8c
Update protocol to 2.0 draft.
2018-08-16 15:54:09 +08:00
da112c0fec
Change protocol documents
2018-08-16 13:12:13 +08:00
9ac0f07793
Refactor documents. Delete all backend documents, cc @peng-yongsheng , considering backend refactored, then the documents should rebuild manually.
2018-08-07 20:25:11 +08:00
676e4ee930
Add a new scope ServiceInstance_JVM_GC
2018-08-06 15:08:15 +08:00
de048b448d
add ActiveMQ support ( #1524 )
2018-08-05 18:31:39 +08:00
454611db5e
Add a missing word.
2018-07-30 17:32:00 +08:00
c741e0afa2
Miss a format.
2018-07-30 17:06:15 +08:00
e81f072fab
Change scope document format.
2018-07-30 17:05:19 +08:00
d28f91782c
Add secondary scope for JVM. @hanahmily @peng-yongsheng
2018-07-30 17:02:19 +08:00
1a197c2221
Finish GraphQL protocol document.
2018-07-30 15:08:49 +08:00
7e4eccef08
Update a document sentence.
2018-07-27 15:47:21 +08:00
eabf9a7da2
Polish the document 'overview and core concepts' ( #1485 )
2018-07-23 19:19:38 +08:00
06b6f05438
Add how to build in eclipse ( #1464 )
...
* Update How-to-build-CN.md
2018-07-18 11:10:56 +08:00
48348efe74
@lemon @ascrutae I change the proto file path for preparing 6.0, but didn't change .net namespace. But I think if you sync the protocol submodule, you still need some changes.
2018-07-17 14:20:58 +08:00
736d7ae03f
Fix some wrong in release doc.
2018-07-11 14:47:34 -07:00
dcdfeb1e14
Feature/oap/cluster plugin ( #1440 )
...
* Cluster module implementation finished.
2018-07-10 23:50:08 -07:00
e2009b294e
Submit init version of Service Mesh probe protocol
2018-07-10 22:07:52 -07:00
c81a4a30b3
Start to write protocol section.
2018-07-10 16:14:12 -07:00
a26e6af6c7
Finish more documents about high level design of SkyWalking 6.
2018-07-09 23:03:35 -07:00
4cd4d247d8
Finish initial documents of overview, project goals and probe-introduction in concepts and designs.
2018-07-09 16:48:14 -07:00
f121730ede
Finish the new document structure.
2018-07-08 21:04:50 -07:00
b34350e249
Add comments about Filter and Functions.
2018-07-06 17:40:35 -07:00
e3f4e021be
Merge branch 'master' into 6.0
...
# Conflicts:
# README_ZH.md
2018-07-06 11:59:57 -07:00
e6ca91c3bf
Init branch 6.0 for our next big iteration. Change root readme. Format field document in table. Remove Chinese documents.
2018-07-06 11:52:56 -07:00
9f97f555f5
Finish the init doc of OAP and OAL.
2018-07-05 17:31:43 -07:00
fc87747dd1
Format release doc ( #1417 )
...
* Update How-to-release.md
* Update create_source_release.sh
2018-07-02 23:08:43 +08:00
38e4af8cbb
Webapp/login ( #1374 )
...
* Add login filter
Username and password are stored in application.yml with
prefix "security.user"
* Modify startup script and add webapp.yml config file
* Update quick-start document for default login username/password
* Update deploy document for new webapp.yml config file
* Update license for new files.
2018-06-20 22:32:12 +08:00
6605fcd3a8
Add architecture design doc ( #1366 )
...
* Create Architecture.md
* Update Architecture.md
* Update Architecture.md
* Update Architecture.md
* Update Architecture.md
* Update Architecture.md
* Update README.md
Add link in menu. Also related to #1360
* Update Architecture.md
* Update Architecture.md
* Update Architecture.md
* Update Architecture.md
* Update Architecture.md
* Update Architecture.md
2018-06-19 09:28:39 +08:00
ecc0f944d4
Zipkin receiver in SkyWalking collector ( #1273 )
...
* Add Zipkin receiver
2018-06-18 23:36:15 +08:00
6279c8dd3c
support shardingjdbc database storage feature ( #1347 )
...
* support shardingjdbc database storage feature
2018-06-14 22:21:03 +08:00
65299892e3
Change index page of Incubating and optional plugin documents ( #1340 )
...
* Reorganize incubating and optional docs.
2018-06-11 22:50:20 +08:00
975c04007c
Deploy document reformat ( #1337 )
...
* Refactor English documents to guide end users.
2018-06-11 16:23:35 +08:00
a6d9a605ed
modify the document ( #1331 )
...
* add document
* modify the document
* format document style
2018-06-08 18:15:19 +08:00
ab82f644a0
Adjust Tomcat deploy doc ( #1330 )
2018-06-08 17:08:50 +08:00
43a4faaec4
modify launch link address to Apache ( #1286 )
2018-05-30 17:59:04 +08:00
faaf3e829b
Separated TTL from minute to minute, hour, day, month. ( #1268 )
...
* #1263
Separated TTL from minute to minute, hour, day, month.
* 1. Minute metric data ttl change to 90, because of the 1 hour duration condition in UI means 60 minutes.
And i prefer to setting the value up to above 50%.
2. Some description and logging.
#1263
* Add a config time named traceDataTTL for trace data TTL.
#1263
* Fixed the logger english sentence mistake.
2018-05-28 17:09:04 +08:00
43da4e65d9
way to solve Import-Project-Eclipse-RequireItems-Exception ( #1264 )
...
* To bring forward a way to solve Import-Project-Eclipse-RequireItems-Exception
* way to solve Import-Project-Eclipse-RequireItems-Exception
* To bring forward a way to solve Import-Project-Eclipse-RequireItems-Exception
* Required items could not be found, when import project into Eclipse.
* using markdown style to quote the errors.
2018-05-27 12:45:19 +08:00
cb84b1fd1e
Update How-to-release.md ( #1267 )
2018-05-27 08:37:57 +08:00
9c4b95ab9f
Update release doc and related script ( #1252 )
...
* Adjust release doc and script based on last release vote.
* Update UI declaimer file.
* Update create_source_release.sh
* Update How-to-release.md
2018-05-23 11:47:56 +08:00
Wu Sheng
caoyixiong
Adrian Cole
XiaoFu
crystaldust
mumu
彭勇升 pengys
Gao Hongtao
林嘉琦 Lin Jiaqi
李伟高
haotian2015
kevinyyyy
hardzhang