You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/01/12 01:51:35 UTC

[incubator-skywalking] branch fix/graphql/node-nullable updated: Fix missing parts.

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

wusheng pushed a commit to branch fix/graphql/node-nullable
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/fix/graphql/node-nullable by this push:
     new 225903a  Fix missing parts.
225903a is described below

commit 225903a92a5590014a353206d9b2cb49c9a66c4d
Author: wu-sheng <wu...@foxmail.com>
AuthorDate: Fri Jan 12 09:48:49 2018 +0800

    Fix missing parts.
---
 .../apm-ui-protocol/src/main/resources/ui-graphql/alarm.graphqls   | 7 ++++++-
 .../src/main/resources/ui-graphql/application-layer.graphqls       | 6 +++---
 .../src/main/resources/ui-graphql/service-layer.graphqls           | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/alarm.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/alarm.graphqls
index 9cb54a7..b60d0a1 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/alarm.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/alarm.graphqls
@@ -1,3 +1,8 @@
+type Alarm {
+    items: [AlarmItem!]!
+    count: Int!
+}
+
 type AlarmItem {
     # Typical include: Application Code + cause type. This is a short description.
     title: String!
@@ -21,5 +26,5 @@ enum CauseType {
 }
 
 extend type Query {
-    loadAlertList(keyword: String, alertType: AlarmType, duration:Duration!, paging: Pagination!):[AlarmItem!]!
+    loadAlertList(keyword: String, alertType: AlarmType, duration:Duration!, paging: Pagination!): Alarm
 }
\ No newline at end of file
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 e7f72bf..5620e96 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
@@ -32,8 +32,8 @@ type ConjecturalNode implements Node {
 
 
 extend type Query {
-  getAllApplication(duration: Duration!): [ApplicationNode]
+  getAllApplication(duration: Duration!): [ApplicationNode!]!
   getApplicationTopology(applicationId: ID!, duration: Duration!): Topology
-  getSlowService(applicationId: ID!, duration: Duration, top: Int!): [ServiceInfo!]
-  getServerThroughput(applicationId: ID!, duration: Duration!, top: Int!): [AppServerInfo!]
+  getSlowService(applicationId: ID!, duration: Duration!, top: Int!): [ServiceInfo!]!
+  getServerThroughput(applicationId: ID!, duration: Duration!, top: Int!): [AppServerInfo!]!
 }
diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/service-layer.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/service-layer.graphqls
index 3e33c8f..a5b4455 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/service-layer.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/service-layer.graphqls
@@ -27,7 +27,7 @@ type TraceItem {
 }
 
 extend type Query {
-    searchService(keyword: String!, duration: Duration!): [ServiceNode]
+    searchService(keyword: String!, duration: Duration!, topN: Int!): [ServiceNode!]!
     getServiceResponseTimeTrend(serviceId: ID!, duration: Duration!): ResponseTimeTrend
     getServiceTPSTrend(serviceId: ID!, duration: Duration!): ThroughputTrend
     getServiceSLATrend(serviceId: ID!, duration: Duration!): SLATrend

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