You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/10/17 17:18:07 UTC
[skywalking] branch docs/istio created (now 7053f97)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch docs/istio
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 7053f97 Update istio docs according latest istio release
This branch includes the following new commits:
new 7053f97 Update istio docs according latest istio release
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: Update istio docs according latest istio release
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch docs/istio
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 7053f97e89c120d7b9a4005e565061c7fed85dfb
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Oct 18 01:17:23 2019 +0800
Update istio docs according latest istio release
---
docs/en/setup/istio/README.md | 9 ++-
docs/en/setup/istio/yaml/01-metrictemplate.yml | 24 --------
docs/en/setup/istio/yaml/02-skywalingadapter.yml | 26 --------
docs/en/setup/istio/yaml/03-operator_cfg.yml | 65 --------------------
docs/en/setup/istio/yaml/skywalingadapter.yml | 77 ++++++++++++++++++++++++
5 files changed, 84 insertions(+), 117 deletions(-)
diff --git a/docs/en/setup/istio/README.md b/docs/en/setup/istio/README.md
index f65b6a6..79ce436 100644
--- a/docs/en/setup/istio/README.md
+++ b/docs/en/setup/istio/README.md
@@ -13,5 +13,10 @@ 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.
-
\ No newline at end of file
+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 ./yaml/skywalkingadapter.yml`
diff --git a/docs/en/setup/istio/yaml/01-metrictemplate.yml b/docs/en/setup/istio/yaml/01-metrictemplate.yml
deleted file mode 100755
index 45e814e..0000000
--- a/docs/en/setup/istio/yaml/01-metrictemplate.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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: template
-metadata:
- name: metric
- namespace: istio-system
-spec:
- descriptor: "CsD3AgogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG8SD2dvb2dsZS5wcm90b2J1ZiJNChFGaWxlRGVzY3JpcHRvclNldBI4CgRmaWxlGAEgAygLMiQuZ29vZ2xlLnByb3RvYnVmLkZpbGVEZXNjcmlwdG9yUHJvdG9SBGZpbGUi5AQKE0ZpbGVEZXNjcmlwdG9yUHJvdG8SEgoEbmFtZRgBIAEoCVIEbmFtZRIYCgdwYWNrYWdlGAIgASgJUgdwYWNrYWdlEh4KCmRlcGVuZGVuY3kYAyADKAlSCmRlcGVuZGVuY3kSKwoRcHVibGljX2RlcGVuZGVuY3kYCiADKAVSEHB1YmxpY0RlcGVuZGVuY3kSJwoPd2Vha19kZXBlbmRlbmN5GAsgAygFUg53ZWFrRGVwZW5kZW5jeRJDCgxtZXNzYWdlX3R5cGUYBCADKAsyIC5nb29nbGUucHJvd [...]
----
\ No newline at end of file
diff --git a/docs/en/setup/istio/yaml/02-skywalingadapter.yml b/docs/en/setup/istio/yaml/02-skywalingadapter.yml
deleted file mode 100755
index d98ef2f..0000000
--- a/docs/en/setup/istio/yaml/02-skywalingadapter.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
diff --git a/docs/en/setup/istio/yaml/03-operator_cfg.yml b/docs/en/setup/istio/yaml/03-operator_cfg.yml
deleted file mode 100755
index bb73968..0000000
--- a/docs/en/setup/istio/yaml/03-operator_cfg.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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: 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
diff --git a/docs/en/setup/istio/yaml/skywalingadapter.yml b/docs/en/setup/istio/yaml/skywalingadapter.yml
new file mode 100755
index 0000000..b34aedf
--- /dev/null
+++ b/docs/en/setup/istio/yaml/skywalingadapter.yml
@@ -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