Skip to content

Commit

Permalink
Merge branch 'master' into plugin/optionals
Browse files Browse the repository at this point in the history
  • Loading branch information
wu-sheng committed Oct 18, 2019
2 parents 4c45631 + bde6c13 commit 23a0ade
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 127 deletions.
4 changes: 2 additions & 2 deletions docs/en/guides/Java-Plugin-Development-Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ Please follow there steps:
1. Create sub modules under `apm-sniffer/apm-sdk-plugin` or `apm-sniffer/optional-plugins`, and the name should include supported library name and versions
1. Follow this guide to develop. Make sure comments and test cases are provided.
1. Develop and test.
1. Provide the automatic test cases. Read existing cases in `test/plugin/scenarios`, and add your new one.
1. Send the pull request and ask for review.
1. Provide the automatic test cases.
1. The plugin committers approve your plugins after automatic test cases provided and the tests passed in our CI.
1. The plugin committers approve your plugins, plugin CI-with-IT, e2e and plugin tests passed.
1. The plugin accepted by SkyWalking.
11 changes: 4 additions & 7 deletions docs/en/guides/backend-oal-scripts.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# Official OAL script
First, read [OAL introduction](../concepts-and-designs/oal.md).

Here is the official scrips is the `generated-analysis-x.y.z.jar/official_analysis.oal` file in distribution,
also the [official_analysis.oal](../../../oap-server/generated-analysis/src/main/resources/official_analysis.oal) in source code repository.
Find OAL script at the `/config/official_analysis.oal` of SkyWalking dist, since 6.3.
You could change it(such as adding filter condition, or add new metrics) and reboot the OAP server, then it will affect.

**Notice**, this file doesn't effect anything in runtime, although included in distribution.
You need to use OAL tool code generator to build the real analysis codes from it.
All generated codes are under `oal` folder in **oap-server/generated-analysis/target/generated-sources**.
All metrics named in this script could be used in alarm and UI query.

All metrics named in this script could be used in alarm and UI query. Of course, you can change this
scripts and re-generate the analysis process and metrics, such as adding filter condition.
Notice,

If you try to add or remove some metrics, UI may break, we only recommend you to do this when you plan
to build your own UI based on the customization analysis core.
11 changes: 9 additions & 2 deletions docs/en/setup/istio/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,12 @@ Follow the [deploying backend in kubernetes](../backend/backend-k8s.md) to insta

## Setup Istio to send metrics to oap

The SkyWalking uses Istio bypass adapter collects metrics. Use `kubectl apply -f` with the `yaml`(s) in [the yaml folder](yaml) to setup.

1. Install Istio metric template

`kubectl apply -f https://raw.githubusercontent.com/istio/istio/1.3.3/mixer/template/metric/template.yaml`

2. Install SkyWalking adapter

`kubectl apply -f skywalkingadapter.yml`

Find the `skywalkingadapter.yml` at [here](yaml/skywalkingadapter.yml).
24 changes: 0 additions & 24 deletions docs/en/setup/istio/yaml/01-metrictemplate.yml

This file was deleted.

26 changes: 0 additions & 26 deletions docs/en/setup/istio/yaml/02-skywalingadapter.yml

This file was deleted.

65 changes: 0 additions & 65 deletions docs/en/setup/istio/yaml/03-operator_cfg.yml

This file was deleted.

77 changes: 77 additions & 0 deletions docs/en/setup/istio/yaml/skywalkingadapter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

apiVersion: "config.istio.io/v1alpha2"
kind: adapter
metadata:
name: swadapter
namespace: istio-system
spec:
description:
session_based: false
templates:
- metric
---

apiVersion: "config.istio.io/v1alpha2"
kind: handler
metadata:
name: sw
namespace: istio-system
spec:
adapter: swadapter
connection:
address: "oap.skywalking.svc.cluster.local:11800"
---

# instance for template metric
apiVersion: "config.istio.io/v1alpha2"
kind: instance
metadata:
name: swmetric
namespace: istio-system
spec:
template: metric
params:
value: request.size | 0
dimensions:
sourceService: source.workload.name | ""
sourceNamespace: source.workload.namespace | ""
sourceUID: source.uid | ""
destinationService: destination.workload.name | ""
destinationNamespace: destination.workload.namespace | ""
destinationUID: destination.uid | ""
requestMethod: request.method | ""
requestPath: request.path | ""
requestScheme: request.scheme | ""
requestTime: request.time
responseTime: response.time
responseCode: response.code | 200
reporter: conditional((context.reporter.kind | "inbound") == "outbound", "source", "destination")
apiProtocol: api.protocol | ""
---

# rule to dispatch to handler sw
apiVersion: "config.istio.io/v1alpha2"
kind: rule
metadata:
name: swmetric-rule
namespace: istio-system
spec:
actions:
- handler: sw.istio-system
instances:
- swmetric
8 changes: 7 additions & 1 deletion docs/powered-by.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ or providing commercial products including Apache SkyWalking.
1. Youzan.com 杭州有赞科技有限公司 http://www.youzan.com/
1. zjs.com.cn 北京宅急送快运股份有限公司 http://www.zjs.com.cn/

# User Cases
# Use Cases
## Alibaba Cloud
Support SkyWalking agents and formats in Tracing Analysis cloud service.

Expand All @@ -120,6 +120,12 @@ Deploy SkyWalking in production environments.

Support 60+ Instances, Over 300k Calls Per Minute, Over 50k Spans Per Second

## guazi.com
Guazi.com uses SkyWalking monitoring 270+ services,
including topology + metrics analysis, and collecting 1.1+ billion traces per day with 100% sampling.

Plan is 1k+ services and 5 billion traces per day.

## Oscart
Use multiple language agents from SkyWalking and its ecosystem, including SkyWalking Javaagent and [SkyAPM nodejs agent](https://github.com/SkyAPM/SkyAPM-nodejs). SkyWalking OAP platform acts as backend and visualization.

Expand Down

0 comments on commit 23a0ade

Please sign in to comment.