[incubator-skywalking] branch feature/ui-protocol updated: Add application layer protocol and some common types.

[wu...@apache.org]

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

wusheng pushed a commit to branch feature/ui-protocol
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/feature/ui-protocol by this push:
     new 5d801fb  Add application layer protocol and some common types.
5d801fb is described below

commit 5d801fbd02a69aae17b4abec657ae38723cfa024
Author: wu-sheng <wu...@foxmail.com>
AuthorDate: Wed Dec 27 09:59:40 2017 +0800

    Add application layer protocol and some common types.
---
 .../src/main/resources/application.yml               | 20 --------------------
 .../resources/ui-graphql/application-layer.graphqls  |  8 ++++++++
 .../src/main/resources/ui-graphql/common.graphqls    | 15 +++++++++++++++
 .../resources/ui-graphql/overview-layer.graphqls     |  3 ++-
 .../main/resources/ui-graphql/server-layer.graphqls  | 19 +++++++++++++++++++
 5 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/application.yml b/apm-protocol/apm-ui-protocol/src/main/resources/application.yml
deleted file mode 100644
index 0dddee9..0000000
--- a/apm-protocol/apm-ui-protocol/src/main/resources/application.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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.
-#
-# Project repository: https://github.com/OpenSkywalking/skywalking-ui
-#
-
-server:
-  port: 8080
diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/application-layer.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/application-layer.graphqls
index e69de29..4889edf 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/application-layer.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/application-layer.graphqls
@@ -0,0 +1,8 @@
+type AppServerList {
+   servers: [AppServerInfo!]
+}
+
+extend type Query {
+  getApplicationTopology(appId: ID!, duration: Duration!): ApplicationTopology
+  getServers(appId: ID!, duration: Duration!): AppServerList
+}
\ No newline at end of file
diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/common.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/common.graphqls
index 7473866..679379c 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/common.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/common.graphqls
@@ -38,3 +38,18 @@ enum Step{
   MINUTE
   SECOND
 }
+
+######################################
+# Common Metrics and Trends
+######################################
+type ResponseTimeTrend {
+  trendList: [Int!]
+}
+
+type TPSTrend {
+  trendList: [Int!]
+}
+
+type ThroughputTrend {
+  trendList: [Int!]
+}
\ No newline at end of file
diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls
index c101963..e06e944 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls
@@ -96,12 +96,13 @@ type ApplicationBrief {
 }
 
 type ApplicationInfo {
+  id: ID!
   name: String!
   tps: Int!
 }
 
 extend type Query {
-  getApplicationTopology(duration: Duration!): ApplicationTopology
+  getClusterTopology(duration: Duration!): ApplicationTopology
   getClusterBrief(duration: Duration!): ClusterBrief
   getAlarmTrend(duration: Duration!): AlarmTrend
   getConjecturalApps(duration: Duration!): ConjecturalAppBrief
diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/server-layer.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/server-layer.graphqls
index e69de29..3335dcd 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/server-layer.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/server-layer.graphqls
@@ -0,0 +1,19 @@
+# The server info.
+# At here, `Server` represents a process in OS,
+# e.g.
+#   1. Spring boot application
+#   2. A Tomcat server instance
+type AppServerInfo {
+  id: ID!
+  name: String!
+  tps: Int!
+  os: String
+  host: String
+  pid: Int
+  IPv4: String
+  IPv6: String
+}
+
+extend type Query {
+  
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
['"commits@skywalking.apache.org" <co...@skywalking.apache.org>'].