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

[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