You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/10/01 06:52:30 UTC
[skywalking-goapi] 18/26: update query protocol commit
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-goapi.git
commit 46f54262186570a7059cd95637bea87ecb33ff89
Author: JaredTan95 <ji...@daocloud.io>
AuthorDate: Wed Aug 4 14:23:52 2021 +0800
update query protocol commit
---
dependencies.sh | 2 +-
query/schema.go | 21 +++++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/dependencies.sh b/dependencies.sh
index d7120c8..82e308e 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -18,4 +18,4 @@
# under the License.
export COLLECT_PROTOCOL_SHA=e626ee04850703c220f64b642d2893fa65572943
-export QUERY_PROTOCOL_SHA=42d6783d8c1a0d0d4c2b28e58dc1f47dd554964e
+export QUERY_PROTOCOL_SHA=b827d0d7d95396b9ae87a10eef80a67af843cf3f
diff --git a/query/schema.go b/query/schema.go
index 2cf2d65..e6a6f30 100644
--- a/query/schema.go
+++ b/query/schema.go
@@ -9,10 +9,17 @@ import (
)
type AlarmMessage struct {
- StartTime int64 `json:"startTime"`
- Scope *Scope `json:"scope"`
- ID string `json:"id"`
- Message string `json:"message"`
+ StartTime int64 `json:"startTime"`
+ Scope *Scope `json:"scope"`
+ ID string `json:"id"`
+ Message string `json:"message"`
+ Events []*Event `json:"events"`
+ Tags []*KeyValue `json:"tags"`
+}
+
+type AlarmTag struct {
+ Key string `json:"key"`
+ Value *string `json:"value"`
}
type AlarmTrend struct {
@@ -178,7 +185,7 @@ type EventQueryCondition struct {
Type *EventType `json:"type"`
Time *Duration `json:"time"`
Order *Order `json:"order"`
- Size *int `json:"size"`
+ Paging *Pagination `json:"paging"`
}
type Events struct {
@@ -1122,6 +1129,7 @@ const (
TemplateTypeTopologyEndpoint TemplateType = "TOPOLOGY_ENDPOINT"
TemplateTypeTopologyServiceRelation TemplateType = "TOPOLOGY_SERVICE_RELATION"
TemplateTypeTopologyServiceInstanceRelation TemplateType = "TOPOLOGY_SERVICE_INSTANCE_RELATION"
+ TemplateTypeTopologyEndpointRelation TemplateType = "TOPOLOGY_ENDPOINT_RELATION"
)
var AllTemplateType = []TemplateType{
@@ -1131,11 +1139,12 @@ var AllTemplateType = []TemplateType{
TemplateTypeTopologyEndpoint,
TemplateTypeTopologyServiceRelation,
TemplateTypeTopologyServiceInstanceRelation,
+ TemplateTypeTopologyEndpointRelation,
}
func (e TemplateType) IsValid() bool {
switch e {
- case TemplateTypeDashboard, TemplateTypeTopologyService, TemplateTypeTopologyInstance, TemplateTypeTopologyEndpoint, TemplateTypeTopologyServiceRelation, TemplateTypeTopologyServiceInstanceRelation:
+ case TemplateTypeDashboard, TemplateTypeTopologyService, TemplateTypeTopologyInstance, TemplateTypeTopologyEndpoint, TemplateTypeTopologyServiceRelation, TemplateTypeTopologyServiceInstanceRelation, TemplateTypeTopologyEndpointRelation:
return true
}
return false