You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/11/21 11:15:02 UTC
[skywalking-showcase] branch feature/istiod updated (c268026 -> 7e1c599)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch feature/istiod
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git.
discard c268026 Overhaul istio monitor feature
new 7e1c599 Overhaul istio control plane monitor feature
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 (c268026)
\
N -- N -- N refs/heads/feature/istiod (7e1c599)
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:
[skywalking-showcase] 01/01: Overhaul istio control plane monitor feature
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch feature/istiod
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit 7e1c5997b02279e3055b667bfa23d4645c0a0656
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sun Nov 21 19:14:23 2021 +0800
Overhaul istio control plane monitor feature
---
deploy/platform/kubernetes/Makefile.in | 2 +-
.../feature-istiod-monitor/open-telemetry.yaml | 93 ++++++++++++++++++++++
.../permissions.yaml} | 36 +++++++--
.../feature-kubernetes-monitor/open-telemetry.yaml | 34 --------
docs/readme.md | 1 +
5 files changed, 126 insertions(+), 40 deletions(-)
diff --git a/deploy/platform/kubernetes/Makefile.in b/deploy/platform/kubernetes/Makefile.in
index 85bc910..4a47a8e 100644
--- a/deploy/platform/kubernetes/Makefile.in
+++ b/deploy/platform/kubernetes/Makefile.in
@@ -21,4 +21,4 @@
NAMESPACE ?= default
AGENTLESS ?= false
-FEATURE_FLAGS ?= agent,cluster,kubernetes-monitor,so11y,vm,als,event
+FEATURE_FLAGS ?= agent,cluster,kubernetes-monitor,so11y,vm,als,event,istiod-monitor
diff --git a/deploy/platform/kubernetes/feature-istiod-monitor/open-telemetry.yaml b/deploy/platform/kubernetes/feature-istiod-monitor/open-telemetry.yaml
new file mode 100644
index 0000000..cb91113
--- /dev/null
+++ b/deploy/platform/kubernetes/feature-istiod-monitor/open-telemetry.yaml
@@ -0,0 +1,93 @@
+# 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.
+#
+
+# @feature: istio-monitor; set OpenTelemetry config to scrape the Istio control plane metrics
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: otel-collector-conf-istio-monitor
+ labels:
+ app: otel-istio-monitor
+data:
+ otel-collector-config: |
+ service:
+ pipelines:
+ metrics:
+ receivers: [ prometheus ]
+ exporters: [ logging, opencensus ]
+ exporters:
+ opencensus:
+ endpoint: "oap:11800"
+ insecure: true
+ logging:
+ loglevel: debug
+ receivers:
+ prometheus:
+ config:
+ scrape_configs:
+ # @feature: istiod-monitor; configuration to scrape Istio control plane metrics
+ - job_name: 'istiod-monitor'
+ kubernetes_sd_configs:
+ - role: endpoints
+ relabel_configs:
+ - source_labels: [__meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
+ action: keep
+ regex: istiod;http-monitoring
+ - action: labelmap
+ regex: __meta_kubernetes_service_label_(.+)
+ - source_labels: []
+ target_label: cluster
+ replacement: skywalking-showcase
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: otel-deployment-istio-monitor
+ labels:
+ app: otel-istio-monitor
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: otel-istio-monitor
+ template:
+ metadata:
+ labels:
+ app: otel-istio-monitor
+ annotations:
+ sidecar.istio.io/inject: "false"
+ spec:
+ serviceAccountName: otel-sa-istio-monitor
+ containers:
+ - name: otel-istio-monitor
+ image: otel/opentelemetry-collector:0.29.0
+ command:
+ - "/otelcol"
+ - "--config=/conf/otel-collector-config.yaml"
+ volumeMounts:
+ - name: otel-collector-config-vol-istio-monitor
+ mountPath: /conf
+ volumes:
+ - name: otel-collector-config-vol-istio-monitor
+ configMap:
+ name: otel-collector-conf-istio-monitor
+ items:
+ - key: otel-collector-config
+ path: otel-collector-config.yaml
diff --git a/deploy/platform/kubernetes/Makefile.in b/deploy/platform/kubernetes/feature-istiod-monitor/permissions.yaml
similarity index 53%
copy from deploy/platform/kubernetes/Makefile.in
copy to deploy/platform/kubernetes/feature-istiod-monitor/permissions.yaml
index 85bc910..90e67bc 100644
--- a/deploy/platform/kubernetes/Makefile.in
+++ b/deploy/platform/kubernetes/feature-istiod-monitor/permissions.yaml
@@ -15,10 +15,36 @@
# specific language governing permissions and limitations
# under the License.
#
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: otel-sa-istio-monitor
-.EXPORT_ALL_VARIABLES:
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ name: otel-role-istio-monitor
+rules:
+ - apiGroups: [ "" ]
+ resources:
+ # @feature: istio-monitor; permissions to read resources
+ - "endpoints"
+ - "pods"
+ - "services"
+ verbs: [ "get", "watch", "list" ]
-NAMESPACE ?= default
-AGENTLESS ?= false
-
-FEATURE_FLAGS ?= agent,cluster,kubernetes-monitor,so11y,vm,als,event
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+ name: otel-role-binding-istio-monitor
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: otel-role-istio-monitor
+subjects:
+ - kind: ServiceAccount
+ name: otel-sa-istio-monitor
+ namespace: ${NAMESPACE}
diff --git a/deploy/platform/kubernetes/feature-kubernetes-monitor/open-telemetry.yaml b/deploy/platform/kubernetes/feature-kubernetes-monitor/open-telemetry.yaml
index 1a45e96..ba92040 100644
--- a/deploy/platform/kubernetes/feature-kubernetes-monitor/open-telemetry.yaml
+++ b/deploy/platform/kubernetes/feature-kubernetes-monitor/open-telemetry.yaml
@@ -41,40 +41,6 @@ data:
prometheus:
config:
scrape_configs:
- # @feature: kubernetes-monitor; configuration to scrape Kubernetes Pods metrics
- - job_name: kubernetes-pods
- kubernetes_sd_configs:
- - role: pod
- relabel_configs:
- - source_labels: []
- target_label: cluster
- replacement: skywalking-showcase
- - action: keep
- regex: true
- source_labels:
- - __meta_kubernetes_pod_annotation_prometheus_io_scrape
- - action: replace
- regex: (.+)
- source_labels:
- - __meta_kubernetes_pod_annotation_prometheus_io_path
- target_label: __metrics_path__
- - action: replace
- regex: ([^:]+)(?::\d+)?;(\d+)
- replacement: $$1:$$2
- source_labels:
- - __address__
- - __meta_kubernetes_pod_annotation_prometheus_io_port
- target_label: __address__
- - action: labelmap
- regex: __meta_kubernetes_pod_label_(.+)
- - action: replace
- source_labels:
- - __meta_kubernetes_namespace
- target_label: kubernetes_namespace
- - action: replace
- source_labels:
- - __meta_kubernetes_pod_name
- target_label: kubernetes_pod_name
# @feature: kubernetes-monitor; configuration to scrape Kubernetes Nodes metrics
- job_name: 'kubernetes-cadvisor'
scheme: https
diff --git a/docs/readme.md b/docs/readme.md
index d17d1f8..1b648d2 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -83,6 +83,7 @@ Currently, the features supported are:
| `vm` | Start 2 virtual machines and export their metrics to SkyWalking. | The "virtual machines" are mimicked by Docker containers or Pods. |
| `als` | Start microservices WITHOUT SkyWalking agent enabled, and configure SkyWalking to analyze the topology and metrics from their access logs. | Command `istioctl` is required to run this feature. The agentless microservices will be running at namespace `${NAMESPACE}-agentless` |
| `kubernetes-monitor` | Deploy OpenTelemetry and export Kubernetes monitoring metrics to SkyWalking for analysis and display on UI. | |
+| `istiod-monitor` | Deploy OpenTelemetry and export Istio control plane metrics to SkyWalking for analysis and display on UI. | |
| `event` | Deploy tools to trigger events, and SkyWalking Kubernetes event exporter to export events into SkyWalking. | |
### Kubernetes