[skywalking-website] branch asf-site updated (aed3249 -> cad0866)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard aed3249 Update asf-site new cad0866 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (aed3249) \ N -- N -- N refs/heads/asf-site (cad0866) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 6 +++--- assets/js/{25.944b52aa.js => 25.a3d58084.js} | 0 assets/js/{app.376682a9.js => app.81db0934.js}| 4 ++-- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html| 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html| 4 ++-- blog/index.html | 4 ++-- downloads/index.html | 4 ++-- events/index.html | 4 ++-- index.html| 4 ++-- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html| 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html| 4 ++-- zh/blog/2019-01-03-monitor-microservice.html | 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html| 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- ...2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- ...ng-Agent .html => 2019-08-30-how-to-use-Skywalking-Agent.html} | 8 zh/blog/index.html| 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html | 4 ++-- zh/index.html | 4 ++-- zh/team/index.html| 4 ++-- 31 files changed, 63 insertions(+), 63 deletions(-) rename assets/js/{25.944b52aa.js => 25.a3d58084.js} (100%) rename assets/js/{app.376682a9.js => app.81db0934.js} (81%) rename zh/blog/{2019-08-30-how-to-use-Skywalking-Agent .html => 2019-08-30-how-to-use-Skywalking-Agent.html} (84%)
[skywalking-website] branch asf-site updated (cad0866 -> 96ad22c)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard cad0866 Update asf-site new 96ad22c Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cad0866) \ N -- N -- N refs/heads/asf-site (96ad22c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/{25.a3d58084.js => 25.3e7643a8.js}| 2 +- assets/js/{app.81db0934.js => app.4916cd83.js} | 4 ++-- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 6 +++--- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 4 ++-- 31 files changed, 63 insertions(+), 63 deletions(-) rename assets/js/{25.a3d58084.js => 25.3e7643a8.js} (96%) rename assets/js/{app.81db0934.js => app.4916cd83.js} (81%)
[skywalking] branch service_props updated (6502b81 -> 06362ce)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 6502b81 Merge branch 'master' into service_props add 95ceacf Fix the zookeeper plugin has many nodes in the cluster case (#3372) add 57b345d add logstash logback plugin (#3365) add b3a2c64 Update powered-by.md (#3375) add 54614a0 Support gateway without agent (#3308) add 06362ce Merge branch 'master' into service_props No new revisions were added by this update. Summary of changes: Jenkinsfile| 4 + Jenkinsfile-E2E| 4 +- .../apm-toolkit-logback-1.x/pom.xml| 7 + .../log/logback/v1/x/LogbackPatternConverter.java | 2 +- .../logback/v1/x/logstash/TraceIdJsonProvider.java | 47 ++ .../agent/core/logging/core/PatternLoggerTest.java | 31 +--- .../apm-toolkit-logback-1.x-activation/pom.xml | 14 +- .../TcpSocketAppenderActivation.java} | 32 +++-- .../TcpSocketAppenderInterceptor.java} | 27 ++-- .../src/main/resources/skywalking-plugin.def | 1 + .../plugin/zookeeper/ClientCnxnInterceptor.java| 11 +- docs/en/setup/backend/backend-setup.md | 4 +- docs/en/setup/backend/dynamic-config.md| 1 + docs/en/setup/backend/uninstrumented-gateways.md | 22 +++ .../java-agent/Application-toolkit-logback-1.x.md | 22 +++ .../service-agent/java-agent/Supported-list.md | 2 +- docs/powered-by.md | 1 + .../oap/server/core/register/ServiceInventory.java | 10 +- .../service/IServiceInventoryRegister.java | 12 ++ .../register/service/ServiceInventoryRegister.java | 25 +++- oap-server/server-library/library-client/pom.xml | 2 +- .../trace/provider/TraceModuleProvider.java| 26 +++- .../trace/provider/TraceServiceModuleConfig.java | 1 + .../provider/UninstrumentedGatewaysConfig.java | 159 + .../listener/endpoint/MultiScopesSpanListener.java | 34 +++-- .../service/ServiceMappingSpanListener.java| 50 +-- .../transform/SpringSleuthSegmentBuilderTest.java | 5 +- .../server-starter/src/main/assembly/assembly.xml | 0 .../server-starter/src/main/assembly/gateways.yml | 10 +- pom.xml| 2 + .../skywalking/e2e/cluster/TestController.java | 2 +- test/e2e/e2e-cluster/{provider => gateway}/pom.xml | 14 +- .../apache/skywalking/e2e/GatewayApplication.java} | 9 +- .../gateway/src/main/resources/application.yml | 15 +- test/e2e/e2e-cluster/pom.xml | 1 + test/e2e/e2e-cluster/test-runner/pom.xml | 30 ++-- .../test-runner/src/docker/rc.d/rc0-prepare.sh | 12 +- .../test-runner/src/docker/rc.d/rc1-startup.sh | 35 +++-- .../skywalking/e2e/ClusterVerificationITCase.java | 62 ...ywalking.e2e.ClusterVerificationITCase.topo.yml | 6 + test/e2e/pom.xml | 1 + 41 files changed, 589 insertions(+), 166 deletions(-) create mode 100644 apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java copy apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/{mdc/MDCConverterActivation.java => logstash/TcpSocketAppenderActivation.java} (77%) copy apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/{mdc/PrintMDCTraceIdInterceptor.java => logstash/TcpSocketAppenderInterceptor.java} (78%) mode change 100644 => 100755 docs/en/setup/backend/dynamic-config.md create mode 100755 docs/en/setup/backend/uninstrumented-gateways.md mode change 100644 => 100755 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInventoryRegister.java mode change 100644 => 100755 oap-server/server-library/library-client/pom.xml mode change 100644 => 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java mode change 100644 => 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java create mode 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/UninstrumentedGatewaysConfig.java mode change 100644 => 100755 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywa
[skywalking] branch service_props updated (06362ce -> 6e12a3f)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 06362ce Merge branch 'master' into service_props add b2d8bf1 add props in service. add 6e12a3f add props when in query services. No new revisions were added by this update. Summary of changes: .../skywalking/oap/server/core/query/entity/Service.java | 10 +- .../plugin/elasticsearch/query/MetadataQueryEsDAO.java| 15 +++ .../storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java| 14 ++ 3 files changed, 38 insertions(+), 1 deletion(-)
[skywalking-query-protocol] 01/01: add props in query services.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking-query-protocol.git commit 7f5b9b8923354897fbddb12e0d990a0a3cd2efe3 Author: Jared.Tan AuthorDate: Fri Aug 30 19:30:20 2019 +0800 add props in query services. --- metadata.graphqls | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata.graphqls b/metadata.graphqls index 5da4488..84dac60 100644 --- a/metadata.graphqls +++ b/metadata.graphqls @@ -26,6 +26,7 @@ type ClusterBrief { type Service { id: ID! name: String! +properties: [Attribute!]! } type ServiceInstance {
[skywalking-query-protocol] branch service_props created (now 7f5b9b8)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking-query-protocol.git. at 7f5b9b8 add props in query services. This branch includes the following new commits: new 7f5b9b8 add props in query services. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] branch es_https_ssl updated (fac2000 -> c8847ac)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch es_https_ssl in repository https://gitbox.apache.org/repos/asf/skywalking.git. from fac2000 Merge branch 'master' into es_https_ssl add c8847ac fix No new revisions were added by this update. Summary of changes: .../server/library/client/elasticsearch/ElasticSearchClient.java| 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[skywalking] branch es_https_ssl updated (c8847ac -> e1e0acb)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch es_https_ssl in repository https://gitbox.apache.org/repos/asf/skywalking.git. from c8847ac fix add e1e0acb update docs. No new revisions were added by this update. Summary of changes: docs/en/setup/backend/backend-storage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[skywalking] branch es_https_ssl updated (e1e0acb -> a1bdad7)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch es_https_ssl in repository https://gitbox.apache.org/repos/asf/skywalking.git. from e1e0acb update docs. add a1bdad7 add config in es section. No new revisions were added by this update. Summary of changes: oap-server/server-starter/src/main/assembly/application.yml | 2 ++ 1 file changed, 2 insertions(+)
[skywalking] branch es_https_ssl updated (a1bdad7 -> 516a8b5)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch es_https_ssl in repository https://gitbox.apache.org/repos/asf/skywalking.git. from a1bdad7 add config in es section. add 516a8b5 fix logical. No new revisions were added by this update. Summary of changes: .../library/client/elasticsearch/ElasticSearchClient.java | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-)
[skywalking] branch es_https_ssl updated (516a8b5 -> 515e3b2)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch es_https_ssl in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 516a8b5 fix logical. add 2a2679e Fix Pxx calculate bug. (#3391) add 515e3b2 Merge branch 'master' into es_https_ssl No new revisions were added by this update. Summary of changes: .../server/core/analysis/metrics/PxxMetrics.java | 8 +++- .../core/analysis/metrics/PxxMetricsTest.java | 44 +- 2 files changed, 50 insertions(+), 2 deletions(-)
[skywalking-website] branch asf-site updated (96ad22c -> 4a670b0)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 96ad22c Update asf-site new 4a670b0 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (96ad22c) \ N -- N -- N refs/heads/asf-site (4a670b0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 4 ++-- assets/js/19.3321f022.js| 1 + assets/js/19.37b97d59.js| 1 - assets/js/{20.34628960.js => 20.c3e280bc.js}| 2 +- assets/js/29.13ed7b88.js| 1 - assets/js/29.72d8acb6.js| 1 + assets/js/{30.4219626a.js => 30.903de558.js}| 2 +- assets/js/{app.4916cd83.js => app.98d52825.js} | 4 ++-- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 6 +++--- index.html | 6 +++--- team/index.html | 6 +++--- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 6 +++--- zh/index.html | 6 +++--- zh/team/index.html | 6 +++--- 36 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 assets/js/19.3321f022.js delete mode 100644 assets/js/19.37b97d59.js rename assets/js/{20.34628960.js => 20.c3e280bc.js} (90%) delete mode 100644 assets/js/29.13ed7b88.js create mode 100644 assets/js/29.72d8acb6.js rename assets/js/{30.4219626a.js => 30.903de558.js} (86%) rename assets/js/{app.4916cd83.js => app.98d52825.js} (82%)
[skywalking-website] branch asf-site updated (4a670b0 -> 9b1a9c5)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 4a670b0 Update asf-site new 9b1a9c5 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4a670b0) \ N -- N -- N refs/heads/asf-site (9b1a9c5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 6 +++--- assets/js/18.7c0ecf0f.js | 1 - assets/js/18.ac3685cc.js | 1 + assets/js/19.3321f022.js | 1 - assets/js/19.4ef1243b.js | 1 + assets/js/28.22fffd69.js | 1 + assets/js/28.e4caaf2e.js | 1 - assets/js/29.230bb2b3.js | 1 + assets/js/29.72d8acb6.js | 1 - assets/js/{app.98d52825.js => app.b4509042.js} | 4 ++-- blog/2018-05-24-skywalking-net.html | 8 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 8 ++-- blog/2019-01-01-Understand-Trace.html| 8 ++-- blog/2019-01-25-mesh-loadtest.html | 8 ++-- blog/index.html | 8 ++-- downloads/index.html | 10 +++--- events/index.html| 12 index.html | 10 +++--- team/index.html | 8 ++-- zh/blog/2018-05-24-skywalking-net.html | 8 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 8 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html | 8 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 8 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html| 8 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 8 ++-- zh/blog/2019-01-03-monitor-microservice.html | 8 ++-- zh/blog/2019-01-21-agent-plugin-practice.html| 8 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 8 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 8 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 8 ++-- ...03-29-introduction-of-skywalking-and-simple-practice.html | 8 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 8 ++-- zh/blog/index.html | 8 ++-- zh/doc/index.html| 8 ++-- zh/downloads/index.html | 10 +++--- zh/events/index.html | 12 zh/index.html| 10 +++--- zh/team/index.html | 8 ++-- 38 files changed, 185 insertions(+), 73 deletions(-) delete mode 100644 assets/js/18.7c0ecf0f.js create mode 100644 assets/js/18.ac3685cc.js delete mode 100644 assets/js/19.3321f022.js create mode 100644 assets/js/19.4ef1243b.js create mode 100644 assets/js/28.22fffd69.js delete mode 100644 assets/js/28.e4caaf2e.js create mode 100644 assets/js/29.230bb2b3.js delete mode 100644 assets/js/29.72d8acb6.js rename assets/js/{app.98d52825.js => app.b4509042.js} (81%)
[skywalking] branch service_props updated (6e12a3f -> e08ae83)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 6e12a3f add props when in query services. add 77736c5 okhttp OnFailureInterceptor should log exception info (#3381) add 6fd85c8 Avoid unnecessary resetting when service mapping id is already 0 (#3383) add 3d8d284 sync ui (#3387) add 70b825c fix typo (#3388) add 63b033d Add istio bypass adaptor setup document back (#3376) add 53a1ae8 docs: Improve envoy metrics sending setup documentation (#3389) add 2a2679e Fix Pxx calculate bug. (#3391) add dbbf22a support es https ssl config. (#3370) add 7f5ac23 fix bug (#3393) add c0bb891 UI sync (#3399) add b0d3598 Add changelog for 6.4.0 release. (#3398) add 05d9c0a MOD: Modify compatibility of kafka plugin and expand operationName (#3390) add 36a3601 #106 cache/persist page query states (#3406) add dc37803 add vue-js-modal license. (#3415) add d6a8461 UI Sync #3396 can the page of span info be expanded manually (#3418) add 44556ae gateway & webflux compatible with these scene (#3419) add a690f67 add gateway.yml to avoid unnecessary errors (#3426) add 55d3fa5 add ui lodash depend license (#3433) add a6cbf37 Sync UI. (#3438) add ce20fe1 Move to 6.5.0 (#3439) add 721f864 Add TTL E2E test (#3437) add e1ce6ed Fill my FAQ reply in official document. (#3450) add 96b2baa spring-cloud-gateway traceid does not transmit #3411 (#3446) add b5b088a Gateway compatible with downstream loss (#3445) add db67b87 Update docker-entrypoint.sh (#3465) add 919988f sync ui (#3468) add bb0b3d3 provide cassandra java driver 3.x plugin (#3410) add 876b60c Update ALS setup doc as istio 1.3 released (#3470) add e08ae83 Merge branch 'master' into service_props No new revisions were added by this update. Summary of changes: .gitmodules| 3 + CHANGES.md | 58 + Jenkinsfile-E2E| 11 +- .../apm-toolkit-log4j-1.x/pom.xml | 2 +- .../apm-toolkit-log4j-2.x/pom.xml | 2 +- .../apm-toolkit-logback-1.x/pom.xml| 2 +- .../apm-toolkit-opentracing/pom.xml| 2 +- apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +- apm-application-toolkit/pom.xml| 2 +- apm-commons/apm-datacarrier/pom.xml| 2 +- apm-commons/apm-util/pom.xml | 2 +- apm-commons/pom.xml| 2 +- apm-dist/pom.xml | 2 +- apm-dist/release-docs/LICENSE | 2 + .../licenses/ui-licenses/LICENSE-lodash| 31 ++- ...E-vue-datepicker-local => LICENSE-vue-js-modal} | 4 +- apm-protocol/apm-network/pom.xml | 2 +- .../network/trace/component/ComponentsDefine.java | 2 + apm-protocol/pom.xml | 2 +- apm-sniffer/apm-agent-core/pom.xml | 2 +- .../agent/core/context/ids/DistributedTraceId.java | 2 +- .../apm/agent/core/context/trace/ExitSpan.java | 2 +- apm-sniffer/apm-agent/pom.xml | 2 +- .../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/canal-1.x-plugin/pom.xml| 2 +- .../cassandra-java-driver-3.x-plugin}/pom.xml | 28 +- .../java/driver/v3/ClusterConnectInterceptor.java} | 29 ++- ...onstructorWithStateListenerArgInterceptor.java} | 34 +-- .../cassandra/java/driver/v3/ConnectionInfo.java | 29 +-- .../cassandra/java/driver/v3}/Constants.java | 8 +- ...ultSetFutureGetUninterruptiblyInterceptor.java} | 35 ++- ...AndExecuteAsyncWithStatementArgInterceptor.java | 84 ++ .../driver/v3/define/ClusterInstrumentation.java} | 33 ++- .../DefaultResultSetFutureInstrumentation.java}| 29 +-- .../v3/define/SessionManagerInstrumentation.java} | 33 ++- .../src/main/resources/skywalking-plugin.def | 40 ++- .../driver/v3/ClusterConnectInterceptorTest.java} | 67 +++-- ...ructorWithStateListenerArgInterceptorTest.java} | 71 +++--- ...etFutureGetUninterruptiblyInterceptorTest.java} | 48 ++-- ...ecuteAsyncWithStatementArgInterceptorTest.java} | 47 ++-- .../dubbo-2.7.x-conflict-patch/pom.xml | 2 +- .../apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/dubbo-conflict-patch/pom.xml| 2 +- apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml| 2 +- .../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +- .../elasticsearch-5.x-plugin/pom.xml | 2 +- .../feign-default-http-9.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.
[skywalking] branch service_props updated (e08ae83 -> a946453)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from e08ae83 Merge branch 'master' into service_props add 5e4a2f9 move custom properties in service instance. add a946453 revert properties in service. No new revisions were added by this update. Summary of changes: .../core/remote/ServiceAndEndpointRegisterClient.java | 4 ++-- .../skywalking/oap/server/core/query/entity/Service.java | 7 --- .../core/register/service/ServiceInventoryRegister.java | 1 - .../provider/handler/v6/grpc/RegisterServiceHandler.java | 8 +++- .../plugin/elasticsearch/query/MetadataQueryEsDAO.java| 15 --- .../storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java| 14 -- 6 files changed, 5 insertions(+), 44 deletions(-)
[skywalking] branch service_props updated (a946453 -> 2993c99)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from a946453 revert properties in service. add 2993c99 update query. No new revisions were added by this update. Summary of changes: .../elasticsearch/query/MetadataQueryEsDAO.java| 43 - .../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 44 +- 2 files changed, 51 insertions(+), 36 deletions(-)
[skywalking-query-protocol] branch service_props deleted (was 7f5b9b8)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking-query-protocol.git. was 7f5b9b8 add props in query services. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking] branch service_props updated (2993c99 -> ab86725)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 2993c99 update query. add ab86725 update. No new revisions were added by this update. Summary of changes: .../org/apache/skywalking/apm/agent/core/conf/Config.java | 14 +++--- .../core/remote/ServiceAndEndpointRegisterClient.java | 4 ++-- docs/en/setup/service-agent/java-agent/README.md | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)
[skywalking] branch service_props updated (ab86725 -> d3e761f)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from ab86725 update. add c5b03ba fix noSuchMethod (#3408) add d3e761f Merge branch 'master' into service_props No new revisions were added by this update. Summary of changes: ...rollerForLowVersionConstructorInterceptor.java} | 20 +++- .../v4/define/AbstractSpring4Instrumentation.java | 2 +- .../ControllerForLowVersionInstrumentation.java| 57 ++ ...RestControllerForLowVersionInstrumentation.java | 57 ++ .../v4/define/RestControllerInstrumentation.java | 12 - .../src/main/resources/skywalking-plugin.def | 2 + 6 files changed, 133 insertions(+), 17 deletions(-) copy apm-sniffer/apm-sdk-plugin/spring-plugins/{mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptor.java => mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerForLowVersionConstructorInterceptor.java} (74%) create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerForLowVersionInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerForLowVersionInstrumentation.java
[skywalking] branch service_props updated (d3e761f -> 2e0c22d)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from d3e761f Merge branch 'master' into service_props add 2e0c22d update name. No new revisions were added by this update. Summary of changes: .../apm/agent/core/remote/ServiceAndEndpointRegisterClient.java | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[skywalking] branch service_props updated (2e0c22d -> 525450a)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 2e0c22d update name. add 06c357d Make sure the cluster register happens before streaming process. (#3471) add 525450a Merge branch 'master' into service_props No new revisions were added by this update. Summary of changes: .../oap/server/core/CoreModuleProvider.java| 11 + .../server/core/remote/RemoteSenderService.java| 27 +- 2 files changed, 27 insertions(+), 11 deletions(-)
[skywalking] branch service_props updated (525450a -> 7ea14fb)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch service_props in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 525450a Merge branch 'master' into service_props add 7ea14fb fix minor bug. No new revisions were added by this update. Summary of changes: .../server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java | 2 -- .../oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 2 -- 2 files changed, 4 deletions(-)
[skywalking-website] branch asf-site updated (9b1a9c5 -> 228f5e8)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 9b1a9c5 Update asf-site new 228f5e8 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9b1a9c5) \ N -- N -- N refs/heads/asf-site (228f5e8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 4 ++-- assets/js/{12.76195201.js => 12.daab5ca7.js}| 2 +- assets/js/{13.cc46204f.js => 13.20b07320.js}| 2 +- assets/js/{14.70184e4e.js => 14.b85b8681.js}| 2 +- assets/js/{15.0162e800.js => 15.1eb59b55.js}| 2 +- assets/js/{16.42650be2.js => 16.30ee8c9a.js}| 2 +- assets/js/{2.26583e1b.js => 2.b897b1bf.js} | 2 +- assets/js/{22.96410f4f.js => 22.830cccd2.js}| 2 +- assets/js/{23.f16703ec.js => 23.7112a26a.js}| 2 +- assets/js/{24.53f96014.js => 24.719bc8b1.js}| 2 +- assets/js/{25.3e7643a8.js => 25.04412272.js}| 2 +- assets/js/26.881f32bd.js| 1 + assets/js/{26.938ce26c.js => 27.d938501b.js}| 2 +- assets/js/{27.6aeb6514.js => 28.121429ef.js}| 2 +- assets/js/{28.22fffd69.js => 29.81008f01.js}| 2 +- assets/js/{3.af40e799.js => 3.74c3485f.js} | 2 +- assets/js/{29.230bb2b3.js => 30.196e7821.js}| 2 +- assets/js/{30.903de558.js => 31.633d5eb8.js}| 2 +- assets/js/31.896f085b.js| 1 - assets/js/32.452823ac.js| 1 + assets/js/{4.93475a83.js => 4.8be470d0.js} | 2 +- assets/js/{5.65019970.js => 5.5651196d.js} | 2 +- assets/js/{6.b20af817.js => 6.3b8ee20b.js} | 2 +- assets/js/{7.9ba49151.js => 7.5fd6fdca.js} | 2 +- assets/js/{8.7de527ab.js => 8.86e42949.js} | 2 +- assets/js/{9.97abfdf5.js => 9.2c5c4349.js} | 2 +- assets/js/{app.b4509042.js => app.60107747.js} | 6 +++--- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- .../2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- ...-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- ...9-12-apache-skyWalking-committer-apply-process.html} | 17 ++--- zh/blog/index.html | 6 +++--- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html
[skywalking-website] branch asf-site updated (228f5e8 -> e469a2b)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 228f5e8 Update asf-site new e469a2b Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (228f5e8) \ N -- N -- N refs/heads/asf-site (e469a2b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 4 ++-- assets/js/20.3b470167.js| 1 + assets/js/20.c3e280bc.js| 1 - assets/js/{app.60107747.js => app.8c02c4bb.js} | 4 ++-- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 6 +++--- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/2019-09-12-apache-skyWalking-committer-apply-process.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 4 ++-- 33 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 assets/js/20.3b470167.js delete mode 100644 assets/js/20.c3e280bc.js rename assets/js/{app.60107747.js => app.8c02c4bb.js} (80%)
[skywalking-website] branch asf-site updated (e469a2b -> 9a7c44d)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard e469a2b Update asf-site new 9a7c44d Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e469a2b) \ N -- N -- N refs/heads/asf-site (9a7c44d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 6 ++--- assets/img/skywalking-UI-alarm.323e5def.png| Bin 0 -> 81496 bytes assets/img/skywalking-dingding-notify.4a7352d6.png | Bin 0 -> 91821 bytes assets/js/{10.2df374d4.js => 10.0b01acff.js} | 2 +- assets/js/{11.2f5307d8.js => 11.2dc6ed02.js} | 2 +- assets/js/12.dbdf244d.js | 1 + assets/js/{12.daab5ca7.js => 13.dc0fcc0a.js} | 2 +- assets/js/{13.20b07320.js => 14.1e939d09.js} | 2 +- assets/js/{14.b85b8681.js => 15.bf483af8.js} | 2 +- assets/js/{15.1eb59b55.js => 16.01ecd43d.js} | 2 +- assets/js/{16.30ee8c9a.js => 17.ba9778f7.js} | 2 +- assets/js/{17.323b87a6.js => 18.a215c396.js} | 2 +- assets/js/{18.ac3685cc.js => 19.0fb3bb2f.js} | 2 +- assets/js/{2.b897b1bf.js => 2.0abee3ea.js} | 2 +- assets/js/{19.4ef1243b.js => 20.e38bbd03.js} | 2 +- assets/js/{20.3b470167.js => 21.cbe426a5.js} | 2 +- assets/js/{21.d92a7982.js => 22.5a769505.js} | 2 +- assets/js/{22.830cccd2.js => 23.cec2bac8.js} | 2 +- assets/js/{23.7112a26a.js => 24.e1813168.js} | 2 +- assets/js/{24.719bc8b1.js => 25.8e05c31a.js} | 2 +- assets/js/{25.04412272.js => 26.bad11833.js} | 2 +- assets/js/{26.881f32bd.js => 27.4ef5d0eb.js} | 2 +- assets/js/{27.d938501b.js => 28.f0de9c07.js} | 2 +- assets/js/{28.121429ef.js => 29.48787a2f.js} | 2 +- assets/js/{3.74c3485f.js => 3.708a2093.js} | 2 +- assets/js/{29.81008f01.js => 30.a2e839f3.js} | 2 +- assets/js/{30.196e7821.js => 31.be88da50.js} | 2 +- assets/js/32.452823ac.js | 1 - assets/js/{31.633d5eb8.js => 32.82a69b27.js} | 2 +- assets/js/33.c777da6f.js | 1 + assets/js/{4.8be470d0.js => 4.a479bac6.js} | 2 +- assets/js/{5.5651196d.js => 5.6418fc9f.js} | 2 +- assets/js/{6.3b8ee20b.js => 6.83d2b7c8.js} | 2 +- assets/js/{7.5fd6fdca.js => 7.608e39d7.js} | 2 +- assets/js/{8.86e42949.js => 8.c3bad01a.js} | 2 +- assets/js/{9.2c5c4349.js => 9.d4015d52.js} | 2 +- assets/js/{app.8c02c4bb.js => app.53b64279.js} | 4 ++-- blog/2018-05-24-skywalking-net.html| 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- ...et.html => 2019-09-25-alarm-webhook-share.html} | 26 - blog/index.html| 6 ++--- downloads/index.html | 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- .../skywalking-UI-alarm.png| Bin 0 -> 81496 bytes .../skywalking-dingding-notify.png | Bin 0 -> 91821 bytes team/index.html| 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- ...2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- ...018-12-21-SkyWalking-apm-sniffer-beginning.html | 4 ++-- .../2018-12-21-SkyWalking-source-code-read.html| 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- .../2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html | 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html|
[skywalking-website] branch asf-site updated (9a7c44d -> 5b0a060)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 9a7c44d Update asf-site new 5b0a060 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9a7c44d) \ N -- N -- N refs/heads/asf-site (5b0a060) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 4 +-- assets/js/{10.0b01acff.js => 10.9cfa209a.js} | 2 +- assets/js/{12.dbdf244d.js => 12.ddea7324.js} | 2 +- assets/js/{13.dc0fcc0a.js => 13.92bcb689.js} | 2 +- assets/js/{14.1e939d09.js => 14.7c4021c3.js} | 2 +- assets/js/{15.bf483af8.js => 15.8e544ce7.js} | 2 +- assets/js/{16.01ecd43d.js => 16.d2cc69cb.js} | 2 +- assets/js/{17.ba9778f7.js => 17.8a8b59b1.js} | 2 +- assets/js/{18.a215c396.js => 18.b4a75423.js} | 2 +- assets/js/{19.0fb3bb2f.js => 19.5e409ee0.js} | 2 +- assets/js/{2.0abee3ea.js => 2.fdde4b34.js} | 2 +- assets/js/{20.e38bbd03.js => 20.7a2f5814.js} | 2 +- assets/js/{21.cbe426a5.js => 21.e5315210.js} | 2 +- assets/js/{22.5a769505.js => 22.4c4f3a16.js} | 2 +- assets/js/{23.cec2bac8.js => 23.bc4e663b.js} | 2 +- assets/js/{24.e1813168.js => 24.d122c5da.js} | 2 +- assets/js/{25.8e05c31a.js => 25.84640f07.js} | 2 +- assets/js/{26.bad11833.js => 26.b1354649.js} | 2 +- assets/js/{27.4ef5d0eb.js => 27.d2a2e26c.js} | 2 +- assets/js/28.9ccab755.js | 1 + assets/js/{28.f0de9c07.js => 29.f0c6237d.js} | 2 +- assets/js/{3.708a2093.js => 3.03f1e1c3.js} | 2 +- assets/js/{29.48787a2f.js => 30.6731b6af.js} | 2 +- assets/js/{30.a2e839f3.js => 31.d5a21496.js} | 2 +- assets/js/{31.be88da50.js => 32.b67a7b6c.js} | 2 +- assets/js/{32.82a69b27.js => 33.88c0fc58.js} | 2 +- assets/js/33.c777da6f.js | 1 - assets/js/34.eda87250.js | 1 + assets/js/{4.a479bac6.js => 4.1ec9fd89.js} | 2 +- assets/js/{5.6418fc9f.js => 5.c4e5d699.js} | 2 +- assets/js/{6.83d2b7c8.js => 6.d47b66f5.js} | 2 +- assets/js/{7.608e39d7.js => 7.5c99d199.js} | 2 +- assets/js/{8.c3bad01a.js => 8.a6c148af.js} | 2 +- assets/js/{9.d4015d52.js => 9.47e59f1d.js} | 2 +- assets/js/{app.53b64279.js => app.820933bd.js} | 6 ++-- blog/2018-05-24-skywalking-net.html| 4 +-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 +-- blog/2019-01-01-Understand-Trace.html | 4 +-- blog/2019-01-25-mesh-loadtest.html | 4 +-- blog/2019-09-25-alarm-webhook-share.html | 4 +-- blog/index.html| 4 +-- downloads/index.html | 4 +-- events/index.html | 4 +-- index.html | 4 +-- team/index.html| 4 +-- zh/blog/2018-05-24-skywalking-net.html | 4 +-- ...2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 +-- ...018-12-21-SkyWalking-apm-sniffer-beginning.html | 4 +-- .../2018-12-21-SkyWalking-source-code-read.html| 4 +-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 +-- .../2019-01-02-skywalking-elasticsearch-basic.html | 4 +-- zh/blog/2019-01-03-monitor-microservice.html | 4 +-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 +-- zh/blog/2019-01-24-skywalking-remote-debug.html| 4 +-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 +-- zh/blog/2019-03-01-skywalking-troubleshoot.html| 4 +-- ...oduction-of-skywalking-and-simple-practice.html | 4 +-- .../2019-08-30-how-to-use-Skywalking-Agent.html| 4 +-- ...-apache-skyWalking-committer-apply-process.html | 4 +-- ...ss.html => 2019-10-08-how-to-use-sw-chart.html} | 35 +- zh/blog/in
[skywalking] branch code_cleanup created (now 1b3976c)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch code_cleanup in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 1b3976c code cleanup: remove unnecessary and optimize the function's parameters. This branch includes the following new commits: new 1b3976c code cleanup: remove unnecessary and optimize the function's parameters. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: code cleanup: remove unnecessary and optimize the function's parameters.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch code_cleanup in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 1b3976c9190169c12f89f5d1ce12f7089dd85a1d Author: Jared.Tan AuthorDate: Tue Oct 8 21:00:13 2019 +0800 code cleanup: remove unnecessary and optimize the function's parameters. --- .../server/core/query/AggregationQueryService.java | 10 +- .../oap/server/core/query/TopologyQueryService.java | 3 +-- .../oap/server/core/query/TraceQueryService.java | 20 ++-- .../oap/query/graphql/resolver/TopologyQuery.java| 7 ++- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java index d35d18a..271926c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java @@ -54,7 +54,7 @@ public class AggregationQueryService implements Service { final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getServiceTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { -ServiceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class).get(Integer.valueOf(entity.getId())); +ServiceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -66,7 +66,7 @@ public class AggregationQueryService implements Service { final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getAllServiceInstanceTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { -ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.valueOf(entity.getId())); +ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -78,7 +78,7 @@ public class AggregationQueryService implements Service { final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getServiceInstanceTopN(serviceId, indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { -ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.valueOf(entity.getId())); +ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -90,7 +90,7 @@ public class AggregationQueryService implements Service { final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getAllEndpointTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { -EndpointInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class).get(Integer.valueOf(entity.getId())); +EndpointInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class).get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -102,7 +102,7 @@ public class AggregationQueryService implements Service { final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getEndpointTopN(serviceId, indName, ValueColumnIds.INSTANCE.getValueCName(indName),
[skywalking] branch code_cleanup updated (1b3976c -> 7986822)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch code_cleanup in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 1b3976c code cleanup: remove unnecessary and optimize the function's parameters. add 7986822 fix code style. No new revisions were added by this update. Summary of changes: .../org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java | 1 - 1 file changed, 1 deletion(-)
[skywalking] branch code_cleanup updated (7986822 -> 0d6d599)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch code_cleanup in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 7986822 fix code style. add 0114391 test/plugin autotest (#3528) add 0d6d599 Merge branch 'master' into code_cleanup No new revisions were added by this update. Summary of changes: Jenkinsfile-Agent-Test | 70 +++ .../containers/jvm-container/docker/Dockerfile | 24 + .../jvm-container/docker/docker-entrypoint.sh | 28 + test/plugin/containers/jvm-container/pom.xml | 38 ++ test/plugin/containers/pom.xml | 65 +++ .../containers/tomcat-container/docker/Dockerfile | 31 + .../containers/tomcat-container/docker/catalina.sh | 627 + .../containers/tomcat-container/docker/run.sh | 88 +++ test/plugin/containers/tomcat-container/pom.xml| 40 ++ .../plugin/mock-collector/bin/collector-startup.sh | 35 ++ test/plugin/mock-collector/docker/Dockerfile | 30 + .../plugin/mock-collector/docker/config.properties | 18 + .../mock-collector/docker/docker-entrypoint.sh | 25 + test/plugin/mock-collector/pom.xml | 202 +++ .../mock-collector/src/main/assembly/assembly.xml | 57 ++ .../skywalking/plugin/test/mockcollector/Main.java | 56 ++ .../test/mockcollector/entity/RegistryItem.java| 154 + .../entity/RegistryItemSerializer.java | 64 +++ .../plugin/test/mockcollector/entity/Segment.java | 50 ++ .../test/mockcollector/entity/SegmentItem.java | 42 ++ .../test/mockcollector/entity/SegmentItems.java| 43 ++ .../entity/SegmentItemsSerializer.java | 46 ++ .../plugin/test/mockcollector/entity/Span.java | 192 +++ .../test/mockcollector/entity/ValidateData.java| 42 ++ .../entity/ValidateDataSerializer.java | 41 ++ .../service/ClearReceiveDataService.java | 46 ++ .../service/GrpcAddressHttpService.java| 50 ++ .../service/MockApplicationRegisterService.java| 60 ++ .../service/MockCLRMetricReportService.java| 27 + .../service/MockInstanceDiscoveryService.java | 45 ++ .../service/MockInstancePingService.java | 34 ++ .../service/MockJVMMetricReportService.java| 27 + .../service/MockJVMMetricsService.java | 33 ++ .../service/MockJVMMetricsV1Service.java | 34 ++ .../service/MockNetworkAddressRegisterService.java | 33 ++ .../mockcollector/service/MockRegisterService.java | 99 .../service/MockServiceNameDiscoveryService.java | 39 ++ .../service/MockTraceSegmentService.java | 84 +++ .../service/MockTraceSegmentV1Service.java | 81 +++ .../mockcollector/service/ReceiveDataService.java | 52 ++ .../test/mockcollector/service/Sequences.java | 29 + .../test/mockcollector/util/ConfigReader.java | 43 ++ .../plugin/mock-collector/src/main/proto/README.md | 5 + .../mock-collector/src/main/proto/common/CLR.proto | 46 ++ .../mock-collector/src/main/proto/common/JVM.proto | 69 +++ .../src/main/proto/common/common.proto | 55 ++ .../src/main/proto/common/trace-common.proto | 52 ++ .../main/proto/language-agent-v2/CLRMetric.proto | 36 ++ .../main/proto/language-agent-v2/JVMMetric.proto | 36 ++ .../src/main/proto/language-agent-v2/trace.proto | 77 +++ .../ApplicationRegisterService.proto | 39 ++ .../proto/language-agent/DiscoveryService.proto| 91 +++ .../src/main/proto/language-agent/Downstream.proto | 27 + .../proto/language-agent/JVMMetricsService.proto | 36 ++ .../proto/language-agent/KeyWithIntegerValue.proto | 28 + .../proto/language-agent/KeyWithStringValue.proto | 28 + .../NetworkAddressRegisterService.proto| 38 ++ .../proto/language-agent/TraceSegmentService.proto | 78 +++ .../src/main/proto/register/InstancePing.proto | 36 ++ .../src/main/proto/register/Register.proto | 124 .../istio/skywalking.config.pb.html| 39 ++ .../proto/service-mesh-probe/service-mesh.proto| 56 ++ .../src/main/resources/config.properties | 17 + .../src/main/resources/expect-data.yaml| 78 +++ .../mock-collector/src/main/resources/log4j2.xml | 30 + .../src/main/resources/sample-data.yaml| 68 +++ test/plugin/pom.xml| 117 test/plugin/run.sh | 167 ++ test/plugin/runner/pom.xml | 89 +++ .../test/helper/AbstractRunningGenerator.java | 68 +++ .../plugin/test/helper/ConfigurationImpl.java | 118 .../test/helper/DockerComposeRunningGenerator.java | 113 .../helper/DockerComposeV2RunningGenerator.java| 108 .../helper/DockerContainerRunningGenerator.java| 62 ++ .../plugin/test/helper/IConfigur
[skywalking] branch code_cleanup deleted (was 0d6d599)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch code_cleanup in repository https://gitbox.apache.org/repos/asf/skywalking.git. was 0d6d599 Merge branch 'master' into code_cleanup The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking] branch JaredTan95-patch-1 created (now 1772339)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch JaredTan95-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 1772339 add faq with es. This branch includes the following new commits: new 1772339 add faq with es. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: add faq with es.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch JaredTan95-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 1772339ac3604c0df8b7d7a80c1082cdca7a5b60 Author: Jared Tan AuthorDate: Fri Oct 11 15:50:36 2019 +0800 add faq with es. --- docs/en/FAQ/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/FAQ/README.md b/docs/en/FAQ/README.md index a469c55..7c1e0f2 100644 --- a/docs/en/FAQ/README.md +++ b/docs/en/FAQ/README.md @@ -16,3 +16,4 @@ These are known and common FAQs. We welcome you to contribute yours. * [EnhanceRequireObjectCache class cast exception](EnhanceRequireObjectCache-Cast-Exception.md) * [ElasticSearch server performance FAQ, including ERROR CODE:429](ES-Server-FAQ.md) * [IllegalStateException when install Java agent on WebSphere 7](install_agent_on_websphere.md) +* ["FORBIDDEN/12/index read-only / allow delete (api)]" appears in the log](https://discuss.elastic.co/t/forbidden-12-index-read-only-allow-delete-api/110282)
[skywalking] branch JaredTan95-patch-1 updated (1772339 -> 69bfd44)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch JaredTan95-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 1772339 add faq with es. add 69bfd44 Update README.md No new revisions were added by this update. Summary of changes: docs/en/FAQ/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking] branch master updated: Optimize code (#3600)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 1b1e80b Optimize code (#3600) 1b1e80b is described below commit 1b1e80b75ab4e33150663286a1212a29a92158d9 Author: echooymxq AuthorDate: Fri Oct 11 19:17:03 2019 +0800 Optimize code (#3600) --- .../org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java | 2 +- .../apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java| 2 +- .../main/java/org/apache/skywalking/oap/server/core/RunningMode.java | 4 ++-- .../oap/server/core/analysis/data/LimitedSizeDataCollection.java | 2 +- .../skywalking/oap/server/core/analysis/data/MergeDataCollection.java | 2 +- .../oap/server/core/analysis/data/NonMergeDataCollection.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java index a0ccf84..58d6b9c 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java @@ -57,7 +57,7 @@ public class AgentIDDecorator implements ChannelDecorator { Attributes mainAttribs = manifest.getMainAttributes(); String projectName = mainAttribs.getValue("Implementation-Vendor-Id"); if (projectName != null) { -if (projectName.equals("org.apache.skywalking")) { +if ("org.apache.skywalking".equals(projectName)) { version = mainAttribs.getValue("Implementation-Version"); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java index f70367f..d25ca04 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java @@ -44,7 +44,7 @@ public class GetPropertyDescriptorsInterceptor implements InstanceMethodsAroundI if (EnhancedInstance.class.isAssignableFrom(((BeanWrapperImpl)objInst).getRootClass())) { List newPropertyDescriptors = new ArrayList(); for (PropertyDescriptor descriptor : propertyDescriptors) { -if (!descriptor.getName().equals("skyWalkingDynamicField")) { +if (!"skyWalkingDynamicField".equals(descriptor.getName())) { newPropertyDescriptors.add(descriptor); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java index 5c52745..8a282dc 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java @@ -43,7 +43,7 @@ public class RunningMode { * @return true if in this status */ public static boolean isInitMode() { -return MODE.equals("init"); +return "init".equals(MODE); } /** @@ -51,6 +51,6 @@ public class RunningMode { * @return true if in this status. */ public static boolean isNoInitMode() { -return MODE.equals("no-init"); +return "no-init".equals(MODE); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java index 12cd96c..69d9e8e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java @@ -35,7 +35,7 @@ public class LimitedSizeDataCollection implements SWCo this.reading = false; } -public void finishWriting() { +@Overr
[skywalking-website] branch asf-site updated (5b0a060 -> 05f489c)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 5b0a060 Update asf-site new 05f489c Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5b0a060) \ N -- N -- N refs/heads/asf-site (05f489c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 4 ++-- assets/js/{21.e5315210.js => 21.0cea5b10.js}| 2 +- assets/js/{33.88c0fc58.js => 33.7b4b71c6.js}| 2 +- assets/js/{app.820933bd.js => app.95285aa3.js} | 4 ++-- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/2019-09-25-alarm-webhook-share.html| 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 6 +++--- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/2019-09-12-apache-skyWalking-committer-apply-process.html | 4 ++-- zh/blog/2019-10-08-how-to-use-sw-chart.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 6 +++--- 35 files changed, 70 insertions(+), 70 deletions(-) rename assets/js/{21.e5315210.js => 21.0cea5b10.js} (86%) rename assets/js/{33.88c0fc58.js => 33.7b4b71c6.js} (83%) rename assets/js/{app.820933bd.js => app.95285aa3.js} (80%)
[skywalking-website] branch asf-site updated (05f489c -> f65ca65)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 05f489c Update asf-site new f65ca65 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (05f489c) \ N -- N -- N refs/heads/asf-site (f65ca65) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/{app.95285aa3.js => app.d6a1d13e.js} | 2 +- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/2019-09-25-alarm-webhook-share.html| 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/2019-09-12-apache-skyWalking-committer-apply-process.html | 4 ++-- zh/blog/2019-10-08-how-to-use-sw-chart.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) rename assets/js/{app.95285aa3.js => app.d6a1d13e.js} (81%)
[skywalking-website] branch asf-site updated (f65ca65 -> 2af76bb)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard f65ca65 Update asf-site new 2af76bb Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f65ca65) \ N -- N -- N refs/heads/asf-site (2af76bb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 4 ++-- assets/js/{app.d6a1d13e.js => app.87f04a63.js}| 2 +- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html| 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html| 4 ++-- blog/2019-09-25-alarm-webhook-share.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html | 4 ++-- events/index.html | 4 ++-- index.html| 4 ++-- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html| 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html| 4 ++-- zh/blog/2019-01-03-monitor-microservice.html | 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html| 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html| 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/2019-09-12-apache-skyWalking-committer-apply-process.html | 4 ++-- zh/blog/2019-10-08-how-to-use-sw-chart.html | 4 ++-- zh/blog/index.html| 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html | 4 ++-- zh/index.html | 4 ++-- zh/team/index.html| 4 ++-- 33 files changed, 65 insertions(+), 65 deletions(-) rename assets/js/{app.d6a1d13e.js => app.87f04a63.js} (90%)
[skywalking-website] branch asf-site updated (2af76bb -> c08f9bf)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 2af76bb Update asf-site new c08f9bf Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2af76bb) \ N -- N -- N refs/heads/asf-site (c08f9bf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/{app.87f04a63.js => app.723bbe87.js} | 2 +- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/2019-09-25-alarm-webhook-share.html| 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/2019-09-12-apache-skyWalking-committer-apply-process.html | 4 ++-- zh/blog/2019-10-08-how-to-use-sw-chart.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) rename assets/js/{app.87f04a63.js => app.723bbe87.js} (80%)
[skywalking-website] branch asf-site updated (c08f9bf -> 1aeb59e)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard c08f9bf Update asf-site new 1aeb59e Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c08f9bf) \ N -- N -- N refs/heads/asf-site (1aeb59e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/{app.723bbe87.js => app.498c9acd.js} | 2 +- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/2019-09-25-alarm-webhook-share.html| 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/2019-09-12-apache-skyWalking-committer-apply-process.html | 4 ++-- zh/blog/2019-10-08-how-to-use-sw-chart.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) rename assets/js/{app.723bbe87.js => app.498c9acd.js} (94%)
[skywalking-website] branch asf-site updated (1aeb59e -> 9f8e3db)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 1aeb59e Update asf-site new 9f8e3db Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1aeb59e) \ N -- N -- N refs/heads/asf-site (9f8e3db) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/{app.498c9acd.js => app.093c1cce.js} | 2 +- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/2019-09-25-alarm-webhook-share.html| 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/2019-09-12-apache-skyWalking-committer-apply-process.html | 4 ++-- zh/blog/2019-10-08-how-to-use-sw-chart.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) rename assets/js/{app.498c9acd.js => app.093c1cce.js} (80%)
[skywalking-website] branch asf-site updated (9f8e3db -> aa9b9d4)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 9f8e3db Update asf-site new aa9b9d4 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9f8e3db) \ N -- N -- N refs/heads/asf-site (aa9b9d4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/20.7a2f5814.js| 1 - assets/js/20.bae1dccc.js| 1 + assets/js/{21.0cea5b10.js => 21.3b9135d9.js}| 2 +- assets/js/32.a2646e59.js| 1 + assets/js/32.b67a7b6c.js| 1 - assets/js/{33.7b4b71c6.js => 33.4e6ea0ed.js}| 2 +- assets/js/{app.093c1cce.js => app.75075b89.js} | 6 +++--- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/2019-09-25-alarm-webhook-share.html| 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 6 +++--- index.html | 6 +++--- team/index.html | 6 +++--- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/2019-08-30-how-to-use-Skywalking-Agent.html | 4 ++-- zh/blog/2019-09-12-apache-skyWalking-committer-apply-process.html | 4 ++-- zh/blog/2019-10-08-how-to-use-sw-chart.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 6 +++--- zh/index.html | 6 +++--- zh/team/index.html | 6 +++--- 39 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 assets/js/20.7a2f5814.js create mode 100644 assets/js/20.bae1dccc.js rename assets/js/{21.0cea5b10.js => 21.3b9135d9.js} (85%) create mode 100644 assets/js/32.a2646e59.js delete mode 100644 assets/js/32.b67a7b6c.js rename assets/js/{33.7b4b71c6.js => 33.4e6ea0ed.js} (78%) rename assets/js/{app.093c1cce.js => app.75075b89.js} (77%)
[skywalking] 01/01: Makes the scope of alarm information more semantic.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git commit f2b42440a7d99baadaee5c98fd0c0b5b750fc430 Author: Jared.Tan AuthorDate: Tue Oct 22 12:51:56 2019 +0800 Makes the scope of alarm information more semantic. --- docs/en/setup/backend/backend-alarm.md| 6 -- .../skywalking/oap/server/core/alarm/provider/RunningRule.java| 1 + .../oap/server/core/alarm/provider/AlarmMessageFormatterTest.java | 8 .../oap/server/core/alarm/provider/RunningRuleTest.java | 4 .../org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java | 1 + .../skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java | 4 .../org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java | 3 +++ .../oap/server/core/alarm/ServiceInstanceMetaInAlarm.java | 4 .../skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java | 4 9 files changed, 33 insertions(+), 2 deletions(-) diff --git a/docs/en/setup/backend/backend-alarm.md b/docs/en/setup/backend/backend-alarm.md index 0a2ee51..6012376 100644 --- a/docs/en/setup/backend/backend-alarm.md +++ b/docs/en/setup/backend/backend-alarm.md @@ -76,14 +76,16 @@ Example as following ```json [{ "scopeId": 1, -"name": "serviceA", +"scope": "SERVICE", +"name": "serviceA", "id0": 12, "id1": 0, "alarmMessage": "alarmMessage ", "startTime": 1560524171000 }, { "scopeId": 1, -"name": "serviceB", +"scope": "SERVICE", +"name": "serviceB", "id0": 23, "id1": 0, "alarmMessage": "alarmMessage yyy", diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java index 0d6f81e..3c6a8a1 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java @@ -148,6 +148,7 @@ public class RunningRule { AlarmMessage alarmMessage = window.checkAlarm(); if (alarmMessage != AlarmMessage.NONE) { alarmMessage.setScopeId(meta.getScopeId()); +alarmMessage.setScope(meta.getScope()); alarmMessage.setName(meta.getName()); alarmMessage.setId0(meta.getId0()); alarmMessage.setId1(meta.getId1()); diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java index f46d764..05dcc98 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java @@ -27,6 +27,10 @@ public class AlarmMessageFormatterTest { AlarmMessageFormatter formatter = new AlarmMessageFormatter("abc words {sdf"); String message = formatter.format(new MetaInAlarm() { +@Override public String getScope() { +return "SERVICE"; +} + @Override public int getScopeId() { return -1; } @@ -56,6 +60,10 @@ public class AlarmMessageFormatterTest { AlarmMessageFormatter formatter = new AlarmMessageFormatter("abc} words {name} - {id} .. {"); String message = formatter.format(new MetaInAlarm() { +@Override public String getScope() { +return "SERVICE"; +} + @Override public int getScopeId() { return -1; } diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java index 72cea04..12d6d99 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java @@ -183,6 +183,10 @@ public class RunningRul
[skywalking] branch scope_name created (now f2b4244)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. at f2b4244 Makes the scope of alarm information more semantic. This branch includes the following new commits: new f2b4244 Makes the scope of alarm information more semantic. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] branch scope_name updated (f2b4244 -> 5c2fc77)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from f2b4244 Makes the scope of alarm information more semantic. add 5c2fc77 update md. No new revisions were added by this update. Summary of changes: docs/en/setup/backend/backend-alarm.md | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[skywalking] branch scope_name updated (5c2fc77 -> a084a5c)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 5c2fc77 update md. add b817267 [test/plugin] immigrate sofarpc scenario (#3674) add a084a5c Merge branch 'master' into scope_name No new revisions were added by this update. Summary of changes: Jenkinsfile-Agent-Test-3 | 10 +++- .../bin/startup.sh | 3 +- .../config/expectedData.yaml | 67 ++--- .../configuration.yml | 6 +- .../pom.xml| 24 .../src/main/assembly/assembly.xml | 2 +- .../apm/testcase/sofarpc/SofaRpcApplication.java | 69 ++ .../sofarpc}/controller/CaseController.java| 16 ++--- .../sofarpc/interfaces/SofaRpcDemoService.java | 8 +-- .../sofarpc/service/SofaRpcDemoServiceImpl.java| 16 ++--- .../src/main/resources/application.yml}| 3 +- .../support-version.list | 28 +++-- 12 files changed, 167 insertions(+), 85 deletions(-) copy test/plugin/scenarios/{solrj-7.x-scenario => sofarpc-scenario}/bin/startup.sh (92%) copy test/plugin/scenarios/{gateway-scenario => sofarpc-scenario}/config/expectedData.yaml (55%) copy test/plugin/scenarios/{dubbo-2.5.x-scenario => sofarpc-scenario}/configuration.yml (83%) copy test/plugin/scenarios/{dubbo-2.5.x-scenario => sofarpc-scenario}/pom.xml (91%) copy test/plugin/scenarios/{canal-scenario => sofarpc-scenario}/src/main/assembly/assembly.xml (95%) create mode 100644 test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/SofaRpcApplication.java copy test/plugin/scenarios/{dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo => sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc}/controller/CaseController.java (76%) copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassMatch.java => test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/interfaces/SofaRpcDemoService.java (85%) copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java => test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/service/SofaRpcDemoServiceImpl.java (74%) copy test/plugin/scenarios/{dubbo-2.5.x-scenario/src/main/resources/application.yaml => sofarpc-scenario/src/main/resources/application.yml} (95%) copy test/plugin/scenarios/{canal-scenario => sofarpc-scenario}/support-version.list (84%)
[skywalking] branch scope_name updated (a084a5c -> 5ba3f70)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from a084a5c Merge branch 'master' into scope_name add 5ba3f70 update md. No new revisions were added by this update. Summary of changes: docs/en/setup/backend/backend-alarm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking] branch scope_name updated (5ba3f70 -> 25dcd4b)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 5ba3f70 update md. add 25dcd4b add ruleName in AlarmMsg. No new revisions were added by this update. Summary of changes: docs/en/setup/backend/backend-alarm.md | 2 ++ .../apache/skywalking/oap/server/core/alarm/provider/RunningRule.java | 1 + .../java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java | 1 + 3 files changed, 4 insertions(+)
[skywalking] branch scope_name updated (25dcd4b -> e0ba233)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 25dcd4b add ruleName in AlarmMsg. add e0ba233 update md. No new revisions were added by this update. Summary of changes: docs/en/setup/backend/backend-alarm.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[skywalking] branch scope_name updated (e0ba233 -> 57f106c)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from e0ba233 update md. add cbb2755 ServiceInstanceRelation set error id add 60746b9 Merge pull request #3683 from coki230/patch-4 add 57f106c Merge branch 'master' into scope_name No new revisions were added by this update. Summary of changes: .../receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking] branch scope_name updated (57f106c -> 1d43030)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 57f106c Merge branch 'master' into scope_name add 1d43030 update test case. No new revisions were added by this update. Summary of changes: .../skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java | 2 ++ 1 file changed, 2 insertions(+)
[skywalking] branch scope_name updated (1d43030 -> 7f8aa3b)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 1d43030 update test case. add 9996fbb [test/plugin] docker prune at cleanup (#3679) add 7f8aa3b Merge branch 'master' into scope_name No new revisions were added by this update. Summary of changes: test/plugin/run.sh | 9 - test/plugin/script/systeminfo.sh | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-)
[skywalking] branch scope_name updated (6dd303f -> b27a7c1)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 6dd303f Merge branch 'master' into scope_name add b27a7c1 fix coveralls. No new revisions were added by this update. Summary of changes: .../core/alarm/provider/NotifyHandlerTest.java | 43 +- 1 file changed, 34 insertions(+), 9 deletions(-)
[skywalking] branch scope_name updated (b27a7c1 -> aa514ab)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from b27a7c1 fix coveralls. add aa514ab fix coveralls. No new revisions were added by this update. Summary of changes: .../core/alarm/provider/NotifyHandlerTest.java | 44 ++ 1 file changed, 11 insertions(+), 33 deletions(-)
[skywalking] branch scope_name updated (aa514ab -> bddcac4)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch scope_name in repository https://gitbox.apache.org/repos/asf/skywalking.git. from aa514ab fix coveralls. add bddcac4 fix ci. No new revisions were added by this update. Summary of changes: .../skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[skywalking] branch master updated (4c3a3ec -> 69a28d4)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 4c3a3ec Add CI build job barriers to prevent unnecessary builds (#3662) add 69a28d4 Add register persistent worker latency metrics #3671 (#3677) No new revisions were added by this update. Summary of changes: .../setup/backend/telemetry/mesh-mode-grafana.json | 100 - .../backend/telemetry/trace-mode-grafana.json | 100 - .../register/worker/RegisterPersistentWorker.java | 70 +-- .../oap/server/telemetry/api/HistogramMetrics.java | 2 +- 4 files changed, 240 insertions(+), 32 deletions(-)
[skywalking] branch master updated: Update README.md (#3719)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 3a6c10d Update README.md (#3719) 3a6c10d is described below commit 3a6c10df6f510d7bdcb4ef36d2447f6ce4b422e2 Author: 吴晟 Wu Sheng AuthorDate: Sun Oct 27 10:13:41 2019 +0800 Update README.md (#3719) --- README.md | 24 ++-- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 33135f1..62667c8 100644 --- a/README.md +++ b/README.md @@ -92,12 +92,24 @@ Follow this [document](docs/en/guides/How-to-build.md). * QQ Group: 392443393(2000/2000, not available), 901167865(available) # Who Uses SkyWalking? -A wide variety of companies and organizations use SkyWalking for research, production and commercial product. -Here is the **User Wall** of SkyWalking. - -http://skywalking.apache.org/assets/users-20190422.png"/> - -Users are encouraged to add themselves to the [PoweredBy](docs/powered-by.md) page. +Hundreds of companies and organizations use SkyWalking for research, production, and commercial product, including +1. Alibaba Cloud +1. China Eastern Airlines +1. China Merchants Bank +1. DaoCloud +1. GOME +1. guazi.com +1. Huawei +1. ke.com +1. lizhi.fm +1. tetrate.io +1. WeBank +1. Xiaomi +1. Yonghui Superstores Co., Ltd +1. zhaopin.com + +The [PoweredBy](docs/powered-by.md) page includes more users of the project. +Users are encouraged to add themselves to there. # Landscapes
[skywalking] branch remove_time created (now 5cb8524)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch remove_time in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 5cb8524 remove unused time range query parameter. This branch includes the following new commits: new 5cb8524 remove unused time range query parameter. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: remove unused time range query parameter.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch remove_time in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 5cb852416b5ef1f0e26a26954e47cd9ee583660d Author: Jared.Tan AuthorDate: Mon Oct 28 21:32:31 2019 +0800 remove unused time range query parameter. --- .../skywalking/oap/server/core/query/MetadataQueryService.java| 8 .../oap/server/core/storage/query/IMetadataQueryDAO.java | 4 ++-- .../storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java| 4 ++-- .../oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 5 ++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java index f6aaf68..1b72297 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java @@ -66,10 +66,10 @@ public class MetadataQueryService implements org.apache.skywalking.oap.server.li public ClusterBrief getGlobalBrief(final long startTimestamp, final long endTimestamp) throws IOException { ClusterBrief clusterBrief = new ClusterBrief(); clusterBrief.setNumOfService(getMetadataQueryDAO().numOfService(startTimestamp, endTimestamp)); - clusterBrief.setNumOfEndpoint(getMetadataQueryDAO().numOfEndpoint(startTimestamp, endTimestamp)); - clusterBrief.setNumOfDatabase(getMetadataQueryDAO().numOfConjectural(startTimestamp, endTimestamp, NodeType.Database.value())); - clusterBrief.setNumOfCache(getMetadataQueryDAO().numOfConjectural(startTimestamp, endTimestamp, NodeType.Cache.value())); - clusterBrief.setNumOfMQ(getMetadataQueryDAO().numOfConjectural(startTimestamp, endTimestamp, NodeType.MQ.value())); +clusterBrief.setNumOfEndpoint(getMetadataQueryDAO().numOfEndpoint()); + clusterBrief.setNumOfDatabase(getMetadataQueryDAO().numOfConjectural(NodeType.Database.value())); + clusterBrief.setNumOfCache(getMetadataQueryDAO().numOfConjectural(NodeType.Cache.value())); + clusterBrief.setNumOfMQ(getMetadataQueryDAO().numOfConjectural(NodeType.MQ.value())); return clusterBrief; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java index d277d6f..7e4aa7c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java @@ -30,9 +30,9 @@ public interface IMetadataQueryDAO extends DAO { int numOfService(final long startTimestamp, final long endTimestamp) throws IOException; -int numOfEndpoint(final long startTimestamp, final long endTimestamp) throws IOException; +int numOfEndpoint() throws IOException; -int numOfConjectural(final long startTimestamp, final long endTimestamp, final int nodeTypeValue) throws IOException; +int numOfConjectural(final int nodeTypeValue) throws IOException; List getAllServices(final long startTimestamp, final long endTimestamp) throws IOException; diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java index 93f05a8..0d3ca13 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java @@ -84,7 +84,7 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO { return (int)response.getHits().getTotalHits(); } -@Override public int numOfEndpoint(long startTimestamp, long endTimestamp) throws IOException { +@Override public int numOfEndpoint() throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -99,7 +99,7 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO { } @Override -public int numOfConjectural(long
[skywalking] branch remove_time updated (5cb8524 -> 0689c35)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch remove_time in repository https://gitbox.apache.org/repos/asf/skywalking.git. from 5cb8524 remove unused time range query parameter. add 2e2616d [test/plugin] spring async scenario optimize (#3723) add be3db67 Add E2E test for MySQL storage. (#3648) add 7f69a73 Add postgresql agent sql query param show (#3695) add d9fcda1 Refactor:extract common module postgresql-common (#3725) add a407819 [plugin]support log4j2 AsyncLogger (#3715) add f48e11c Revert "Refactor:extract common module postgresql-common (#3725)" (#3728) add b3da85b 1.update pg image to 10.5-alpine;2.update test support list. (#3727) add 0689c35 Merge branch 'master' into remove_time No new revisions were added by this update. Summary of changes: Jenkinsfile-E2E| 6 +++ .../skywalking/apm/agent/core/conf/Config.java | 16 ++ .../PSSetterDefinitionOfJDBCInstrumentation.java | 2 +- .../plugin/jdbc/define/StatementEnhanceInfos.java | 5 +- .../CreateCallableStatementInterceptor.java| 0 .../CreatePreparedStatementInterceptor.java| 0 .../postgresql/CreateStatementInterceptor.java | 0 ...PrepareStatementWithStringArrayInterceptor.java | 0 ...PreparedStatementExecuteMethodsInterceptor.java | 33 + .../StatementExecuteMethodsInterceptor.java| 0 .../apm/plugin/jdbc/postgresql/Variables.java | 0 .../AbstractJdbc2StatementInstrumentation.java | 0 .../define/ConnectionInstrumentation.java | 0 .../plugin/jdbc/postgresql/define/Constants.java | 1 - .../postgresql/define/DriverInstrumentation.java | 0 .../define/Jdbc3ConnectionInstrumentation.java | 0 .../define/Jdbc4ConnectionInstrumentation.java | 0 .../define/PgCallableStatementInstrumentation.java | 0 .../define/PgPreparedStatementInstrumentation.java | 0 .../PgPreparedStatementSetterInstrumentation.java} | 8 ++- .../define/PgStatementInstrumentation.java | 0 .../src/main/resources/skywalking-plugin.def | 1 + .../RingBufferLogEventInstrumentation.java}| 16 +++--- .../RingBufferLogEventMethodInterceptor.java} | 17 +++ .../src/main/resources/skywalking-plugin.def | 1 + .../java-agent/Application-toolkit-log4j-2.x.md| 53 +++- docs/en/setup/service-agent/java-agent/README.md | 2 + test/e2e/{e2e-single-service => e2e-mysql}/pom.xml | 29 ++- .../src/docker/rc.d/rc0-prepare.sh | 21 .../src/docker/rc.d/rc1-startup.sh | 0 .../e2e/sample/client/SampleClientApplication.java | 0 .../e2e/sample/client/TestController.java | 0 .../apache/skywalking/e2e/sample/client/User.java | 0 .../skywalking/e2e/sample/client/UserRepo.java | 0 .../src/main/resources/application.yml | 0 .../skywalking/e2e/SampleVerificationITCase.java | 0 ...king.e2e.SampleVerificationITCase.endpoints.yml | 0 ...king.e2e.SampleVerificationITCase.instances.yml | 0 ...lking.e2e.SampleVerificationITCase.services.yml | 0 ...kywalking.e2e.SampleVerificationITCase.topo.yml | 0 ...walking.e2e.SampleVerificationITCase.traces.yml | 0 test/e2e/pom.xml | 2 + test/e2e/run.sh| 2 +- .../bin/startup.sh | 2 +- .../config/expectedData.yaml | 1 + .../configuration.yml | 2 +- .../support-version.list | 13 + .../postgresql-scenario/configuration.yml | 2 +- .../spring-async-scenario/config/expectedData.yaml | 57 -- .../apm/testcase/spring/async/AsyncBean.java | 4 +- .../{HealthCheckServlet.java => AsyncServlet.java} | 4 +- .../src/main/webapp/WEB-INF/web.xml| 9 52 files changed, 244 insertions(+), 65 deletions(-) mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/JDBCPrepareStatementWithStringArrayInterceptor.java mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/PreparedStatementEx
[skywalking] branch master updated (b3da85b -> 852f03d)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git. from b3da85b 1.update pg image to 10.5-alpine;2.update test support list. (#3727) add 852f03d remove unused time range query parameter. (#3730) No new revisions were added by this update. Summary of changes: .../skywalking/oap/server/core/query/MetadataQueryService.java| 8 .../oap/server/core/storage/query/IMetadataQueryDAO.java | 4 ++-- .../storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java| 4 ++-- .../oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 5 ++--- 4 files changed, 10 insertions(+), 11 deletions(-)
[skywalking] branch ui created (now 2c9a89a)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch ui in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 2c9a89a sync ui. This branch includes the following new commits: new 2c9a89a sync ui. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/01: sync ui.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch ui in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 2c9a89acf609fe7b131ce51ae8a82d768a94a339 Author: Jared.Tan AuthorDate: Wed Oct 30 18:10:33 2019 +0800 sync ui. --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index 2695697..61ae252 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 2695697d0de0acf4f5adc0df68e7d71a4824b4e4 +Subproject commit 61ae25246b7f33d190a9a509baa9ace26c87ec4d
[incubator-skywalking-website] branch asf-site updated (88d619f -> 5ac8220)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git. discard 88d619f Update asf-site new 5ac8220 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (88d619f) \ N -- N -- N refs/heads/asf-site (5ac8220) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 10 +- assets/css/0.styles.668098ae.css | 1 - assets/css/0.styles.e6dfc163.css | 1 + assets/js/20.c88ccd28.js | 1 - assets/js/20.feb7200c.js | 1 + assets/js/29.62f91b38.js | 1 + assets/js/29.8d4d908c.js | 1 - assets/js/{app.1cb56153.js => app.2a48f257.js} | 6 +++--- blog/2018-05-24-skywalking-net.html | 12 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 12 ++-- blog/2019-01-01-Understand-Trace.html| 12 ++-- blog/2019-01-25-mesh-loadtest.html | 12 ++-- blog/index.html | 12 ++-- downloads/index.html | 12 ++-- events/index.html| 12 ++-- index.html | 12 ++-- team/index.html | 12 ++-- zh/blog/2018-05-24-skywalking-net.html | 12 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 12 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html | 12 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 12 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html| 12 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 12 ++-- zh/blog/2019-01-03-monitor-microservice.html | 12 ++-- zh/blog/2019-01-21-agent-plugin-practice.html| 12 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 12 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 12 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 12 ++-- ...03-29-introduction-of-skywalking-and-simple-practice.html | 12 ++-- zh/blog/index.html | 12 ++-- zh/doc/index.html| 12 ++-- zh/downloads/index.html | 12 ++-- zh/events/index.html | 12 ++-- zh/index.html| 12 ++-- zh/team/index.html | 12 ++-- 35 files changed, 173 insertions(+), 173 deletions(-) delete mode 100644 assets/css/0.styles.668098ae.css create mode 100644 assets/css/0.styles.e6dfc163.css delete mode 100644 assets/js/20.c88ccd28.js create mode 100644 assets/js/20.feb7200c.js create mode 100644 assets/js/29.62f91b38.js delete mode 100644 assets/js/29.8d4d908c.js rename assets/js/{app.1cb56153.js => app.2a48f257.js} (62%)
[skywalking-website] branch asf-site updated (5ac8220 -> 6ab781c)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 5ac8220 Update asf-site new 6ab781c Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5ac8220) \ N -- N -- N refs/heads/asf-site (6ab781c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 4 ++-- assets/js/18.2a142590.js | 1 - assets/js/18.e0ceb69e.js | 1 + assets/js/20.08c906d2.js | 1 + assets/js/20.feb7200c.js | 1 - assets/js/27.387db446.js | 1 - assets/js/27.f57a032d.js | 1 + assets/js/29.62f91b38.js | 1 - assets/js/29.b7d02ab5.js | 1 + assets/js/{app.2a48f257.js => app.597af164.js} | 6 +++--- blog/2018-05-24-skywalking-net.html | 16 blog/2018-12-12-skywalking-service-mesh-ready.html | 16 blog/2019-01-01-Understand-Trace.html| 16 blog/2019-01-25-mesh-loadtest.html | 16 blog/index.html | 16 downloads/index.html | 20 ++-- events/index.html| 16 index.html | 16 team/index.html | 18 +- zh/blog/2018-05-24-skywalking-net.html | 16 .../2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 16 .../2018-12-21-SkyWalking-apm-sniffer-beginning.html | 16 zh/blog/2018-12-21-SkyWalking-source-code-read.html | 16 zh/blog/2019-01-02-Understand-trace-trans2cn.html| 16 .../2019-01-02-skywalking-elasticsearch-basic.html | 16 zh/blog/2019-01-03-monitor-microservice.html | 16 zh/blog/2019-01-21-agent-plugin-practice.html| 16 zh/blog/2019-01-24-skywalking-remote-debug.html | 16 zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 16 zh/blog/2019-03-01-skywalking-troubleshoot.html | 16 ...troduction-of-skywalking-and-simple-practice.html | 16 zh/blog/index.html | 16 zh/doc/index.html| 16 zh/downloads/index.html | 20 ++-- zh/events/index.html | 16 zh/index.html| 16 zh/team/index.html | 18 +- 37 files changed, 231 insertions(+), 231 deletions(-) delete mode 100644 assets/js/18.2a142590.js create mode 100644 assets/js/18.e0ceb69e.js create mode 100644 assets/js/20.08c906d2.js delete mode 100644 assets/js/20.feb7200c.js delete mode 100644 assets/js/27.387db446.js create mode 100644 assets/js/27.f57a032d.js delete mode 100644 assets/js/29.62f91b38.js create mode 100644 assets/js/29.b7d02ab5.js rename assets/js/{app.2a48f257.js => app.597af164.js} (76%)
[skywalking-website] branch asf-site updated (6ab781c -> d496272)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 6ab781c Update asf-site new d496272 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6ab781c) \ N -- N -- N refs/heads/asf-site (d496272) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/{20.08c906d2.js => 20.364561a7.js}| 2 +- assets/js/{29.b7d02ab5.js => 29.4366cb12.js}| 2 +- assets/js/{app.597af164.js => app.45a67db0.js} | 6 +++--- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 6 +++--- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 6 +++--- 31 files changed, 64 insertions(+), 64 deletions(-) rename assets/js/{20.08c906d2.js => 20.364561a7.js} (61%) rename assets/js/{29.b7d02ab5.js => 29.4366cb12.js} (61%) rename assets/js/{app.597af164.js => app.45a67db0.js} (76%)
[skywalking-website] branch asf-site updated (d496272 -> 4f1f52c)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard d496272 Update asf-site new 4f1f52c Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d496272) \ N -- N -- N refs/heads/asf-site (4f1f52c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/20.364561a7.js| 1 - assets/js/20.d086fd86.js| 1 + assets/js/29.2467fdd5.js| 1 + assets/js/29.4366cb12.js| 1 - assets/js/{app.45a67db0.js => app.e0d0a084.js} | 4 ++-- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html | 6 +++--- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 6 +++--- 33 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 assets/js/20.364561a7.js create mode 100644 assets/js/20.d086fd86.js create mode 100644 assets/js/29.2467fdd5.js delete mode 100644 assets/js/29.4366cb12.js rename assets/js/{app.45a67db0.js => app.e0d0a084.js} (82%)
[skywalking-website] branch asf-site updated (4f1f52c -> bd1cf69)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 4f1f52c Update asf-site new bd1cf69 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4f1f52c) \ N -- N -- N refs/heads/asf-site (bd1cf69) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/19.a88fba1e.js| 1 - assets/js/19.a8c0062d.js| 1 + assets/js/28.5e8f5b2d.js| 1 + assets/js/28.7afbec87.js| 1 - assets/js/{app.e0d0a084.js => app.8babe16a.js} | 6 +++--- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 6 +++--- index.html | 6 +++--- team/index.html | 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 6 +++--- zh/index.html | 6 +++--- zh/team/index.html | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 assets/js/19.a88fba1e.js create mode 100644 assets/js/19.a8c0062d.js create mode 100644 assets/js/28.5e8f5b2d.js delete mode 100644 assets/js/28.7afbec87.js rename assets/js/{app.e0d0a084.js => app.8babe16a.js} (75%)
[skywalking-website] branch asf-site updated (bd1cf69 -> 3ff2016)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard bd1cf69 Update asf-site new 3ff2016 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bd1cf69) \ N -- N -- N refs/heads/asf-site (3ff2016) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 6 +++--- assets/js/{app.8babe16a.js => app.c2635206.js} | 2 +- assets/users-20190422.png | Bin 0 -> 213757 bytes assets/users.png | Bin 226025 -> 213757 bytes blog/2018-05-24-skywalking-net.html| 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html| 4 ++-- downloads/index.html | 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- team/index.html| 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- ...2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- ...018-12-21-SkyWalking-apm-sniffer-beginning.html | 4 ++-- .../2018-12-21-SkyWalking-source-code-read.html| 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- .../2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html | 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html| 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html| 4 ++-- ...oduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html| 4 ++-- zh/events/index.html | 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 4 ++-- 31 files changed, 58 insertions(+), 58 deletions(-) rename assets/js/{app.8babe16a.js => app.c2635206.js} (96%) create mode 100644 assets/users-20190422.png
[skywalking] branch rocketbot-ui updated: update skywalking-rocketbot-ui commitId.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch rocketbot-ui in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/rocketbot-ui by this push: new 28f7b56 update skywalking-rocketbot-ui commitId. 28f7b56 is described below commit 28f7b56c182ec87ef987d8078fd7c2431fcdb296 Author: Jared.Tan AuthorDate: Thu Apr 25 11:40:08 2019 +0800 update skywalking-rocketbot-ui commitId. --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index 9b66a86..4959569 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 9b66a8606f41d15b0c040506a703ebd82665d48b +Subproject commit 49595692ed8fae2e3d9e931cc34f4c350f6973e2
[skywalking] branch master updated: Merge RocketBot UI as primary UI (#2515)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 5321a85 Merge RocketBot UI as primary UI (#2515) 5321a85 is described below commit 5321a8538d0d631e9bd237a8d97d912c7f4d1b83 Author: 吴晟 Wu Sheng AuthorDate: Thu Apr 25 12:34:36 2019 +0800 Merge RocketBot UI as primary UI (#2515) * Remove old UI submodule. * Add rocketbot UI as submodule. * update skywalking-rocketbot-ui commitId. * Update ignore. --- .gitmodules | 6 +++--- pom.xml | 14 ++ skywalking-ui | 2 +- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.gitmodules b/.gitmodules index ed908a8..2d6acd7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "skywalking-ui"] - path = skywalking-ui - url = https://github.com/apache/incubator-skywalking-ui [submodule "apm-protocol/apm-network/src/main/proto"] path = apm-protocol/apm-network/src/main/proto url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git [submodule "oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol"] path = oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol url = https://github.com/apache/incubator-skywalking-query-protocol.git +[submodule "skywalking-ui"] + path = skywalking-ui + url = https://github.com/apache/skywalking-rocketbot-ui.git diff --git a/pom.xml b/pom.xml index 27a978c..d8bc1b0 100644 --- a/pom.xml +++ b/pom.xml @@ -318,18 +318,8 @@ **/skywalking-ui/.editorconfig - -**/skywalking-ui/.webpackrc.js -**/skywalking-ui/.roadhogrc.mock.js - -**/skywalking-ui/jest.config.js - -**/skywalking-ui/.eslintrc.js -**/skywalking-ui/.stylelintrc -**/skywalking-ui/.prettierignore -**/skywalking-ui/.prettierrc - - **/skywalking-ui/public/font/iconfont/** + +**/skywalking-ui/.browserslistrc **/.gitignore diff --git a/skywalking-ui b/skywalking-ui index 949e434..4959569 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 949e43436a652acb213a18feda73125ae8a7c0df +Subproject commit 49595692ed8fae2e3d9e931cc34f4c350f6973e2
[skywalking] 01/01: update ui license.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch update_ui_license in repository https://gitbox.apache.org/repos/asf/skywalking.git commit d2ea61ec42bdfc9da66b1787967cffe2d8ac7f94 Author: Jared.Tan AuthorDate: Thu Apr 25 14:00:23 2019 +0800 update ui license. --- apm-dist/release-docs/LICENSE | 116 ++- .../ui-licenses/LICENSE-add-dom-event-listener | 9 - .../release-docs/licenses/ui-licenses/LICENSE-antd | 22 -- .../licenses/ui-licenses/LICENSE-async-validator | 9 - .../ui-licenses/{LICENSE-core-js => LICENSE-axios} | 2 +- .../licenses/ui-licenses/LICENSE-batch-processor | 22 -- .../licenses/ui-licenses/LICENSE-bizcharts | 21 -- .../licenses/ui-licenses/LICENSE-classnames| 21 -- .../ui-licenses/LICENSE-create-react-class | 21 -- .../licenses/ui-licenses/LICENSE-css-animation | 9 - .../licenses/ui-licenses/LICENSE-cytoscape | 21 -- .../ui-licenses/LICENSE-cytoscape-cose-bilkent | 19 -- .../licenses/ui-licenses/LICENSE-cytoscape-dagre | 21 -- .../licenses/ui-licenses/LICENSE-dagre | 19 -- ...{LICENSE-resize-observer-lite => LICENSE-dayjs} | 2 +- .../licenses/ui-licenses/LICENSE-dom-align | 9 - .../licenses/ui-licenses/LICENSE-echarts | 223 + .../licenses/ui-licenses/LICENSE-exenv | 31 --- .../release-docs/licenses/ui-licenses/LICENSE-fbjs | 21 -- .../licenses/ui-licenses/LICENSE-graphlib | 19 -- .../licenses/ui-licenses/LICENSE-history | 21 -- .../ui-licenses/LICENSE-hoist-non-react-statics| 29 --- .../licenses/ui-licenses/LICENSE-invariant | 21 -- .../licenses/ui-licenses/LICENSE-isobject | 21 -- .../licenses/ui-licenses/LICENSE-isomorphic-fetch | 21 -- .../licenses/ui-licenses/LICENSE-lodash| 49 - .../licenses/ui-licenses/LICENSE-lodash-decorators | 22 -- .../licenses/ui-licenses/LICENSE-lodash-es | 49 - .../licenses/ui-licenses/LICENSE-lodash._getnative | 49 - .../licenses/ui-licenses/LICENSE-lodash.debounce | 49 - .../ui-licenses/LICENSE-lodash.isarguments | 49 - .../licenses/ui-licenses/LICENSE-lodash.isarray| 49 - .../licenses/ui-licenses/LICENSE-lodash.keys | 49 - .../licenses/ui-licenses/LICENSE-node-libs-browser | 22 -- .../licenses/ui-licenses/LICENSE-numeral | 22 -- .../licenses/ui-licenses/LICENSE-object-assign | 21 -- .../{LICENSE-moment => LICENSE-popperjs} | 9 +- .../licenses/ui-licenses/LICENSE-prop-types| 21 -- .../release-docs/licenses/ui-licenses/LICENSE-qs | 28 --- .../licenses/ui-licenses/LICENSE-rc-align | 9 - .../licenses/ui-licenses/LICENSE-rc-animate| 9 - .../licenses/ui-licenses/LICENSE-rc-calendar | 21 -- .../licenses/ui-licenses/LICENSE-rc-checkbox | 7 - .../licenses/ui-licenses/LICENSE-rc-drawer-menu| 22 -- .../licenses/ui-licenses/LICENSE-rc-dropdown | 9 - .../licenses/ui-licenses/LICENSE-rc-form | 9 - .../licenses/ui-licenses/LICENSE-rc-input-number | 9 - .../licenses/ui-licenses/LICENSE-rc-menu | 9 - .../licenses/ui-licenses/LICENSE-rc-notification | 9 - .../licenses/ui-licenses/LICENSE-rc-pagination | 9 - .../licenses/ui-licenses/LICENSE-rc-select | 9 - .../licenses/ui-licenses/LICENSE-rc-tabs | 9 - .../licenses/ui-licenses/LICENSE-rc-time-picker| 9 - .../licenses/ui-licenses/LICENSE-rc-tooltip| 20 -- .../licenses/ui-licenses/LICENSE-rc-trigger| 20 -- .../licenses/ui-licenses/LICENSE-rc-util | 20 -- .../licenses/ui-licenses/LICENSE-react | 21 -- .../ui-licenses/LICENSE-react-document-title | 22 -- .../licenses/ui-licenses/LICENSE-react-dom | 21 -- .../licenses/ui-licenses/LICENSE-react-fittext | 8 - .../licenses/ui-licenses/LICENSE-react-redux | 21 -- .../licenses/ui-licenses/LICENSE-react-side-effect | 22 -- .../licenses/ui-licenses/LICENSE-redux | 21 -- .../licenses/ui-licenses/LICENSE-redux-saga| 22 -- .../licenses/ui-licenses/LICENSE-setimmediate | 20 -- .../licenses/ui-licenses/LICENSE-shallowequal | 21 -- .../licenses/ui-licenses/LICENSE-symbol-observable | 22 -- .../licenses/ui-licenses/LICENSE-timers-browserify | 19 -- .../licenses/ui-licenses/LICENSE-tslib | 55 - .../licenses/ui-licenses/LICENSE-url-polyfill | 21 -- .../{LICENSE-path-to-regexp => LICENSE-vue}| 2 +- ...LICENSE-flatten => LICENSE-vue-class-component} | 2 +- ...ICENSE-omit.js => LICENSE-vue-datepicker-local} | 2 +- .../licenses/ui-licenses/LICENSE-vue-i18n | 20 ++ ...E-enquire.js => LICENSE-vue-property-decorator} | 2 +- ...-container-query-toolkit => L
[skywalking] branch update_ui_license created (now d2ea61e)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch update_ui_license in repository https://gitbox.apache.org/repos/asf/skywalking.git. at d2ea61e update ui license. This branch includes the following new commits: new d2ea61e update ui license. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking-ui] branch master updated: Update README.md (#239)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-ui.git The following commit(s) were added to refs/heads/master by this push: new d9348f4 Update README.md (#239) d9348f4 is described below commit d9348f42889ad9f0909598887cb070fb98cc Author: 吴晟 Wu Sheng AuthorDate: Thu Apr 25 14:15:33 2019 +0800 Update README.md (#239) --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index cc704c6..d676a2e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ Apache SkyWalking UI === +**This UI has been replaced by [SkyWalking RocketBot UI](https://github.com/apache/skywalking-rocketbot-ui) since SkyWalking 6.1 release.** +=== + http://skywalking.apache.org/assets/logo.svg"; alt="Sky Walking logo" height="90px" align="right" /> The UI for [Apache SkyWalking](https://github.com/apache/incubator-skywalking).
[skywalking] branch master updated: update ui license. (#2519)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 9c2d55a update ui license. (#2519) 9c2d55a is described below commit 9c2d55a4ea4fb400bee2718b154daccb3cff9655 Author: Jared Tan AuthorDate: Thu Apr 25 15:13:29 2019 +0800 update ui license. (#2519) --- apm-dist/release-docs/LICENSE | 116 ++- .../ui-licenses/LICENSE-add-dom-event-listener | 9 - .../release-docs/licenses/ui-licenses/LICENSE-antd | 22 -- .../licenses/ui-licenses/LICENSE-async-validator | 9 - .../ui-licenses/{LICENSE-core-js => LICENSE-axios} | 2 +- .../licenses/ui-licenses/LICENSE-batch-processor | 22 -- .../licenses/ui-licenses/LICENSE-bizcharts | 21 -- .../licenses/ui-licenses/LICENSE-classnames| 21 -- .../ui-licenses/LICENSE-create-react-class | 21 -- .../licenses/ui-licenses/LICENSE-css-animation | 9 - .../licenses/ui-licenses/LICENSE-cytoscape | 21 -- .../ui-licenses/LICENSE-cytoscape-cose-bilkent | 19 -- .../licenses/ui-licenses/LICENSE-cytoscape-dagre | 21 -- .../licenses/ui-licenses/LICENSE-dagre | 19 -- ...{LICENSE-resize-observer-lite => LICENSE-dayjs} | 2 +- .../licenses/ui-licenses/LICENSE-dom-align | 9 - .../licenses/ui-licenses/LICENSE-echarts | 223 + .../licenses/ui-licenses/LICENSE-exenv | 31 --- .../release-docs/licenses/ui-licenses/LICENSE-fbjs | 21 -- .../licenses/ui-licenses/LICENSE-graphlib | 19 -- .../licenses/ui-licenses/LICENSE-history | 21 -- .../ui-licenses/LICENSE-hoist-non-react-statics| 29 --- .../licenses/ui-licenses/LICENSE-invariant | 21 -- .../licenses/ui-licenses/LICENSE-isobject | 21 -- .../licenses/ui-licenses/LICENSE-isomorphic-fetch | 21 -- .../licenses/ui-licenses/LICENSE-lodash| 49 - .../licenses/ui-licenses/LICENSE-lodash-decorators | 22 -- .../licenses/ui-licenses/LICENSE-lodash-es | 49 - .../licenses/ui-licenses/LICENSE-lodash._getnative | 49 - .../licenses/ui-licenses/LICENSE-lodash.debounce | 49 - .../ui-licenses/LICENSE-lodash.isarguments | 49 - .../licenses/ui-licenses/LICENSE-lodash.isarray| 49 - .../licenses/ui-licenses/LICENSE-lodash.keys | 49 - .../licenses/ui-licenses/LICENSE-node-libs-browser | 22 -- .../licenses/ui-licenses/LICENSE-numeral | 22 -- .../licenses/ui-licenses/LICENSE-object-assign | 21 -- .../{LICENSE-moment => LICENSE-popperjs} | 9 +- .../licenses/ui-licenses/LICENSE-prop-types| 21 -- .../release-docs/licenses/ui-licenses/LICENSE-qs | 28 --- .../licenses/ui-licenses/LICENSE-rc-align | 9 - .../licenses/ui-licenses/LICENSE-rc-animate| 9 - .../licenses/ui-licenses/LICENSE-rc-calendar | 21 -- .../licenses/ui-licenses/LICENSE-rc-checkbox | 7 - .../licenses/ui-licenses/LICENSE-rc-drawer-menu| 22 -- .../licenses/ui-licenses/LICENSE-rc-dropdown | 9 - .../licenses/ui-licenses/LICENSE-rc-form | 9 - .../licenses/ui-licenses/LICENSE-rc-input-number | 9 - .../licenses/ui-licenses/LICENSE-rc-menu | 9 - .../licenses/ui-licenses/LICENSE-rc-notification | 9 - .../licenses/ui-licenses/LICENSE-rc-pagination | 9 - .../licenses/ui-licenses/LICENSE-rc-select | 9 - .../licenses/ui-licenses/LICENSE-rc-tabs | 9 - .../licenses/ui-licenses/LICENSE-rc-time-picker| 9 - .../licenses/ui-licenses/LICENSE-rc-tooltip| 20 -- .../licenses/ui-licenses/LICENSE-rc-trigger| 20 -- .../licenses/ui-licenses/LICENSE-rc-util | 20 -- .../licenses/ui-licenses/LICENSE-react | 21 -- .../ui-licenses/LICENSE-react-document-title | 22 -- .../licenses/ui-licenses/LICENSE-react-dom | 21 -- .../licenses/ui-licenses/LICENSE-react-fittext | 8 - .../licenses/ui-licenses/LICENSE-react-redux | 21 -- .../licenses/ui-licenses/LICENSE-react-side-effect | 22 -- .../licenses/ui-licenses/LICENSE-redux | 21 -- .../licenses/ui-licenses/LICENSE-redux-saga| 22 -- .../licenses/ui-licenses/LICENSE-setimmediate | 20 -- .../licenses/ui-licenses/LICENSE-shallowequal | 21 -- .../licenses/ui-licenses/LICENSE-symbol-observable | 22 -- .../licenses/ui-licenses/LICENSE-timers-browserify | 19 -- .../licenses/ui-licenses/LICENSE-tslib | 55 - .../licenses/ui-licenses/LICENSE-url-polyfill | 21 -- .../{LICENSE-path-to-regexp => LICENSE-vue}| 2 +- ...LICENSE-flatten => LICENSE-vue-class-component} | 2 +- ...ICENSE-omit.js => LICENSE-vue-datepicker-local} | 2 +- .../licenses/ui-li
[skywalking] branch update_ui_license deleted (was d2ea61e)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch update_ui_license in repository https://gitbox.apache.org/repos/asf/skywalking.git. was d2ea61e update ui license. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking] 01/01: update ui submodule.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch ui_submodule in repository https://gitbox.apache.org/repos/asf/skywalking.git commit a96e8e8158560054d70a33f8b0bfff626dae24d5 Author: Jared.Tan AuthorDate: Thu Apr 25 15:27:45 2019 +0800 update ui submodule. --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index 4959569..0a67a4c 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 49595692ed8fae2e3d9e931cc34f4c350f6973e2 +Subproject commit 0a67a4cb2f99e7ea2910cb08738190b4fa5aef7f
[skywalking] branch ui_submodule created (now a96e8e8)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch ui_submodule in repository https://gitbox.apache.org/repos/asf/skywalking.git. at a96e8e8 update ui submodule. This branch includes the following new commits: new a96e8e8 update ui submodule. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] branch master updated: update ui submodule. (#2520)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 1b5153c update ui submodule. (#2520) 1b5153c is described below commit 1b5153c2bff5c9f7313f2c2ec96960a02ae4d323 Author: Jared Tan AuthorDate: Thu Apr 25 16:11:15 2019 +0800 update ui submodule. (#2520) --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index 4959569..0a67a4c 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit 49595692ed8fae2e3d9e931cc34f4c350f6973e2 +Subproject commit 0a67a4cb2f99e7ea2910cb08738190b4fa5aef7f
[skywalking] branch ui_submodule deleted (was a96e8e8)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch ui_submodule in repository https://gitbox.apache.org/repos/asf/skywalking.git. was a96e8e8 update ui submodule. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking-website] branch asf-site updated (3ff2016 -> 25b06d3)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 3ff2016 Update asf-site new 25b06d3 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3ff2016) \ N -- N -- N refs/heads/asf-site (25b06d3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html| 6 +++--- assets/js/19.3cfb2e16.js| 1 + assets/js/19.a8c0062d.js| 1 - assets/js/20.72eff4b7.js| 1 + assets/js/20.d086fd86.js| 1 - assets/js/28.5e8f5b2d.js| 1 - assets/js/28.850abb34.js| 1 + assets/js/{29.2467fdd5.js => 29.cb5d7ef2.js}| 2 +- assets/js/{app.c2635206.js => app.8e41142e.js} | 6 +++--- blog/2018-05-24-skywalking-net.html | 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html | 4 ++-- downloads/index.html| 4 ++-- events/index.html | 6 +++--- index.html | 6 +++--- team/index.html | 6 +++--- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html| 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html| 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 4 ++-- .../2019-03-29-introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html | 4 ++-- zh/events/index.html| 6 +++--- zh/index.html | 6 +++--- zh/team/index.html | 6 +++--- 36 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 assets/js/19.3cfb2e16.js delete mode 100644 assets/js/19.a8c0062d.js create mode 100644 assets/js/20.72eff4b7.js delete mode 100644 assets/js/20.d086fd86.js delete mode 100644 assets/js/28.5e8f5b2d.js create mode 100644 assets/js/28.850abb34.js rename assets/js/{29.2467fdd5.js => 29.cb5d7ef2.js} (74%) rename assets/js/{app.c2635206.js => app.8e41142e.js} (79%)
[skywalking] 01/01: support es query span max size.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch span_query_max_zie in repository https://gitbox.apache.org/repos/asf/skywalking.git commit e5a8d91c0b82005f836df3a9bf9b6e5be6bc8b07 Author: Jared.Tan AuthorDate: Fri Apr 26 22:26:44 2019 +0800 support es query span max size. --- docker/config/application.yml | 1 + .../src/main/assembly/application.yml | 1 + .../src/main/resources/application.yml | 1 + .../StorageModuleElasticsearchConfig.java | 12 ++- .../StorageModuleElasticsearchProvider.java| 2 +- .../elasticsearch/query/TraceQueryEsDAO.java | 23 +- 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/docker/config/application.yml b/docker/config/application.yml index 2e145a5..3143616 100644 --- a/docker/config/application.yml +++ b/docker/config/application.yml @@ -68,6 +68,7 @@ storage: flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} +spanQueryMaxSize: ${SW_QUERY_GRAPHQL_SPAN_SIZE:200} # h2: #driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} #url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml index 6ef2025..971809a 100644 --- a/oap-server/server-starter/src/main/assembly/application.yml +++ b/oap-server/server-starter/src/main/assembly/application.yml @@ -68,6 +68,7 @@ storage: #flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests #concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests #metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} +#spanQueryMaxSize: ${SW_QUERY_GRAPHQL_SPAN_SIZE:200} h2: driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index 460d368..2a2fbfe 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -68,6 +68,7 @@ storage: flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} +spanQueryMaxSize: ${SW_QUERY_GRAPHQL_SPAN_SIZE:200} # h2: #driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} #url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java index 8bc741d..d1b86bd 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java @@ -18,7 +18,8 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; /** @@ -43,6 +44,7 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig { private String user; private String password; private int metadataQueryMaxSize = 5000; +private int spanQueryMaxSize = 200; public String getUser() { return user; @@ -163,4 +165,12 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig { public void setMetadataQueryMaxSize(int metadataQueryMaxSize) { this.metadataQueryMaxSize = metadataQueryMaxSize; } + +public int getSpanQueryMaxSize() { +return spanQueryMaxSize; +} + +public void setSpanQueryMaxSize(int spanQueryMaxSize) { +this.spanQueryMaxSize = spanQueryMaxSize; +} } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java b/oap
[skywalking] branch span_query_max_zie created (now e5a8d91)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch span_query_max_zie in repository https://gitbox.apache.org/repos/asf/skywalking.git. at e5a8d91 support es query span max size. This branch includes the following new commits: new e5a8d91 support es query span max size. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] branch span_query_max_zie updated: refactoring segmentQueryMaxSize.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch span_query_max_zie in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/span_query_max_zie by this push: new aa4cab2 refactoring segmentQueryMaxSize. aa4cab2 is described below commit aa4cab2cd95c82074a5610eaaf0dff23f211d4b3 Author: Jared.Tan AuthorDate: Fri Apr 26 22:39:09 2019 +0800 refactoring segmentQueryMaxSize. --- docker/config/application.yml | 2 +- oap-server/server-starter/src/main/assembly/application.yml| 2 +- oap-server/server-starter/src/main/resources/application.yml | 2 +- .../plugin/elasticsearch/StorageModuleElasticsearchConfig.java | 10 +- .../storage/plugin/elasticsearch/query/TraceQueryEsDAO.java| 8 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker/config/application.yml b/docker/config/application.yml index 3143616..44d79be 100644 --- a/docker/config/application.yml +++ b/docker/config/application.yml @@ -68,7 +68,7 @@ storage: flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} -spanQueryMaxSize: ${SW_QUERY_GRAPHQL_SPAN_SIZE:200} +segmentQueryMaxSize: ${SW_QUERY_GRAPHQL_SEGMENT_SIZE:200} # h2: #driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} #url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml index 971809a..5b09ff6 100644 --- a/oap-server/server-starter/src/main/assembly/application.yml +++ b/oap-server/server-starter/src/main/assembly/application.yml @@ -68,7 +68,7 @@ storage: #flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests #concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests #metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} -#spanQueryMaxSize: ${SW_QUERY_GRAPHQL_SPAN_SIZE:200} +#segmentQueryMaxSize: ${SW_QUERY_GRAPHQL_SEGMENT_SIZE:200} h2: driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index 2a2fbfe..ed60ef2 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -68,7 +68,7 @@ storage: flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} -spanQueryMaxSize: ${SW_QUERY_GRAPHQL_SPAN_SIZE:200} +segmentQueryMaxSize: ${SW_QUERY_GRAPHQL_SEGMENT_SIZE:200} # h2: #driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} #url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java index d1b86bd..f7259a9 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java @@ -44,7 +44,7 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig { private String user; private String password; private int metadataQueryMaxSize = 5000; -private int spanQueryMaxSize = 200; +private int maxQuerySegmentSize = 200; public String getUser() { return user; @@ -166,11 +166,11 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig { this.metadataQueryMaxSize = metadataQueryMaxSize; } -public int getSpanQueryMaxSize() { -return spanQueryMaxSize; +public int getMaxQuerySegmentSize() { +return maxQuerySegmentSize; } -public void setSpanQueryMaxSize(int spanQueryMaxSize) { -this.spanQueryMaxSize = spanQueryMaxSize; +public void setMaxQuerySegmentSize(int
[skywalking] branch span_query_max_zie updated: fix
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch span_query_max_zie in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/span_query_max_zie by this push: new 00f031f fix 00f031f is described below commit 00f031f569fc1dcf081917e685c96d3dfd9b6224 Author: Jared.Tan AuthorDate: Fri Apr 26 22:41:28 2019 +0800 fix --- docker/config/application.yml| 2 +- oap-server/server-starter/src/main/assembly/application.yml | 2 +- oap-server/server-starter/src/main/resources/application.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/config/application.yml b/docker/config/application.yml index 44d79be..d1c9090 100644 --- a/docker/config/application.yml +++ b/docker/config/application.yml @@ -68,7 +68,7 @@ storage: flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} -segmentQueryMaxSize: ${SW_QUERY_GRAPHQL_SEGMENT_SIZE:200} +segmentQueryMaxSize: ${SW_STORAGE_ES_QUERY_SEGMENT_SIZE:200} # h2: #driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} #url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml index 5b09ff6..1f7a8cf 100644 --- a/oap-server/server-starter/src/main/assembly/application.yml +++ b/oap-server/server-starter/src/main/assembly/application.yml @@ -68,7 +68,7 @@ storage: #flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests #concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests #metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} -#segmentQueryMaxSize: ${SW_QUERY_GRAPHQL_SEGMENT_SIZE:200} +#segmentQueryMaxSize: ${SW_STORAGE_ES_QUERY_SEGMENT_SIZE:200} h2: driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index ed60ef2..4c6d232 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -68,7 +68,7 @@ storage: flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000} -segmentQueryMaxSize: ${SW_QUERY_GRAPHQL_SEGMENT_SIZE:200} +segmentQueryMaxSize: ${SW_STORAGE_ES_QUERY_SEGMENT_SIZE:200} # h2: #driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} #url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db}
[skywalking] branch span_query_max_zie updated: fix
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch span_query_max_zie in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/span_query_max_zie by this push: new 024bcb9 fix 024bcb9 is described below commit 024bcb97ea9371ef566d62d43b8626ccd274f82e Author: Jared.Tan AuthorDate: Fri Apr 26 22:43:54 2019 +0800 fix --- .../plugin/elasticsearch/StorageModuleElasticsearchConfig.java | 10 +- .../elasticsearch/StorageModuleElasticsearchProvider.java | 2 +- .../storage/plugin/elasticsearch/query/TraceQueryEsDAO.java| 8 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java index f7259a9..dffce36 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java @@ -44,7 +44,7 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig { private String user; private String password; private int metadataQueryMaxSize = 5000; -private int maxQuerySegmentSize = 200; +private int segmentQueryMaxSize = 200; public String getUser() { return user; @@ -166,11 +166,11 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig { this.metadataQueryMaxSize = metadataQueryMaxSize; } -public int getMaxQuerySegmentSize() { -return maxQuerySegmentSize; +public int getSegmentQueryMaxSize() { +return segmentQueryMaxSize; } -public void setMaxQuerySegmentSize(int maxQuerySegmentSize) { -this.maxQuerySegmentSize = maxQuerySegmentSize; +public void setSegmentQueryMaxSize(int segmentQueryMaxSize) { +this.segmentQueryMaxSize = segmentQueryMaxSize; } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java index de9ee53..a779921 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java @@ -115,7 +115,7 @@ public class StorageModuleElasticsearchProvider extends ModuleProvider { this.registerServiceImplementation(ITopologyQueryDAO.class, new TopologyQueryEsDAO(elasticSearchClient)); this.registerServiceImplementation(IMetricQueryDAO.class, new MetricQueryEsDAO(elasticSearchClient)); -this.registerServiceImplementation(ITraceQueryDAO.class, new TraceQueryEsDAO(elasticSearchClient, config.getSpanQueryMaxSize())); +this.registerServiceImplementation(ITraceQueryDAO.class, new TraceQueryEsDAO(elasticSearchClient, config.getSegmentQueryMaxSize())); this.registerServiceImplementation(IMetadataQueryDAO.class, new MetadataQueryEsDAO(elasticSearchClient, config.getMetadataQueryMaxSize())); this.registerServiceImplementation(IAggregationQueryDAO.class, new AggregationQueryEsDAO(elasticSearchClient)); this.registerServiceImplementation(IAlarmQueryDAO.class, new AlarmQueryEsDAO(elasticSearchClient)); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java index 404f00b..8a31bf7 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java @@ -48,11 +48,11 @@ import org.elasticsearch.search.sort.SortOrder; */ public class
[skywalking] branch span_query_max_zie deleted (was 024bcb9)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch span_query_max_zie in repository https://gitbox.apache.org/repos/asf/skywalking.git. was 024bcb9 fix The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking-website] branch asf-site updated (25b06d3 -> ec67403)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard 25b06d3 Update asf-site new ec67403 Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (25b06d3) \ N -- N -- N refs/heads/asf-site (ec67403) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 4 ++-- assets/js/{app.8e41142e.js => app.76312033.js} | 2 +- blog/2018-05-24-skywalking-net.html| 4 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html | 4 ++-- blog/2019-01-01-Understand-Trace.html | 4 ++-- blog/2019-01-25-mesh-loadtest.html | 4 ++-- blog/index.html| 4 ++-- downloads/index.html | 4 ++-- events/index.html | 4 ++-- index.html | 4 ++-- screenshots/6.1.0/dashboard-1.png | Bin 0 -> 337461 bytes screenshots/6.1.0/dashboard-2.png | Bin 0 -> 400596 bytes screenshots/6.1.0/topology.png | Bin 0 -> 332757 bytes screenshots/6.1.0/trace.png| Bin 0 -> 449391 bytes team/index.html| 4 ++-- zh/blog/2018-05-24-skywalking-net.html | 4 ++-- .../2018-12-18-Apache-SkyWalking-5-0-UserGuide.html| 4 ++-- .../2018-12-21-SkyWalking-apm-sniffer-beginning.html | 4 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html| 4 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 4 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html | 4 ++-- zh/blog/2019-01-03-monitor-microservice.html | 4 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 4 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html| 4 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html | 4 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html| 4 ++-- ...introduction-of-skywalking-and-simple-practice.html | 4 ++-- zh/blog/index.html | 4 ++-- zh/doc/index.html | 4 ++-- zh/downloads/index.html| 4 ++-- zh/events/index.html | 4 ++-- zh/index.html | 4 ++-- zh/team/index.html | 4 ++-- 33 files changed, 57 insertions(+), 57 deletions(-) rename assets/js/{app.8e41142e.js => app.76312033.js} (89%) create mode 100644 screenshots/6.1.0/dashboard-1.png create mode 100644 screenshots/6.1.0/dashboard-2.png create mode 100644 screenshots/6.1.0/topology.png create mode 100644 screenshots/6.1.0/trace.png
[skywalking] branch alarm-query updated (c5d25a9 -> 249a47f)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch alarm-query in repository https://gitbox.apache.org/repos/asf/skywalking.git. from c5d25a9 Fix bug about match query. new 4862c4f update git modules url (#2531) new 2dcf27b Update all "incubator-skywalking" to "skywalking" ,"incubator-servicecomb-java-chassis" to "servicecomb-java-chassis" correctly, and ".gitmodules" will update at #2531 (#2548) new 249a47f Merge branch 'master' into alarm-query The 4748 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmodules| 4 ++-- CHANGES.md | 10 +- README.md | 6 +++--- apm-dist/release-docs/README.txt | 8 apm-protocol/apm-network/src/main/proto| 2 +- .../mvc/commons/interceptor/AbstractMethodInterceptor.java | 4 ++-- .../spring/webflux/v5/AbstractMethodInterceptor.java | 4 ++-- docs/README.md | 2 +- docs/en/FAQ/Protoc-Plugin-Fails-When-Build.md | 2 +- docs/en/guides/How-to-build.md | 6 +++--- docs/en/guides/README.md | 10 +- docs/en/protocols/JVM-Protocol.md | 2 +- docs/en/protocols/Trace-Data-Protocol-v1.md| 14 +++--- docs/en/protocols/Trace-Data-Protocol-v2.md| 4 ++-- docs/en/setup/backend/backend-k8s.md | 2 +- docs/en/setup/backend/backend-ui-setup.md | 2 +- docs/en/setup/istio/README.md | 2 +- .../service-agent/java-agent/Customize-enhance-trace.md| 2 +- docs/en/setup/service-agent/java-agent/Supported-list.md | 2 +- .../server/library/util/PropertyPlaceholderHelperTest.java | 2 +- .../library-util/src/test/resources/application.yml| 2 +- tools/releasing/create_source_release.sh | 2 +- 22 files changed, 47 insertions(+), 47 deletions(-)
[skywalking] branch sqldb-alarm updated: add unit tests for alarm-plugin module (#2542)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch sqldb-alarm in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/sqldb-alarm by this push: new 4b19bd7 add unit tests for alarm-plugin module (#2542) new dde76a1 Merge branch 'master' into sqldb-alarm 4b19bd7 is described below commit 4b19bd77cf02831875d91a9b4084b890506f6ff0 Author: Ming Deng AuthorDate: Tue Apr 30 21:46:23 2019 +0800 add unit tests for alarm-plugin module (#2542) --- .../exporter/provider/grpc/GRPCExporterTest.java | 2 +- ...eIndicatior.java => MockIntValueIndicator.java} | 2 +- .../oap/server/core/alarm/provider/AlarmCore.java | 22 +- .../alarm/provider/AlarmModuleProviderTest.java| 86 +++ .../core/alarm/provider/NotifyHandlerTest.java | 253 + .../server/core/alarm/provider/ThresholdTest.java | 49 6 files changed, 400 insertions(+), 14 deletions(-) diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java index 8158756..f4fcca2 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java @@ -95,7 +95,7 @@ public class GRPCExporterTest { private List dataList() { List dataList = new LinkedList<>(); dataList.add(exporter.new ExportData(metaInfo, new MockIndicator())); -dataList.add(exporter.new ExportData(metaInfo, new MockIntValueIndicatior())); +dataList.add(exporter.new ExportData(metaInfo, new MockIntValueIndicator())); dataList.add(exporter.new ExportData(metaInfo, new MockLongValueIndicator())); dataList.add(exporter.new ExportData(metaInfo, new MockDoubleValueIndicator())); return dataList; diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueIndicatior.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueIndicator.java similarity index 92% rename from oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueIndicatior.java rename to oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueIndicator.java index cd3b927..509727f 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueIndicatior.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueIndicator.java @@ -23,7 +23,7 @@ import org.apache.skywalking.oap.server.core.analysis.indicator.IntValueHolder; /** * Created by dengming, 2019.04.20 */ -public class MockIntValueIndicatior extends MockIndicator implements IntValueHolder { +public class MockIntValueIndicator extends MockIndicator implements IntValueHolder { @Override public int getValue() { return 12; diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java index a0a735c..1b83b07 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java @@ -18,12 +18,6 @@ package org.apache.skywalking.oap.server.core.alarm.provider; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import org.apache.skywalking.oap.server.core.alarm.AlarmCallback; import org.apache.skywalking.oap.server.core.alarm.AlarmMessage; import org.joda.time.LocalDateTime; @@ -31,6 +25,13 @@ import org.joda.time.Minutes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; + /** * Alarm core includes metric values in certain time windows based on alarm settings. By using its internal timer * trigger and the alarm rules to decides whether send the alarm to database and webhook(s) @@ -50,11 +51,8 @@ public class AlarmCore { String indicatorName = rule.getIndicatorName(); -List runningRules = runningContext.get(indicatorName); -if (r
[skywalking] branch master updated: Fix query all scope in MySQL and H2 storage. (#2568)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 24393f3 Fix query all scope in MySQL and H2 storage. (#2568) 24393f3 is described below commit 24393f3b8dc2e3fcced224cd867fade60bf702f2 Author: 吴晟 Wu Sheng AuthorDate: Wed May 1 00:39:29 2019 +0800 Fix query all scope in MySQL and H2 storage. (#2568) --- .../oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 2 +- .../oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java index 5bcf69c..51092ad 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java @@ -45,8 +45,8 @@ public class H2AlarmQueryDAO implements IAlarmQueryDAO { List parameters = new ArrayList<>(10); sql.append("from ").append(AlarmRecord.INDEX_NAME).append(" where "); sql.append(" 1=1 "); -sql.append(" and ").append(AlarmRecord.SCOPE).append(" = ?"); if (Objects.nonNull(scopeId)) { +sql.append(" and ").append(AlarmRecord.SCOPE).append(" = ?"); parameters.add(scopeId.intValue()); } if (startTB != 0 && endTB != 0) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java index 7647b72..0bfe110 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java @@ -45,8 +45,8 @@ public class MySQLAlarmQueryDAO implements IAlarmQueryDAO { List parameters = new ArrayList<>(10); sql.append("from ").append(AlarmRecord.INDEX_NAME).append(" where "); sql.append(" 1=1 "); -sql.append(" and ").append(AlarmRecord.SCOPE).append(" = ?"); if (Objects.nonNull(scopeId)) { +sql.append(" and ").append(AlarmRecord.SCOPE).append(" = ?"); parameters.add(scopeId.intValue()); } if (startTB != 0 && endTB != 0) {
[skywalking] 01/01: add prometheus.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch prometheus_host_port in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 926cf7870fe667614ce2b0a2d1aacde4334dd1cb Author: Jared.Tan AuthorDate: Sun May 5 15:09:27 2019 +0800 add prometheus. --- oap-server/server-starter/src/main/assembly/application.yml | 4 oap-server/server-starter/src/main/resources/application.yml | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml index 1f7a8cf..49fa699 100644 --- a/oap-server/server-starter/src/main/assembly/application.yml +++ b/oap-server/server-starter/src/main/assembly/application.yml @@ -114,3 +114,7 @@ alarm: default: telemetry: none: +#exporter: +# grpc: +#targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1} +#targetPort: ${SW_EXPORTER_GRPC_PORT:9870} diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index 4c6d232..796d17c 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -118,7 +118,9 @@ alarm: default: telemetry: prometheus: +host: ${SW_TELEMETRY_PROMETHEUS_HOST:0.0.0.0} +port: ${SW_TELEMETRY_PROMETHEUS_PORT:1234} #exporter: # grpc: -#targetHost: 127.0.0.1 -#targetPort: 9870 +#targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1} +#targetPort: ${SW_EXPORTER_GRPC_PORT:9870}
[skywalking] branch prometheus_host_port created (now 926cf78)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch prometheus_host_port in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 926cf78 add prometheus. This branch includes the following new commits: new 926cf78 add prometheus. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] branch prometheus_host_port deleted (was 06f19c3)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch prometheus_host_port in repository https://gitbox.apache.org/repos/asf/skywalking.git. was 06f19c3 Merge branch 'master' into prometheus_host_port The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking] branch master updated: add prometheus. (#2580)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 4da0f48 add prometheus. (#2580) 4da0f48 is described below commit 4da0f486b5fec3d31ae59f58e4bb66528477077d Author: Jared Tan AuthorDate: Sun May 5 15:52:40 2019 +0800 add prometheus. (#2580) --- oap-server/server-starter/src/main/assembly/application.yml | 4 oap-server/server-starter/src/main/resources/application.yml | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml index 1f7a8cf..49fa699 100644 --- a/oap-server/server-starter/src/main/assembly/application.yml +++ b/oap-server/server-starter/src/main/assembly/application.yml @@ -114,3 +114,7 @@ alarm: default: telemetry: none: +#exporter: +# grpc: +#targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1} +#targetPort: ${SW_EXPORTER_GRPC_PORT:9870} diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml index 4c6d232..796d17c 100644 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -118,7 +118,9 @@ alarm: default: telemetry: prometheus: +host: ${SW_TELEMETRY_PROMETHEUS_HOST:0.0.0.0} +port: ${SW_TELEMETRY_PROMETHEUS_PORT:1234} #exporter: # grpc: -#targetHost: 127.0.0.1 -#targetPort: 9870 +#targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1} +#targetPort: ${SW_EXPORTER_GRPC_PORT:9870}
[skywalking-website] branch asf-site updated (ec67403 -> 6170dca)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git. discard ec67403 Update asf-site new 6170dca Update asf-site This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ec67403) \ N -- N -- N refs/heads/asf-site (6170dca) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 4 ++-- assets/js/18.169a58f9.js | 1 + assets/js/18.e0ceb69e.js | 1 - assets/js/19.0a8c93b7.js | 1 + assets/js/19.3cfb2e16.js | 1 - assets/js/27.1953d1d3.js | 1 + assets/js/27.f57a032d.js | 1 - assets/js/28.850abb34.js | 1 - assets/js/28.e1cdc4c9.js | 1 + assets/js/{app.76312033.js => app.4160f839.js}| 6 +++--- blog/2018-05-24-skywalking-net.html | 8 ++-- blog/2018-12-12-skywalking-service-mesh-ready.html| 8 ++-- blog/2019-01-01-Understand-Trace.html | 8 ++-- blog/2019-01-25-mesh-loadtest.html| 8 ++-- blog/index.html | 8 ++-- downloads/index.html | 11 --- events/index.html | 11 --- index.html| 10 +++--- team/index.html | 8 ++-- zh/blog/2018-05-24-skywalking-net.html| 8 ++-- zh/blog/2018-12-18-Apache-SkyWalking-5-0-UserGuide.html | 8 ++-- zh/blog/2018-12-21-SkyWalking-apm-sniffer-beginning.html | 8 ++-- zh/blog/2018-12-21-SkyWalking-source-code-read.html | 8 ++-- zh/blog/2019-01-02-Understand-trace-trans2cn.html | 8 ++-- zh/blog/2019-01-02-skywalking-elasticsearch-basic.html| 8 ++-- zh/blog/2019-01-03-monitor-microservice.html | 8 ++-- zh/blog/2019-01-21-agent-plugin-practice.html | 8 ++-- zh/blog/2019-01-24-skywalking-remote-debug.html | 8 ++-- zh/blog/2019-02-24-skywalking-pk-pinpoint.html| 8 ++-- zh/blog/2019-03-01-skywalking-troubleshoot.html | 8 ++-- ...-03-29-introduction-of-skywalking-and-simple-practice.html | 8 ++-- zh/blog/index.html| 8 ++-- zh/doc/index.html | 8 ++-- zh/downloads/index.html | 10 +++--- zh/events/index.html | 11 --- zh/index.html | 10 +++--- zh/team/index.html| 8 ++-- 37 files changed, 180 insertions(+), 69 deletions(-) create mode 100644 assets/js/18.169a58f9.js delete mode 100644 assets/js/18.e0ceb69e.js create mode 100644 assets/js/19.0a8c93b7.js delete mode 100644 assets/js/19.3cfb2e16.js create mode 100644 assets/js/27.1953d1d3.js delete mode 100644 assets/js/27.f57a032d.js delete mode 100644 assets/js/28.850abb34.js create mode 100644 assets/js/28.e1cdc4c9.js rename assets/js/{app.76312033.js => app.4160f839.js} (75%)
[skywalking] branch master updated: Update powered-by.md (#2595)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 6412811 Update powered-by.md (#2595) 6412811 is described below commit 6412811a0600dd45249d1f34c086a7f72eac8a22 Author: 吴晟 Wu Sheng AuthorDate: Mon May 6 10:11:51 2019 +0800 Update powered-by.md (#2595) Add lizhi.fm to user list --- docs/powered-by.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/powered-by.md b/docs/powered-by.md index b1afcc2..b9115b9 100644 --- a/docs/powered-by.md +++ b/docs/powered-by.md @@ -46,6 +46,7 @@ or providing commercial products including Apache SkyWalking. 1. laocaibao. 上海证大爱特金融信息服务有限公司 https://www.laocaibao.com/ 1. Lima 北京力码科技有限公司 https://www.zhongbaounion.com/ 1. Lifesense.com 广东乐心医疗电子股份有限公司 http://www.lifesense.com/ +1. lizhi.fm 荔枝FM https://www.lizhi.fm/ 1. Madecare. 北京美德远健科技有限公司. http://www.madecare.com/ 1. Maodou.com 毛豆新车网. https://www.maodou.com/ 1. Mobanker.com 上海前隆信息科技有限公司 http://www.mobanker.com/
[skywalking] branch wu-sheng-patch-1 deleted (was fd4b4bf)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch wu-sheng-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git. was fd4b4bf Update powered-by.md The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[skywalking] branch webflux_cat_exception created (now 965b6e0)
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a change to branch webflux_cat_exception in repository https://gitbox.apache.org/repos/asf/skywalking.git. at 965b6e0 fix cast eexception. This branch includes the following new commits: new 8e1d41f init netty http. new 965b6e0 fix cast eexception. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[skywalking] 01/02: init netty http.
This is an automated email from the ASF dual-hosted git repository. tanjian pushed a commit to branch webflux_cat_exception in repository https://gitbox.apache.org/repos/asf/skywalking.git commit 8e1d41f340e66425251b2d5c981a4e07de6bcf86 Author: Jared.Tan AuthorDate: Mon May 6 15:43:28 2019 +0800 init netty http. --- .../network/trace/component/ComponentsDefine.java | 41 + apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 1 + .../reactor-netty-http-client-0.8.x-plugin/pom.xml | 42 + .../http/client/DefaultHttpHeadersInterceptor.java | 31 +++ .../HttpClientOperationsHeadersInterceptor.java| 47 ++ .../HttpClientOperationsSendInterceptor.java | 86 ++ .../HttpClientOperationsStatusInterceptor.java | 56 .../define/DefaultHttpHeadersInstrumentation.java | 60 + .../HttpClientOperationsInstrumentation.java | 100 + .../src/main/resources/skywalking-plugin.def | 20 + .../src/main/resources/component-libraries.yml | 3 + 11 files changed, 468 insertions(+), 19 deletions(-) diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java index 2a31161..bd018b1 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java @@ -64,11 +64,11 @@ public class ComponentsDefine { public static final OfficialComponent SERVICECOMB = new OfficialComponent(28, "ServiceComb"); -public static final OfficialComponent HYSTRIX = new OfficialComponent(29, "Hystrix"); +public static final OfficialComponent HYSTRIX = new OfficialComponent(29, "Hystrix"); -public static final OfficialComponent JEDIS = new OfficialComponent(30, "Jedis"); +public static final OfficialComponent JEDIS = new OfficialComponent(30, "Jedis"); -public static final OfficialComponent H2_JDBC_DRIVER = new OfficialComponent(32, "jdbc-jdbc-driver"); +public static final OfficialComponent H2_JDBC_DRIVER = new OfficialComponent(32, "jdbc-jdbc-driver"); public static final OfficialComponent MYSQL_JDBC_DRIVER = new OfficialComponent(33, "mysql-connector-java"); @@ -90,31 +90,33 @@ public class ComponentsDefine { public static final OfficialComponent MONGO_DRIVER = new OfficialComponent(42, "mongodb-driver"); -public static final OfficialComponent SOFARPC = new OfficialComponent(43, "SOFARPC"); +public static final OfficialComponent SOFARPC = new OfficialComponent(43, "SOFARPC"); -public static final OfficialComponent ACTIVEMQ_PRODUCER = new OfficialComponent(45,"activemq-producer"); +public static final OfficialComponent ACTIVEMQ_PRODUCER = new OfficialComponent(45, "activemq-producer"); -public static final OfficialComponent ACTIVEMQ_CONSUMER = new OfficialComponent(46,"activemq-consumer"); +public static final OfficialComponent ACTIVEMQ_CONSUMER = new OfficialComponent(46, "activemq-consumer"); -public static final OfficialComponent TRANSPORT_CLIENT = new OfficialComponent(48, "transport-client"); +public static final OfficialComponent TRANSPORT_CLIENT = new OfficialComponent(48, "transport-client"); -public static final OfficialComponent UNDERTOW = new OfficialComponent(49, "Undertow"); +public static final OfficialComponent UNDERTOW = new OfficialComponent(49, "Undertow"); -public static final OfficialComponent RABBITMQ_PRODUCER = new OfficialComponent(52,"rabbitmq-producer"); +public static final OfficialComponent RABBITMQ_PRODUCER = new OfficialComponent(52, "rabbitmq-producer"); -public static final OfficialComponent RABBITMQ_CONSUMER = new OfficialComponent(53,"rabbitmq-consumer"); +public static final OfficialComponent RABBITMQ_CONSUMER = new OfficialComponent(53, "rabbitmq-consumer"); -public static final OfficialComponent CANAL = new OfficialComponent(54,"Canal"); - -public static final OfficialComponent GSON = new OfficialComponent(55,"Gson"); - -public static final OfficialComponent REDISSON = new OfficialComponent(56, "Redisson"); +public static final OfficialComponent CANAL = new OfficialComponent(54, "Canal"); -public static final OfficialComponent LETTUCE = new OfficialComponent(57, "Lettuce"); +public static final OfficialComponent GSON = new OfficialComponent(55, "Gson