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 2018/10/26 08:05:09 UTC
[incubator-skywalking] branch deploy/docker created (now e9ac4f2)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch deploy/docker
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
at e9ac4f2 Refactor kubernetes config
This branch includes the following new commits:
new 863f7d4 Merge remote-tracking branch 'origin/master'
new 841c1f8 Merge remote-tracking branch 'origin/master'
new 35cafaf Merge remote-tracking branch 'origin/master'
new e9ac4f2 Refactor kubernetes config
The 4 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.
[incubator-skywalking] 03/04: Merge remote-tracking branch
'origin/master'
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch deploy/docker
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 35cafaf344ce1183762656237e1a6b3ed49a304d
Merge: 841c1f8 d9556c3
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Oct 26 15:57:46 2018 +0800
Merge remote-tracking branch 'origin/master'
.../apm/commons/datacarrier/DataCarrier.java | 10 +-
.../commons/datacarrier/consumer/ConsumerPool.java | 9 +-
.../datacarrier/consumer/ConsumerPoolTest.java | 4 +-
.../analysis/indicator/ThermodynamicIndicator.java | 18 +-
.../analysis/worker/IndicatorAggregateWorker.java | 16 +-
.../analysis/worker/IndicatorPersistentWorker.java | 19 +-
.../core/analysis/worker/IndicatorProcess.java | 4 +-
.../analysis/worker/IndicatorRemoteWorker.java | 8 +-
.../core/analysis/worker/PersistenceWorker.java | 2 +-
.../register/service/ServiceInventoryRegister.java | 1 +
.../register/worker/RegisterDistinctWorker.java | 6 +-
.../register/worker/RegisterPersistentWorker.java | 49 +++++-
.../core/remote/client/GRPCRemoteClient.java | 2 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 21 ++-
.../indicator/ThermodynamicIndicatorTest.java | 10 +-
.../handler/IstioTelemetryHandlerMainTest.java | 86 +++++++++
.../fixture/01-ingress-reviewsv1-policy.msg | 193 +++++++++++++++++++++
.../fixture/02-productpage-details-policy.msg | 193 +++++++++++++++++++++
.../resources/fixture/03-productpage-details.msg | 193 +++++++++++++++++++++
.../resources/fixture/04-productpage-details.msg | 105 +++++++++++
.../resources/fixture/05-productpage-reviews.msg | 105 +++++++++++
.../resources/fixture/06-productpage-reviews.msg | 105 +++++++++++
.../resources/fixture/07-ingress-productpage.msg | 105 +++++++++++
.../resources/fixture/08-ingress-productpage.msg | 105 +++++++++++
.../test/resources/fixture/09-policy-telemetry.msg | 105 +++++++++++
.../test/resources/fixture/10-policy-telemetry.msg | 105 +++++++++++
.../resources/fixture/11-details-telemetry.msg | 105 +++++++++++
.../fixture/12-ingress-productpage-telemetry.msg | 193 +++++++++++++++++++++
.../resources/fixture/13-productpage-telemetry.msg | 105 +++++++++++
.../fixture/14-reviews-productpage-telemetry.msg | 193 +++++++++++++++++++++
.../receiver/mesh/MeshDataBufferFileCache.java | 2 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 47 ++++-
.../src/main/resources/component-libraries.yml | 6 +
.../elasticsearch/base/BatchProcessEsDAO.java | 2 +
.../elasticsearch/query/MetricQueryEsDAO.java | 2 +-
35 files changed, 2185 insertions(+), 49 deletions(-)
[incubator-skywalking] 02/04: Merge remote-tracking branch
'origin/master'
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch deploy/docker
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 841c1f8bbf6ee5ee048ba79960593487d47f6887
Merge: 863f7d4 24e958f
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Oct 26 11:37:08 2018 +0800
Merge remote-tracking branch 'origin/master'
.../oap/server/core/register/EndpointInventory.java | 2 +-
.../oap/server/core/register/NetworkAddressInventory.java | 2 +-
.../oap/server/core/register/ServiceInstanceInventory.java | 2 +-
.../oap/server/core/register/ServiceInventory.java | 2 +-
.../skywalking/oap/server/core/source/DetectPoint.java | 2 +-
.../oap/server/receiver/trace/mock/AgentDataMock.java | 12 ++++++------
.../storage/plugin/elasticsearch/query/MetricQueryEsDAO.java | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
[incubator-skywalking] 01/04: Merge remote-tracking branch
'origin/master'
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch deploy/docker
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 863f7d4f6cc0d43eaa3289ddb00e21fee9764fb5
Merge: 987ec86 6c92fc5
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Oct 25 11:32:05 2018 +0800
Merge remote-tracking branch 'origin/master'
docs/en/concepts-and-designs/scope-definitions.md | 3 +
.../oap/server/core/CoreModuleProvider.java | 2 +
.../server/core/analysis/DispatcherManager.java | 4 -
.../EndpointCallRelationDispatcher.java | 2 +
.../EndpointRelationServerSideIndicator.java | 22 +++
.../manual/service/ServiceComponentDispatcher.java | 42 ------
.../manual/service/ServiceComponentIndicator.java | 157 --------------------
.../manual/service/ServiceMappingDispatcher.java | 42 ------
.../manual/service/ServiceMappingIndicator.java | 160 ---------------------
.../ServiceCallRelationDispatcher.java | 4 +
.../ServiceRelationClientSideIndicator.java | 22 +++
.../ServiceRelationServerSideIndicator.java | 22 +++
.../oap/server/core/cache/CacheUpdateTimer.java | 71 +++++++++
.../config/ComponentLibraryCatalogService.java | 6 +-
.../config/IComponentLibraryCatalogService.java | 2 +-
.../oap/server/core/query/TopologyBuilder.java | 131 ++++++-----------
.../server/core/query/TopologyQueryService.java | 63 ++++----
.../oap/server/core/query/entity/Call.java | 1 +
.../core/register/NetworkAddressInventory.java | 12 --
.../oap/server/core/register/RegisterSource.java | 2 +-
.../oap/server/core/register/ServiceInventory.java | 21 +++
.../service/INetworkAddressInventoryRegister.java | 2 -
.../service/IServiceInventoryRegister.java | 4 +-
.../service/NetworkAddressInventoryRegister.java | 24 +---
.../register/service/ServiceInventoryRegister.java | 18 ++-
.../oap/server/core/source/EndpointRelation.java | 7 +-
.../skywalking/oap/server/core/source/Scope.java | 1 -
.../oap/server/core/source/ServiceComponent.java | 43 ------
.../core/source/ServiceInstanceRelation.java | 3 +-
.../oap/server/core/source/ServiceMapping.java | 42 ------
.../oap/server/core/source/ServiceRelation.java | 7 +-
.../storage/cache/IServiceInventoryCacheDAO.java | 3 +
.../core/storage/query/ITopologyQueryDAO.java | 5 -
.../config/ComponentLibraryCatalogFileTest.java | 2 +-
.../trace/provider/TraceModuleProvider.java | 3 +-
.../listener/endpoint/MultiScopesSpanListener.java | 13 +-
.../parser/listener/endpoint/SourceBuilder.java | 4 +
.../service/ServiceComponentSpanListener.java | 77 ----------
.../service/ServiceMappingSpanListener.java | 41 +++---
.../parser/standardization/SpanIdExchanger.java | 4 -
.../server/receiver/trace/mock/AgentDataMock.java | 41 ++++--
.../server/receiver/trace/mock/RegisterMock.java | 117 +++------------
.../mock/{ConsumerMock.java => ServiceAMock.java} | 103 ++++---------
.../mock/{ProviderMock.java => ServiceBMock.java} | 91 ++++++++----
.../mock/{ProviderMock.java => ServiceCMock.java} | 97 ++++++-------
.../cache/ServiceInventoryCacheEsDAO.java | 29 +++-
.../elasticsearch/query/MetadataQueryEsDAO.java | 13 +-
.../elasticsearch/query/TopologyQueryEsDAO.java | 111 ++++----------
48 files changed, 566 insertions(+), 1130 deletions(-)
[incubator-skywalking] 04/04: Refactor kubernetes config
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch deploy/docker
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit e9ac4f2b2ea5bc7ec0a5a843a7d4483b5cd7f670
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Oct 26 16:04:39 2018 +0800
Refactor kubernetes config
---
kubernetes/oap/{01-service.yml => 00-rbac.yml} | 37 ++-
kubernetes/oap/01-config.yml | 338 +++++++++++++++++++++++++
kubernetes/oap/01-service.yml | 1 -
kubernetes/oap/02-deployment.yml | 14 +-
4 files changed, 373 insertions(+), 17 deletions(-)
diff --git a/kubernetes/oap/01-service.yml b/kubernetes/oap/00-rbac.yml
similarity index 65%
copy from kubernetes/oap/01-service.yml
copy to kubernetes/oap/00-rbac.yml
index 4dcef42..95a989b 100644
--- a/kubernetes/oap/01-service.yml
+++ b/kubernetes/oap/00-rbac.yml
@@ -14,19 +14,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-kind: Service
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
metadata:
- name: oap
+ name: skywalking-oap
namespace: skywalking
- labels:
- service: oap
-spec:
- clusterIP: None
- ports:
- - port: 12800
- name: rest
- - port: 11800
- name: grpc
- selector:
- app: oap
\ No newline at end of file
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: skywalking-oap
+subjects:
+- kind: ServiceAccount
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ namespace: skywalking
+ name: skywalking-oap
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["watch", "list"]
\ No newline at end of file
diff --git a/kubernetes/oap/01-config.yml b/kubernetes/oap/01-config.yml
new file mode 100644
index 0000000..b8aa585
--- /dev/null
+++ b/kubernetes/oap/01-config.yml
@@ -0,0 +1,338 @@
+# 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: v1
+kind: ConfigMap
+metadata:
+ name: oap-config
+ namespace: skywalking
+data:
+ application.yml: |-
+ cluster:
+ kubernetes:
+ watchTimeoutSeconds: 60
+ namespace: default
+ labelSelector: app=oap
+ uidEnvName: SKYWALKING_COLLECTOR_UID
+ core:
+ default:
+ restHost: 0.0.0.0
+ restPort: 12800
+ restContextPath: /
+ gRPCHost: 0.0.0.0
+ gRPCPort: 11800
+ downsampling:
+ - Hour
+ - Day
+ - Month
+ recordDataTTL: 90 # Unit is minute
+ minuteMetricsDataTTL: 90 # Unit is minute
+ hourMetricsDataTTL: 36 # Unit is hour
+ dayMetricsDataTTL: 45 # Unit is day
+ monthMetricsDataTTL: 18 # Unit is month
+ storage:
+ elasticsearch:
+ clusterNodes: localhost:9200
+ indexShardsNumber: 2
+ indexReplicasNumber: 0
+ bulkActions: 2000 # Execute the bulk every 2000 requests
+ bulkSize: 20 # flush the bulk every 20mb
+ flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
+ concurrentRequests: 2 # the number of concurrent requests
+ receiver-register:
+ default:
+ receiver-trace:
+ default:
+ bufferPath: /trace-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ receiver-jvm:
+ default:
+ service-mesh:
+ default:
+ bufferPath: /mesh-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ istio-telemetry:
+ default:
+ query:
+ graphql:
+ path: /graphql
+ alarm:
+ default:
+
+ log4j2.xml: |--
+ <Configuration status="INFO">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <logger name="org.eclipse.jetty" level="INFO"/>
+ <logger name="org.apache.zookeeper" level="INFO"/>
+ <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
+ <logger name="io.grpc.netty" level="INFO"/>
+ <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+ </Configuration>
+
+ alarm-settings.yml: |-
+ rules:
+ service_resp_time_rule:
+ indicator-name: service_resp_time
+ include-names:
+ - dubbox-provider
+ - dubbox-consumer
+ threshold: 1000
+ op: ">"
+ period: 10
+ count: 1
+ webhooks:
+
+ component-libraries.yml: |-
+ Tomcat:
+ id: 1
+ languages: Java
+ HttpClient:
+ id: 2
+ languages: Java,C#,Node.js
+ Dubbo:
+ id: 3
+ languages: Java
+ H2:
+ id: 4
+ languages: Java
+ Mysql:
+ id: 5
+ languages: Java,C#,Node.js
+ ORACLE:
+ id: 6
+ languages: Java
+ Redis:
+ id: 7
+ languages: Java,C#,Node.js
+ Motan:
+ id: 8
+ languages: Java
+ MongoDB:
+ id: 9
+ languages: Java,C#,Node.js
+ Resin:
+ id: 10
+ languages: Java
+ Feign:
+ id: 11
+ languages: Java
+ OKHttp:
+ id: 12
+ languages: Java
+ SpringRestTemplate:
+ id: 13
+ languages: Java
+ SpringMVC:
+ id: 14
+ languages: Java
+ Struts2:
+ id: 15
+ languages: Java
+ NutzMVC:
+ id: 16
+ languages: Java
+ NutzHttp:
+ id: 17
+ languages: Java
+ JettyClient:
+ id: 18
+ languages: Java
+ JettyServer:
+ id: 19
+ languages: Java
+ Memcached:
+ id: 20
+ languages: Java
+ ShardingJDBC:
+ id: 21
+ languages: Java
+ PostgreSQL:
+ id: 22
+ languages: Java,C#,Node.js
+ GRPC:
+ id: 23
+ languages: Java
+ ElasticJob:
+ id: 24
+ languages: Java
+ RocketMQ:
+ id: 25
+ languages: Java
+ httpasyncclient:
+ id: 26
+ languages: Java
+ Kafka:
+ id: 27
+ languages: Java
+ ServiceComb:
+ id: 28
+ languages: Java
+ Hystrix:
+ id: 29
+ languages: Java
+ Jedis:
+ id: 30
+ languages: Java
+ SQLite:
+ id: 31
+ languages: Java,C#
+ h2-jdbc-driver:
+ id: 32
+ languages: Java
+ mysql-connector-java:
+ id: 33
+ languages: Java
+ Spymemcached:
+ id: 35
+ languages: Java
+ Xmemcached:
+ id: 36
+ languages: Java
+ postgresql-jdbc-driver:
+ id: 37
+ languages: Java
+ rocketMQ-producer:
+ id: 38
+ languages: Java
+ rocketMQ-consumer:
+ id: 39
+ languages: Java
+ kafka-producer:
+ id: 40
+ languages: Java
+ kafka-consumer:
+ id: 41
+ languages: Java
+ mongodb-driver:
+ id: 42
+ languages: Java
+ SOFARPC:
+ id: 43
+ languages: Java
+ ActiveMQ:
+ id: 44
+ languages: Java
+ activemq-producer:
+ id: 45
+ languages: Java
+ activemq-consumer:
+ id: 46
+ languages: Java
+ Elasticsearch:
+ id: 47
+ languages: Java
+ transport-client:
+ id: 48
+ languages: Java
+ AspNetCore:
+ id: 3001
+ languages: C#
+ EntityFrameworkCore:
+ id: 3002
+ languages: C#
+ SqlClient:
+ id: 3003
+ languages: C#
+ CAP:
+ id: 3004
+ languages: C#
+ StackExchange.Redis:
+ id: 3005
+ languages: C#
+ SqlServer:
+ id: 3006
+ languages: C#
+ Npgsql:
+ id: 3007
+ languages: C#
+ MySqlConnector:
+ id: 3008
+ languages: C#
+ EntityFrameworkCore.InMemory:
+ id: 3009
+ languages: C#
+ EntityFrameworkCore.SqlServer:
+ id: 3010
+ languages: C#
+ EntityFrameworkCore.Sqlite:
+ id: 3011
+ languages: C#
+ Pomelo.EntityFrameworkCore.MySql:
+ id: 3012
+ languages: C#
+ Npgsql.EntityFrameworkCore.PostgreSQL:
+ id: 3013
+ languages: C#
+ InMemoryDatabase:
+ id: 3014
+ languages: C#
+ AspNet:
+ id: 3015
+ languages: C#
+
+ # NoeJS components
+ # [4000, 5000) for Node.js agent
+ HttpServer:
+ id: 4001
+ languages: Node.js
+ express:
+ id: 4002
+ languages: Node.js
+ Egg:
+ id: 4003
+ languages: Node.js
+ Koa:
+ id: 4004
+ languages: Node.js
+ Component-Server-Mappings:
+ mongodb-driver: MongoDB
+ rocketMQ-producer: RocketMQ
+ rocketMQ-consumer: RocketMQ
+ kafka-producer: Kafka
+ kafka-consumer: Kafka
+ activemq-producer: ActiveMQ
+ activemq-consumer: ActiveMQ
+ postgresql-jdbc-driver: PostgreSQL
+ Xmemcached: Memcached
+ Spymemcached: Memcached
+ h2-jdbc-driver: H2
+ mysql-connector-java: Mysql
+ Jedis: Redis
+ StackExchange.Redis: Redis
+ SqlClient: SqlServer
+ Npgsql: PostgreSQL
+ MySqlConnector: Mysql
+ EntityFrameworkCore.InMemory: InMemoryDatabase
+ EntityFrameworkCore.SqlServer: SqlServer
+ EntityFrameworkCore.Sqlite: SQLite
+ Pomelo.EntityFrameworkCore.MySql: Mysql
+ Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
+ transport-client: Elasticsearch
+
+
diff --git a/kubernetes/oap/01-service.yml b/kubernetes/oap/01-service.yml
index 4dcef42..34c9586 100644
--- a/kubernetes/oap/01-service.yml
+++ b/kubernetes/oap/01-service.yml
@@ -22,7 +22,6 @@ metadata:
labels:
service: oap
spec:
- clusterIP: None
ports:
- port: 12800
name: rest
diff --git a/kubernetes/oap/02-deployment.yml b/kubernetes/oap/02-deployment.yml
index e0d4344..72be02a 100644
--- a/kubernetes/oap/02-deployment.yml
+++ b/kubernetes/oap/02-deployment.yml
@@ -22,7 +22,7 @@ metadata:
labels:
app: oap
spec:
- replicas: 1
+ replicas: 3
selector:
matchLabels:
app: oap
@@ -31,6 +31,9 @@ spec:
labels:
app: oap
spec:
+ serviceAccountName: skywalking-oap
+ automountServiceAccountToken: false
+ spec:
containers:
- name: oap
image: us.gcr.io/skywalking-live-demo/skywalking/oap:latest
@@ -46,4 +49,11 @@ spec:
memory: 2Gi
env:
- name: JAVA_OPTS
- value: -Xms256M -Xmx512M
\ No newline at end of file
+ value: -Xms256M -Xmx512M
+ volumeMounts:
+ - name: config
+ mountPath: /apache-skywalking-apm-incubating/config
+ volumes:
+ - name: config
+ configMap:
+ name: oap-config
\ No newline at end of file