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 0dddee92e..000000000 --- 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 e69de29bb..4889edf3f 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 7473866b3..679379c0f 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 c101963ff..e06e9445a 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 e69de29bb..3335dcd66 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