You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by yw...@apache.org on 2019/02/16 10:24:19 UTC

[incubator-skywalking-query-protocol] branch new created (now 6b23f7d)

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

ywang pushed a change to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git.


      at 6b23f7d  Update: add database type

This branch includes the following new commits:

     new ebbeb72  Init query protocol repo.
     new f22e7e5  Update aggregation.graphqls
     new 98e8b34  Update metric.graphqls
     new 1492514  Update topology.graphqls
     new ca697de  add new protocol of values query
     new 9a6bb77  Merge pull request #1 from apache/add-missing-fields
     new 6c99c68  Add an alarm search search condition.
     new 3002d93  Add service name match query.
     new c6ee5d1  Fix a typo.
     new 200ea34  Update topology.graphqls
     new 9b3c954  Update topology.graphqls
     new 9b71f9e  Update aggregation.graphqls
     new eb643d2  Update trace.graphqls
     new b93baa5  Update topology.graphqls
     new b7798c4  Update trace.graphqls
     new 9eafa5a  Rename the operationName to endpointName. (#2)
     new 9853f44  Add detectPoint to call entity.
     new 1f35bd5  Update metadata.graphqls
     new c934ce0  Merge pull request #3 from apache/peng-yongsheng-patch-1
     new cb41193  Update common.graphqls
     new 0971b65  Merge pull request #4 from apache/peng-yongsheng-patch-1-1
     new bdf653d  Update metadata.graphqls
     new f2e54c2  Merge pull request #5 from apache/peng-yongsheng-patch-2
     new 5567e86  Update aggregation.graphqls (#6)
     new acffe13  Update aggregation.graphqls
     new d71d3f1  Update common.graphqls
     new f5de93a  Update aggregation.graphqls
     new 9762145  Update trace.graphqls
     new 3a83be7  Update trace.graphqls
     new 7ccf9ac  Update metadata.graphqls
     new 1122e97  Merge pull request #7 from apache/wu-sheng-patch-1
     new 99681cd  Update: update database-query-protocol
     new 6b23f7d  Update: add database type

The 33 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-query-protocol] 13/33: Update trace.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit eb643d27813dc53adf550b31d35059a687ed337a
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Sep 13 15:37:32 2018 +0800

    Update trace.graphqls
    
    Fix typo
---
 trace.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/trace.graphqls b/trace.graphqls
index 88b7b03..acdb950 100644
--- a/trace.graphqls
+++ b/trace.graphqls
@@ -32,8 +32,8 @@ type BasicTrace {
 
 # Represent the conditions used for query TraceBrief
 input TraceQueryCondition {
-    # The value of 0 means all service.
-    serviceId: Int
+    # The value of 0 means all endpoints.
+    endpointId: Int
     traceId: String
     operationName: String
     # The time range of traces started


[incubator-skywalking-query-protocol] 15/33: Update trace.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit b7798c436f6d0871bf6671a7ef0307d3f4004d6c
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 19 16:02:02 2018 +0800

    Update trace.graphqls
---
 trace.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/trace.graphqls b/trace.graphqls
index acdb950..1bb81d5 100644
--- a/trace.graphqls
+++ b/trace.graphqls
@@ -32,8 +32,8 @@ type BasicTrace {
 
 # Represent the conditions used for query TraceBrief
 input TraceQueryCondition {
-    # The value of 0 means all endpoints.
-    endpointId: Int
+    # The value of 0 means all services.
+    serviceId: Int
     traceId: String
     operationName: String
     # The time range of traces started


[incubator-skywalking-query-protocol] 30/33: Update metadata.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 7ccf9ac195ebd22d9008841db9c633663d5eadce
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Oct 16 17:04:18 2018 +0800

    Update metadata.graphqls
---
 metadata.graphqls | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/metadata.graphqls b/metadata.graphqls
index 94b0d1c..7ff5062 100644
--- a/metadata.graphqls
+++ b/metadata.graphqls
@@ -45,6 +45,13 @@ type Endpoint {
     name: String!
 }
 
+type EndpointInfo {
+    id: ID!
+    name: String!
+    serviceId: ID!
+    serviceName: String!
+}
+
 extend type Query {
     getGlobalBrief(duration: Duration!): ClusterBrief
 
@@ -60,4 +67,5 @@ extend type Query {
     # Consider there are huge numbers of endpoint,
     # must use endpoint owner's service id, keyword and limit filter to do query.
     searchEndpoint(keyword: String!, serviceId: ID!, limit: Int!): [Endpoint!]!
+    getEndpointInfo(endpointId: ID!): EndpointInfo
 }


[incubator-skywalking-query-protocol] 01/33: Init query protocol repo.

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit ebbeb721d95bba8ee63bc2e706e877ee3a56433e
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Sep 3 16:19:58 2018 +0800

    Init query protocol repo.
---
 README.md            |   5 +++
 aggregation.graphqls |  45 ++++++++++++++++++++
 alarm.graphqls       |  36 ++++++++++++++++
 common.graphqls      |  93 ++++++++++++++++++++++++++++++++++++++++
 metadata.graphqls    |  62 +++++++++++++++++++++++++++
 metric.graphqls      |  61 ++++++++++++++++++++++++++
 topology.graphqls    |  64 ++++++++++++++++++++++++++++
 trace.graphqls       | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 484 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6b409ef
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# Apache SkyWalking Query Protocol
+The Query protocol of SkyWalking in GraphQL format.
+
+# License
+Apache 2.0
diff --git a/aggregation.graphqls b/aggregation.graphqls
new file mode 100644
index 0000000..90ade73
--- /dev/null
+++ b/aggregation.graphqls
@@ -0,0 +1,45 @@
+# 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.
+
+# Match the metric by name, order by metric value(such as: avg, percent)
+input TopNCondition {
+    name: String!
+    topN: Int!
+    order: Order!
+    # When the scope is ServiceInstance or Endpoint,
+    # most likely you need a secondary filter.
+    # Such as:
+    # 1. Get topN service instance in a given service id
+    # 2. Get topN endpoint in a given serivce id.
+    # Backend will decide the filter id meaning by Scope.
+    #
+    # Defintely, it is not required by default.
+    filterScope: Scope
+    filterId: Int
+}
+
+type TopNEntity {
+    name: String!
+    id: ID!
+    value: Int!
+}
+
+# The aggregation query is different with the metric query.
+# All aggregation queries require backend or/and storage do aggregation in query time.
+extend type Query {
+    # TopN is an aggregation query.
+    getTopN(condition: TopNCondition!): [TopNEntity!]!
+}
\ No newline at end of file
diff --git a/alarm.graphqls b/alarm.graphqls
new file mode 100644
index 0000000..52d7d22
--- /dev/null
+++ b/alarm.graphqls
@@ -0,0 +1,36 @@
+# 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.
+
+#  the trend alarm trigger times
+type AlarmTrend {
+    numOfAlarm: [Int]!
+}
+
+type AlarmMessage {
+    scope: Scope!
+    id: ID!
+    message: String!
+}
+
+type Alarms {
+    msgs: [AlarmMessage!]!
+    total: Int!
+}
+
+extend type Query {
+    getAlarmTrend(duration: Duration!): AlarmTrend!
+    getAlarm(duration: Duration!, scope: Scope, paging: Pagination!): Alarms
+}
\ No newline at end of file
diff --git a/common.graphqls b/common.graphqls
new file mode 100644
index 0000000..258e2b4
--- /dev/null
+++ b/common.graphqls
@@ -0,0 +1,93 @@
+# 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.
+
+schema {
+    query: Query
+    mutation: Mutation
+}
+
+#Root node
+type Query {
+    version: String
+}
+
+type Mutation {
+    version: String
+}
+
+# The Duration defines the start and end time for each query operation.
+# Fields: `start` and `end`
+#   represents the time span. And each of them matches the step.
+#   ref https://www.ietf.org/rfc/rfc3339.txt
+#   The time formats are
+#       `SECOND` step: yyyy-MM-dd HHmmss
+#       `MINUTE` step: yyyy-MM-dd HHmm
+#       `HOUR` step: yyyy-MM-dd HH
+#       `DAY` step: yyyy-MM-dd
+#       `MONTH` step: yyyy-MM
+# Field: `step`
+#   represents the accurate time point.
+# e.g.
+#   if step==HOUR , start=2017-11-08 09, end=2017-11-08 19
+#   then
+#       metrics from the following time points expected
+#       2017-11-08 9:00 -> 2017-11-08 19:00
+#       there are 11 time points (hours) in the time span.
+input Duration {
+    start: String!
+    end: String!
+    step: Step!
+}
+
+enum Step {
+    MONTH
+    DAY
+    HOUR
+    MINUTE
+    SECOND
+}
+
+enum Order {
+    ASC
+    DES
+}
+
+input Pagination {
+    # pageNum starts in 1, the default is 1.
+    pageNum: Int
+    pageSize: Int!
+    # default false
+    needTotal: Boolean
+}
+
+enum Language {
+    # For not language based agent, the language is impossible to tell.
+    UNKNOWN
+    JAVA
+    DOTNET
+    NODEJS
+    PYTHON
+    RUBY
+}
+
+enum Scope {
+    SERVICE
+    SERVICE_INSTANCE
+    ENDPOINT
+    SERVICE_RELATION
+    SERVICE_INSTANCE_RELATION
+    ENDPOINT_RELATION
+}
\ No newline at end of file
diff --git a/metadata.graphqls b/metadata.graphqls
new file mode 100644
index 0000000..d4ad3c5
--- /dev/null
+++ b/metadata.graphqls
@@ -0,0 +1,62 @@
+# 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.
+
+# Query the cluster brief based on the given duration
+type ClusterBrief {
+    numOfService: Int!
+    numOfEndpoint: Int!
+    numOfDatabase: Int!
+    numOfCache: Int!
+    numOfMQ: Int!
+}
+
+type Service {
+    id: ID!
+    name: String!
+}
+
+type ServiceInstance {
+    id: ID!
+    name: String!
+    attributes: [Attribute!]!
+    language: Language!
+}
+
+type Attribute {
+    name: String!
+    value: String!
+}
+
+type Endpoint {
+    id: ID!
+    name: String!
+}
+
+extend type Query {
+    getGlobalBrief(duration: Duration!): ClusterBrief
+
+    # Service related meta info.
+    getAllServices(duration: Duration!): [Service!]!
+    searchServices(duration: Duration!, keyword: String!): [Service!]!
+
+    # Service intance query
+    getServiceInstances(duration: Duration!, id: ID!): [ServiceInstance!]!
+
+    # Endpoint query
+    # Consider there are huge numbers of endpoint,
+    # must use endpoint owner's service id, keyword and limit filter to do query.
+    searchEndpoint(keyword: String!, serviceId: ID!, limit: Int!): [Endpoint!]!
+}
diff --git a/metric.graphqls b/metric.graphqls
new file mode 100644
index 0000000..9f27d71
--- /dev/null
+++ b/metric.graphqls
@@ -0,0 +1,61 @@
+# 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.
+
+input MetricCondition {
+    # Metric name, which should be defined in OAL script
+    # Such as:
+    # Endpoint_avg = from(Endpoint.latency).avg()
+    # Then, `Endpoint_avg`
+    name: String!
+    # Id in this metric type.
+    # In the above case, the id should be endpoint id.
+    id: ID
+}
+
+type LinearIntValues {
+    values: [KVInt!]!
+}
+
+type KVInt {
+    id: ID!
+    # This is the value, the caller must understand the Unit.
+    # Such as:
+    # 1. If ask for cpm metric, the unit and result should be count.
+    # 2. If ask for response time (p99 or avg), the unit should be millisecond.
+    value: Int!
+}
+
+type Thermodynamic {
+    # Each element in nodes represents a point in Thermodynamic Diagram
+    # And the element includes three values:
+    # 1) Time Bucket based on query duration
+    # 2) Response time index.
+    #    Response time = [responseTimeStep * index, responseTimeStep * (index+1))
+    #    The last element: [Response Time * index, MAX)
+    # 3) The number of calls in this response time duration.
+    #
+    # Example:
+    # [ [0, 0, 10], [0, 1, 43], ...]
+    # These ^^^ two represent the left bottom element, and another element above it.
+    nodes: [[Long]!]!
+    axisYStep: Int!
+}
+
+
+extend type Query {
+    getLinearIntValues(metric: MetricCondition!, duration: Duration!): LinearIntValues
+    getThermodynamic(metric: MetricCondition!, duration: Duration!): Thermodynamic
+}
\ No newline at end of file
diff --git a/topology.graphqls b/topology.graphqls
new file mode 100644
index 0000000..94c3052
--- /dev/null
+++ b/topology.graphqls
@@ -0,0 +1,64 @@
+# 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.
+
+# The overview topology of the whole application cluster or services,
+type Topology {
+    nodes: [Node!]!
+    calls: [Call!]!
+}
+
+# Node in Topology
+type Node {
+    # The global id of each node,
+    # 1. Service id
+    # 2. Endpoint id
+    id: ID!
+    # The literal name of the #id.
+    name: String!
+    # The type name may be
+    # 1. The service provider/middleware tech, such as: Tomcat, SpringMVC
+    # 2. Conjectural Service, e.g. MySQL, Redis, Kafka
+    type: String
+    # It is a conjuecture node or real node, to represent a service or endpoint.
+    isReal: Boolean!
+}
+
+# The Call represents a directed distributed call,
+# from the `source` to the `target`.
+type Call {
+    source: ID!
+    target: ID!
+    isAlert: Boolean
+    # The protocol and tech stack used in this distributed call
+    callType: String!
+    cpm: Long!
+    # Unit: millisecond
+    avgResponseTime: Long!
+}
+
+enum NodeType {
+    SERVICE,
+    ENDPOINT,
+    USER
+}
+
+
+extend type Query {
+    # Query the global topolgoy
+    getGlobalTopology(duration: Duration!): Topology
+    # Query the topology, based on the given service
+    getServiceTopology(serviceId: ID!, duration: Duration!): Topology
+}
\ No newline at end of file
diff --git a/trace.graphqls b/trace.graphqls
new file mode 100644
index 0000000..72ccf98
--- /dev/null
+++ b/trace.graphqls
@@ -0,0 +1,118 @@
+# 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.
+
+# The list of traces
+type TraceBrief {
+    traces: [BasicTrace!]!
+    total: Int!
+}
+
+# Trace basic info
+type BasicTrace {
+    segmentId: String!
+    operationNames: [String!]!
+    duration: Int!
+    start: String!
+    isError: Boolean
+    traceIds: [String!]!
+}
+
+# Represent the conditions used for query TraceBrief
+input TraceQueryCondition {
+    # The value of 0 means all application.
+    applicationId: Int
+    traceId: String
+    operationName: String
+    # The time range of traces started
+    queryDuration: Duration
+    # The mix time of trace
+    minTraceDuration: Int
+    # The max time of trace
+    maxTraceDuration: Int
+    traceState: TraceState!
+    queryOrder: QueryOrder!
+    paging: Pagination!
+}
+
+enum TraceState {
+    ALL
+    SUCCESS
+    ERROR
+}
+
+enum QueryOrder {
+    BY_START_TIME
+    BY_DURATION
+}
+
+# The trace represents a distributed trace, includes all segments and spans.
+type Trace {
+    spans: [Span!]!
+}
+
+type Span {
+    traceId: ID!
+    segmentId: ID!
+    spanId: Int!
+    parentSpanId: Int!
+    refs: [Ref!]!
+    applicationCode: String!
+    startTime: Long!
+    endTime: Long!
+    operationName: String
+    # There are three span types: Local, Entry and Exit
+    type: String!
+    # Peer network id, e.g. host+port, ip+port
+    peer: String
+    component: String
+    isError: Boolean
+    # There are 5 layers: Unknown, Database, RPCFramework, Http, MQ and Cache
+    layer: String
+    tags: [KeyValue!]!
+    logs: [LogEntity!]!
+}
+
+# Ref represents the link between the segment and its parents.
+# The parent(ref) may not exists, which means batch process.
+# The UI should display a list, representing the other trace IDs.
+type Ref {
+    traceId: ID!
+    parentSegmentId: ID!
+    parentSpanId: Int!
+    # Ref type represents why did the ref happen.
+    # Include: 1) CrossProcess 2) CrossThread
+    type: RefType!
+}
+
+enum RefType {
+    CROSS_PROCESS,
+    CROSS_THREAD
+}
+
+type KeyValue {
+    key: String!
+    value: String
+}
+
+type LogEntity {
+    time: Long!
+    data: [KeyValue!]
+}
+
+extend type Query {
+    queryBasicTraces(condition: TraceQueryCondition): TraceBrief
+    queryTrace(traceId: ID!): Trace
+}


[incubator-skywalking-query-protocol] 21/33: Merge pull request #4 from apache/peng-yongsheng-patch-1-1

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 0971b6533f5fbe19b4298e7a51aa88b824ef5c7e
Merge: c934ce0 cb41193
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Sun Sep 23 11:35:25 2018 +0800

    Merge pull request #4 from apache/peng-yongsheng-patch-1-1
    
    Update common.graphqls

 common.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[incubator-skywalking-query-protocol] 04/33: Update topology.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 149251420c887552df93d5c76f67ccdd47cb71ce
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Sep 4 17:06:06 2018 +0800

    Update topology.graphqls
---
 topology.graphqls | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/topology.graphqls b/topology.graphqls
index 94c3052..49c0d06 100644
--- a/topology.graphqls
+++ b/topology.graphqls
@@ -41,12 +41,9 @@ type Node {
 type Call {
     source: ID!
     target: ID!
-    isAlert: Boolean
     # The protocol and tech stack used in this distributed call
     callType: String!
     cpm: Long!
-    # Unit: millisecond
-    avgResponseTime: Long!
 }
 
 enum NodeType {
@@ -61,4 +58,4 @@ extend type Query {
     getGlobalTopology(duration: Duration!): Topology
     # Query the topology, based on the given service
     getServiceTopology(serviceId: ID!, duration: Duration!): Topology
-}
\ No newline at end of file
+}


[incubator-skywalking-query-protocol] 32/33: Update: update database-query-protocol

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 99681cd92c573b2f8074e313e5b0d99e1132e51f
Author: TinyAllen <al...@outlook.com>
AuthorDate: Thu Jan 31 12:55:24 2019 +0800

    Update: update database-query-protocol
---
 database.graphqls | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/database.graphqls b/database.graphqls
new file mode 100644
index 0000000..1e4d888
--- /dev/null
+++ b/database.graphqls
@@ -0,0 +1,29 @@
+# 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.
+
+# Query the cluster brief based on the given duration
+
+type Database {
+    id: ID!
+    name: String!
+}
+
+extend type Query {
+
+    # Database related meta info.
+    getAllDatabases(duration: Duration!): [Database!]!
+
+}


[incubator-skywalking-query-protocol] 17/33: Add detectPoint to call entity.

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 9853f447939ac2805f527d50f047759dc3636990
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Sep 21 22:12:40 2018 +0800

    Add detectPoint to call entity.
---
 common.graphqls   | 8 +++++++-
 topology.graphqls | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common.graphqls b/common.graphqls
index 258e2b4..52c6d47 100644
--- a/common.graphqls
+++ b/common.graphqls
@@ -90,4 +90,10 @@ enum Scope {
     SERVICE_RELATION
     SERVICE_INSTANCE_RELATION
     ENDPOINT_RELATION
-}
\ No newline at end of file
+}
+
+enum CallDetectPoint {
+    CLIENT
+    SERVER
+    PROXY
+}
diff --git a/topology.graphqls b/topology.graphqls
index 4ecb3a9..af7e070 100644
--- a/topology.graphqls
+++ b/topology.graphqls
@@ -44,6 +44,7 @@ type Call {
     # The protocol and tech stack used in this distributed call
     callType: String!
     id: ID!
+    detectPoint: DetectPoint!
 }
 
 enum NodeType {


[incubator-skywalking-query-protocol] 16/33: Rename the operationName to endpointName. (#2)

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 9eafa5a6c5b3b9a61002391485799ed89be96b9c
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Wed Sep 19 22:26:06 2018 +0800

    Rename the operationName to endpointName. (#2)
    
    Consistent with scope name
---
 trace.graphqls | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/trace.graphqls b/trace.graphqls
index 1bb81d5..b032968 100644
--- a/trace.graphqls
+++ b/trace.graphqls
@@ -23,7 +23,7 @@ type TraceBrief {
 # Trace basic info
 type BasicTrace {
     segmentId: String!
-    operationNames: [String!]!
+    endpointNames: [String!]!
     duration: Int!
     start: String!
     isError: Boolean
@@ -35,7 +35,7 @@ input TraceQueryCondition {
     # The value of 0 means all services.
     serviceId: Int
     traceId: String
-    operationName: String
+    endpointName: String
     # The time range of traces started
     queryDuration: Duration
     # The mix time of trace
@@ -72,7 +72,7 @@ type Span {
     serviceCode: String!
     startTime: Long!
     endTime: Long!
-    operationName: String
+    endpointName: String
     # There are three span types: Local, Entry and Exit
     type: String!
     # Peer network id, e.g. host+port, ip+port


[incubator-skywalking-query-protocol] 27/33: Update aggregation.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit f5de93a2b0b5ab6dbf2a39d671560f285ab67675
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Sep 28 15:45:02 2018 +0800

    Update aggregation.graphqls
    
    Fix serviceId type
---
 aggregation.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aggregation.graphqls b/aggregation.graphqls
index e01846e..cd8ec02 100644
--- a/aggregation.graphqls
+++ b/aggregation.graphqls
@@ -26,7 +26,7 @@ extend type Query {
     # TopN is an aggregation query.
     getServiceTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
     getAllServiceInstanceTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
-    getServiceInstanceTopN(serviceId: Int!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
+    getServiceInstanceTopN(serviceId: ID!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
     getAllEndpointTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
-    getEndpointTopN(serviceId: Int!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
+    getEndpointTopN(serviceId: ID!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
 }


[incubator-skywalking-query-protocol] 25/33: Update aggregation.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit acffe1341e6bcefcdd3e2a6ebfb0c00db6e9af35
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Sep 25 10:23:18 2018 +0800

    Update aggregation.graphqls
---
 aggregation.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aggregation.graphqls b/aggregation.graphqls
index b059fd8..e01846e 100644
--- a/aggregation.graphqls
+++ b/aggregation.graphqls
@@ -26,7 +26,7 @@ extend type Query {
     # TopN is an aggregation query.
     getServiceTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
     getAllServiceInstanceTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
-    getServiceInstanceTopN(serviceId Int!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
+    getServiceInstanceTopN(serviceId: Int!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
     getAllEndpointTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
-    getEndpointTopN(serviceId Int!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
+    getEndpointTopN(serviceId: Int!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
 }


[incubator-skywalking-query-protocol] 23/33: Merge pull request #5 from apache/peng-yongsheng-patch-2

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit f2e54c2cd3f7fdb2cdc975cf791e1bb1d9aab96e
Merge: 0971b65 bdf653d
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Sun Sep 23 11:52:11 2018 +0800

    Merge pull request #5 from apache/peng-yongsheng-patch-2
    
    Update metadata.graphqls

 metadata.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[incubator-skywalking-query-protocol] 05/33: add new protocol of values query

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit ca697def543c15a56b5e6ee8d3cadb5c3fa2c8f5
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 5 12:25:56 2018 +0800

    add new protocol of values query
---
 alarm.graphqls  |  3 ++-
 metric.graphqls | 16 ++++++++++++++--
 trace.graphqls  |  6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/alarm.graphqls b/alarm.graphqls
index 52d7d22..d735d89 100644
--- a/alarm.graphqls
+++ b/alarm.graphqls
@@ -20,6 +20,7 @@ type AlarmTrend {
 }
 
 type AlarmMessage {
+    startTime: Long!
     scope: Scope!
     id: ID!
     message: String!
@@ -33,4 +34,4 @@ type Alarms {
 extend type Query {
     getAlarmTrend(duration: Duration!): AlarmTrend!
     getAlarm(duration: Duration!, scope: Scope, paging: Pagination!): Alarms
-}
\ No newline at end of file
+}
diff --git a/metric.graphqls b/metric.graphqls
index e977e92..8514cfb 100644
--- a/metric.graphqls
+++ b/metric.graphqls
@@ -25,7 +25,18 @@ input MetricCondition {
     id: ID
 }
 
-type LinearIntValues {
+input BatchMetricConditions {
+    # Metric name, which should be defined in OAL script
+    # Such as:
+    # Endpoint_avg = from(Endpoint.latency).avg()
+    # Then, `Endpoint_avg`
+    name: String!
+    # Id in this metric type.
+    # In the above case, the id should be endpoint id.
+    ids: [ID!]!
+}
+
+type IntValues {
     values: [KVInt!]!
 }
 
@@ -56,6 +67,7 @@ type Thermodynamic {
 
 
 extend type Query {
-    getLinearIntValues(metric: MetricCondition!, duration: Duration!): LinearIntValues
+    getValues(metric: BatchMetricConditions!, duration: Duration!): IntValues
+    getLinearIntValues(metric: MetricCondition!, duration: Duration!): IntValues
     getThermodynamic(metric: MetricCondition!, duration: Duration!): Thermodynamic
 }
diff --git a/trace.graphqls b/trace.graphqls
index 72ccf98..88b7b03 100644
--- a/trace.graphqls
+++ b/trace.graphqls
@@ -32,8 +32,8 @@ type BasicTrace {
 
 # Represent the conditions used for query TraceBrief
 input TraceQueryCondition {
-    # The value of 0 means all application.
-    applicationId: Int
+    # The value of 0 means all service.
+    serviceId: Int
     traceId: String
     operationName: String
     # The time range of traces started
@@ -69,7 +69,7 @@ type Span {
     spanId: Int!
     parentSpanId: Int!
     refs: [Ref!]!
-    applicationCode: String!
+    serviceCode: String!
     startTime: Long!
     endTime: Long!
     operationName: String


[incubator-skywalking-query-protocol] 06/33: Merge pull request #1 from apache/add-missing-fields

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 9a6bb77ac06f36ab4949ea193b152f22d09ab8a8
Merge: 1492514 ca697de
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Wed Sep 5 13:20:08 2018 +0800

    Merge pull request #1 from apache/add-missing-fields
    
    add new protocol of values query

 alarm.graphqls  |  3 ++-
 metric.graphqls | 16 ++++++++++++++--
 trace.graphqls  |  6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)


[incubator-skywalking-query-protocol] 29/33: Update trace.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 3a83be79a9c23aad6576ed2a4a04b82de6d7a829
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Sep 28 16:52:21 2018 +0800

    Update trace.graphqls
---
 trace.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trace.graphqls b/trace.graphqls
index 8f359c7..8f24d5a 100644
--- a/trace.graphqls
+++ b/trace.graphqls
@@ -33,7 +33,7 @@ type BasicTrace {
 # Represent the conditions used for query TraceBrief
 input TraceQueryCondition {
     # The value of 0 means all services.
-    serviceId: Int
+    serviceId: ID
     traceId: String
     endpointId: ID
     endpointName: String


[incubator-skywalking-query-protocol] 03/33: Update metric.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 98e8b340cdefb262083885b877722e46e9313ff6
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Sep 4 16:28:40 2018 +0800

    Update metric.graphqls
    
    Fix wrong type Long
---
 metric.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metric.graphqls b/metric.graphqls
index 9f27d71..e977e92 100644
--- a/metric.graphqls
+++ b/metric.graphqls
@@ -50,7 +50,7 @@ type Thermodynamic {
     # Example:
     # [ [0, 0, 10], [0, 1, 43], ...]
     # These ^^^ two represent the left bottom element, and another element above it.
-    nodes: [[Long]!]!
+    nodes: [[Int]!]!
     axisYStep: Int!
 }
 
@@ -58,4 +58,4 @@ type Thermodynamic {
 extend type Query {
     getLinearIntValues(metric: MetricCondition!, duration: Duration!): LinearIntValues
     getThermodynamic(metric: MetricCondition!, duration: Duration!): Thermodynamic
-}
\ No newline at end of file
+}


[incubator-skywalking-query-protocol] 09/33: Fix a typo.

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit c6ee5d15f38024c3be61be579eac4035ffbfd4bf
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 5 16:46:58 2018 +0800

    Fix a typo.
---
 metadata.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.graphqls b/metadata.graphqls
index d998026..cd94a53 100644
--- a/metadata.graphqls
+++ b/metadata.graphqls
@@ -51,7 +51,7 @@ extend type Query {
     # Service related meta info.
     getAllServices(duration: Duration!): [Service!]!
     searchServices(duration: Duration!, keyword: String!): [Service!]!
-    searchServices(duration: Duration!, serviceCode: String!): Service
+    searchService(duration: Duration!, serviceCode: String!): Service
 
     # Service intance query
     getServiceInstances(duration: Duration!, id: ID!): [ServiceInstance!]!


[incubator-skywalking-query-protocol] 19/33: Merge pull request #3 from apache/peng-yongsheng-patch-1

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit c934ce09245aac965f3f9243f5371e40c999c642
Merge: 9853f44 1f35bd5
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Sun Sep 23 11:21:02 2018 +0800

    Merge pull request #3 from apache/peng-yongsheng-patch-1
    
    Update metadata.graphqls

 metadata.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[incubator-skywalking-query-protocol] 31/33: Merge pull request #7 from apache/wu-sheng-patch-1

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 1122e97b5604ae96447bd58ecdb248d7e02952aa
Merge: 3a83be7 7ccf9ac
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Tue Oct 16 18:03:00 2018 +0800

    Merge pull request #7 from apache/wu-sheng-patch-1
    
    Add query service id/name from endpoint

 metadata.graphqls | 8 ++++++++
 1 file changed, 8 insertions(+)


[incubator-skywalking-query-protocol] 28/33: Update trace.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 9762145c89ba6b70b48cc4cb0c886d7b9de18ec5
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Sep 28 16:03:19 2018 +0800

    Update trace.graphqls
    
    Add endpointId condition to TraceQueryCondition for endpoint query its trace
---
 trace.graphqls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/trace.graphqls b/trace.graphqls
index b032968..8f359c7 100644
--- a/trace.graphqls
+++ b/trace.graphqls
@@ -35,6 +35,7 @@ input TraceQueryCondition {
     # The value of 0 means all services.
     serviceId: Int
     traceId: String
+    endpointId: ID
     endpointName: String
     # The time range of traces started
     queryDuration: Duration


[incubator-skywalking-query-protocol] 22/33: Update metadata.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit bdf653d0a136541e00ed41d5972e95f717d19734
Author: 彭勇升 pengys <pe...@apache.org>
AuthorDate: Sun Sep 23 11:51:53 2018 +0800

    Update metadata.graphqls
    
    Rename the parameter from id to serviceId.
---
 metadata.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.graphqls b/metadata.graphqls
index e0774e7..94b0d1c 100644
--- a/metadata.graphqls
+++ b/metadata.graphqls
@@ -54,7 +54,7 @@ extend type Query {
     searchService(serviceCode: String!): Service
 
     # Service intance query
-    getServiceInstances(duration: Duration!, id: ID!): [ServiceInstance!]!
+    getServiceInstances(duration: Duration!, serviceId: ID!): [ServiceInstance!]!
 
     # Endpoint query
     # Consider there are huge numbers of endpoint,


[incubator-skywalking-query-protocol] 18/33: Update metadata.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 1f35bd5d9f3783d659040017c12f4ed3b7bd1a23
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Sun Sep 23 11:18:45 2018 +0800

    Update metadata.graphqls
    
    Delete the parameter named duration in searchService method. Do not need duration to query service by exact-match.
---
 metadata.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.graphqls b/metadata.graphqls
index cd94a53..e0774e7 100644
--- a/metadata.graphqls
+++ b/metadata.graphqls
@@ -51,7 +51,7 @@ extend type Query {
     # Service related meta info.
     getAllServices(duration: Duration!): [Service!]!
     searchServices(duration: Duration!, keyword: String!): [Service!]!
-    searchService(duration: Duration!, serviceCode: String!): Service
+    searchService(serviceCode: String!): Service
 
     # Service intance query
     getServiceInstances(duration: Duration!, id: ID!): [ServiceInstance!]!


[incubator-skywalking-query-protocol] 24/33: Update aggregation.graphqls (#6)

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 5567e86538c882037141f62640078e29fc3d16c4
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Mon Sep 24 23:27:03 2018 +0800

    Update aggregation.graphqls (#6)
    
    * Update aggregation.graphqls
    
    Split getTopN into multiple methods, with each scope as a separate method.
    
    * Update aggregation.graphqls
    
    Add order parameter and add 2 methods for all query.
---
 aggregation.graphqls | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/aggregation.graphqls b/aggregation.graphqls
index 1e834a1..b059fd8 100644
--- a/aggregation.graphqls
+++ b/aggregation.graphqls
@@ -14,23 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Match the metric by name, order by metric value(such as: avg, percent)
-input TopNCondition {
-    name: String!
-    topN: Int!
-    order: Order!
-    # When the scope is ServiceInstance or Endpoint,
-    # most likely you need a secondary filter.
-    # Such as:
-    # 1. Get topN service instance in a given service id
-    # 2. Get topN endpoint in a given serivce id.
-    # Backend will decide the filter id meaning by Scope.
-    #
-    # Defintely, it is not required by default.
-    filterScope: Scope
-    filterId: ID
-}
-
 type TopNEntity {
     name: String!
     id: ID!
@@ -41,5 +24,9 @@ type TopNEntity {
 # All aggregation queries require backend or/and storage do aggregation in query time.
 extend type Query {
     # TopN is an aggregation query.
-    getTopN(condition: TopNCondition!, duration: Duration!): [TopNEntity!]!
+    getServiceTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
+    getAllServiceInstanceTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
+    getServiceInstanceTopN(serviceId Int!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
+    getAllEndpointTopN(name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
+    getEndpointTopN(serviceId Int!, name: String!, topN: Int!, duration: Duration!, order: Order!): [TopNEntity!]!
 }


[incubator-skywalking-query-protocol] 07/33: Add an alarm search search condition.

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 6c99c68f643577fd6a6ed6fa74933684d66514c6
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 5 16:25:55 2018 +0800

    Add an alarm search search condition.
---
 alarm.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alarm.graphqls b/alarm.graphqls
index d735d89..15e324b 100644
--- a/alarm.graphqls
+++ b/alarm.graphqls
@@ -33,5 +33,5 @@ type Alarms {
 
 extend type Query {
     getAlarmTrend(duration: Duration!): AlarmTrend!
-    getAlarm(duration: Duration!, scope: Scope, paging: Pagination!): Alarms
+    getAlarm(duration: Duration!, scope: Scope, keyword: String, paging: Pagination!): Alarms
 }


[incubator-skywalking-query-protocol] 20/33: Update common.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit cb4119387be6fd5139053e9a559b39e93b03c9ba
Author: 彭勇升 pengys <pe...@apache.org>
AuthorDate: Sun Sep 23 11:34:54 2018 +0800

    Update common.graphqls
    
    Type name mistake when rename the parameter in call type.
---
 common.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.graphqls b/common.graphqls
index 52c6d47..c9cff00 100644
--- a/common.graphqls
+++ b/common.graphqls
@@ -92,7 +92,7 @@ enum Scope {
     ENDPOINT_RELATION
 }
 
-enum CallDetectPoint {
+enum DetectPoint {
     CLIENT
     SERVER
     PROXY


[incubator-skywalking-query-protocol] 14/33: Update topology.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit b93baa58852595164aae50e3e7be37683c220175
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Sep 13 16:45:16 2018 +0800

    Update topology.graphqls
    
    Remove cpm from topology result.
---
 topology.graphqls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/topology.graphqls b/topology.graphqls
index 5924587..4ecb3a9 100644
--- a/topology.graphqls
+++ b/topology.graphqls
@@ -43,7 +43,6 @@ type Call {
     target: ID!
     # The protocol and tech stack used in this distributed call
     callType: String!
-    cpm: Long!
     id: ID!
 }
 


[incubator-skywalking-query-protocol] 33/33: Update: add database type

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 6b23f7d29a2a38434b2b6a6964632fa473e9e718
Author: TinyAllen <al...@outlook.com>
AuthorDate: Thu Jan 31 14:21:21 2019 +0800

    Update: add database type
---
 database.graphqls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/database.graphqls b/database.graphqls
index 1e4d888..b796107 100644
--- a/database.graphqls
+++ b/database.graphqls
@@ -19,6 +19,7 @@
 type Database {
     id: ID!
     name: String!
+    type: String!
 }
 
 extend type Query {


[incubator-skywalking-query-protocol] 26/33: Update common.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit d71d3f183a1e498aafad8c59c8d3373408140ac9
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Sep 25 17:53:30 2018 +0800

    Update common.graphqls
---
 common.graphqls | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common.graphqls b/common.graphqls
index c9cff00..000cbb7 100644
--- a/common.graphqls
+++ b/common.graphqls
@@ -84,12 +84,12 @@ enum Language {
 }
 
 enum Scope {
-    SERVICE
-    SERVICE_INSTANCE
-    ENDPOINT
-    SERVICE_RELATION
-    SERVICE_INSTANCE_RELATION
-    ENDPOINT_RELATION
+    Service
+    ServiceInstance
+    Endpoint
+    ServiceRelation
+    ServiceInstanceRelation
+    EndpointRelation
 }
 
 enum DetectPoint {


[incubator-skywalking-query-protocol] 11/33: Update topology.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 9b3c9543efe4f7a3c96b903bb2f51e6acb510b4e
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 12 11:05:43 2018 +0800

    Update topology.graphqls
    
    Add getEndpointTopology
---
 topology.graphqls | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/topology.graphqls b/topology.graphqls
index 4549e79..5924587 100644
--- a/topology.graphqls
+++ b/topology.graphqls
@@ -59,4 +59,6 @@ extend type Query {
     getGlobalTopology(duration: Duration!): Topology
     # Query the topology, based on the given service
     getServiceTopology(serviceId: ID!, duration: Duration!): Topology
+    # Query the topology, based on the given endpoint
+    getEndpointTopology(endpointId: ID!, duration: Duration!): Topology
 }


[incubator-skywalking-query-protocol] 10/33: Update topology.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 200ea34500344dd8611ae3782329dc5eba55a825
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Sep 6 22:53:36 2018 +0800

    Update topology.graphqls
    
    Require backend to return id of Call type.
---
 topology.graphqls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/topology.graphqls b/topology.graphqls
index 49c0d06..4549e79 100644
--- a/topology.graphqls
+++ b/topology.graphqls
@@ -44,6 +44,7 @@ type Call {
     # The protocol and tech stack used in this distributed call
     callType: String!
     cpm: Long!
+    id: ID!
 }
 
 enum NodeType {


[incubator-skywalking-query-protocol] 08/33: Add service name match query.

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 3002d932a73241410796ae182a72b8c6aab7c165
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 5 16:32:09 2018 +0800

    Add service name match query.
---
 metadata.graphqls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata.graphqls b/metadata.graphqls
index d4ad3c5..d998026 100644
--- a/metadata.graphqls
+++ b/metadata.graphqls
@@ -51,6 +51,7 @@ extend type Query {
     # Service related meta info.
     getAllServices(duration: Duration!): [Service!]!
     searchServices(duration: Duration!, keyword: String!): [Service!]!
+    searchServices(duration: Duration!, serviceCode: String!): Service
 
     # Service intance query
     getServiceInstances(duration: Duration!, id: ID!): [ServiceInstance!]!


[incubator-skywalking-query-protocol] 12/33: Update aggregation.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit 9b71f9ee5e430ec9d6ec4fb188b521a0e691f964
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Sep 13 15:35:52 2018 +0800

    Update aggregation.graphqls
    
    Fix filterId type
---
 aggregation.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aggregation.graphqls b/aggregation.graphqls
index e50cc6e..1e834a1 100644
--- a/aggregation.graphqls
+++ b/aggregation.graphqls
@@ -28,7 +28,7 @@ input TopNCondition {
     #
     # Defintely, it is not required by default.
     filterScope: Scope
-    filterId: Int
+    filterId: ID
 }
 
 type TopNEntity {


[incubator-skywalking-query-protocol] 02/33: Update aggregation.graphqls

Posted by yw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ywang pushed a commit to branch new
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-query-protocol.git

commit f22e7e5194f58c380b38e80694abf7e2e2ebc90b
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Sep 4 16:27:17 2018 +0800

    Update aggregation.graphqls
    
    Add argument duration
---
 aggregation.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aggregation.graphqls b/aggregation.graphqls
index 90ade73..e50cc6e 100644
--- a/aggregation.graphqls
+++ b/aggregation.graphqls
@@ -41,5 +41,5 @@ type TopNEntity {
 # All aggregation queries require backend or/and storage do aggregation in query time.
 extend type Query {
     # TopN is an aggregation query.
-    getTopN(condition: TopNCondition!): [TopNEntity!]!
-}
\ No newline at end of file
+    getTopN(condition: TopNCondition!, duration: Duration!): [TopNEntity!]!
+}