From 4f83220870dfa0311b1db4c08eb5838e55c553d3 Mon Sep 17 00:00:00 2001 From: Mike Arpaia Date: Mon, 31 Oct 2016 17:05:02 -0400 Subject: [PATCH] Add description field to Query (#358) --- server/kolide/queries.go | 2 ++ server/service/service_queries.go | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/server/kolide/queries.go b/server/kolide/queries.go index c5f320b107..003ddd8171 100644 --- a/server/kolide/queries.go +++ b/server/kolide/queries.go @@ -25,6 +25,7 @@ type QueryService interface { type QueryPayload struct { Name *string + Description *string Query *string Interval *uint Snapshot *bool @@ -43,6 +44,7 @@ type Query struct { CreatedAt time.Time `json:"-"` UpdatedAt time.Time `json:"-"` Name string `json:"name" gorm:"not null;unique_index:idx_query_unique_name"` + Description string `json:"description"` Query string `json:"query" gorm:"not null"` Interval uint `json:"interval"` Snapshot bool `json:"snapshot"` diff --git a/server/service/service_queries.go b/server/service/service_queries.go index a908e7b465..2defa7831a 100644 --- a/server/service/service_queries.go +++ b/server/service/service_queries.go @@ -20,6 +20,10 @@ func (svc service) NewQuery(ctx context.Context, p kolide.QueryPayload) (*kolide query.Name = *p.Name } + if p.Description != nil { + query.Description = *p.Description + } + if p.Query != nil { query.Query = *p.Query } @@ -61,6 +65,10 @@ func (svc service) ModifyQuery(ctx context.Context, id uint, p kolide.QueryPaylo query.Name = *p.Name } + if p.Description != nil { + query.Description = *p.Description + } + if p.Query != nil { query.Query = *p.Query }