[skywalking] branch master updated: Add one new layers for k8s (#8732)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng 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 e0be87b  Add one new layers for k8s (#8732)
e0be87b is described below

commit e0be87b8a18904afa671330e0d76e74d5937cbc9
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Mar 24 08:03:30 2022 +0800

    Add one new layers for k8s (#8732)
---
 CHANGES.md                                               | 16 ++++++++--------
 .../skywalking/oap/server/core/analysis/Layer.java       | 11 ++++++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 038cf5b..d1f6c88 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -99,8 +99,8 @@ Release Notes.
 * Expose more ElasticSearch health check related logs to help to
   diagnose `Health check fails. reason: No healthy endpoint`.
 * Add source `event` generated metrics to SERVICE_CATALOG_NAME catalog.
-* [**Break Change**] Deprecate `All` from OAL source.
-* [**Break Change**] Remove `SRC_ALL: 'All'` from OAL grammar tree.
+* [**Breaking Change**] Deprecate `All` from OAL source.
+* [**Breaking Change**] Remove `SRC_ALL: 'All'` from OAL grammar tree.
 * Remove `all_heatmap` and `all_percentile` metrics.
 * Fix ElasticSearch normal index couldn't apply mapping and update.
 * Enhance DataCarrier#MultipleChannelsConsumer to add priority for the channels, which makes OAP server has a better
@@ -109,17 +109,17 @@ Release Notes.
 * Activate `satellite,spring-sleuth` for `agent-analyzer#meterAnalyzerActiveFiles`  on default.
 * Activate `receiver-zabbix` receiver with `agent` rule on default.
 * Replace HTTP server (GraphQL, agent HTTP protocol) from Jetty with Armeria.
-* [**Break Change**] Remove configuration `restAcceptorPriorityDelta` (env var: `SW_RECEIVER_SHARING_JETTY_DELTA`
+* [**Breaking Change**] Remove configuration `restAcceptorPriorityDelta` (env var: `SW_RECEIVER_SHARING_JETTY_DELTA`
   , `SW_CORE_REST_JETTY_DELTA`).
-* [**Break Change**] Remove configuration `graphql/path` (env var: `SW_QUERY_GRAPHQL_PATH`).
+* [**Breaking Change**] Remove configuration `graphql/path` (env var: `SW_QUERY_GRAPHQL_PATH`).
 * Add storage column attribute `indexOnly`, support ElasticSearch only index and not store some fields.
 * Add `indexOnly=true` to `SegmentRecord.tags`, `AlarmRecord.tags`, `AbstractLogRecord.tags`, to reduce unnecessary
   storage.
-* [**Break Change**] Remove configuration `restMinThreads` (env var: `SW_CORE_REST_JETTY_MIN_THREADS`
+* [**Breaking Change**] Remove configuration `restMinThreads` (env var: `SW_CORE_REST_JETTY_MIN_THREADS`
   , `SW_RECEIVER_SHARING_JETTY_MIN_THREADS`).
 * Refactor the core Builder mechanism, new storage plugin could implement their own converter and get rid of hard
   requirement of using HashMap to communicate between data object and database native structure.
-* [**Break Change**] Break all existing 3rd-party storage extensions.
+* [**Breaking Change**] Break all existing 3rd-party storage extensions.
 * Remove hard requirement of BASE64 encoding for binary field.
 * Add complexity limitation for GraphQL query to avoid malicious query.
 * Add `Column.shardingKeyIdx` for column definition for BanyanDB.
@@ -142,8 +142,8 @@ NOTICE, this sharding concept is NOT just for splitting data into different data
 
 #### UI
 
-* [**Break Change**] Introduce Booster UI, remove RocketBot UI.
-* [**Break Change**] UI Templates have been redesigned totally. GraphQL query is minimal compatible for metadata and
+* [**Breaking Change**] Introduce Booster UI, remove RocketBot UI.
+* [**Breaking Change**] UI Templates have been redesigned totally. GraphQL query is minimal compatible for metadata and
   metrics query.
 * Remove unused jars (log4j-api.jar) in classpath.
 * Bump up netty version to fix CVE.
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Layer.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Layer.java
index c3acfa9..4f443c6 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Layer.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Layer.java
@@ -45,12 +45,12 @@ public enum Layer {
     GENERAL(2, true),
 
     /**
-     * Operation System Linux
+     * Linux Machine
      */
     OS_LINUX(3, true),
 
     /**
-     * Kubernetes, include pods, services, contains etc.
+     * Kubernetes cluster
      */
     K8S(4, true),
 
@@ -112,7 +112,12 @@ public enum Layer {
     /**
      * The uninstrumented gateways configured in OAP
      */
-    VIRTUAL_GATEWAY(16, false);
+    VIRTUAL_GATEWAY(16, false),
+
+    /**
+     * Kubernetes service
+     */
+    K8S_SERVICE(17, true);
 
     private final int value;
     /**