From 56a9e2cf20f9a73234f780c8f989dc056b3d1443 Mon Sep 17 00:00:00 2001 From: Zach Wasserman Date: Fri, 7 May 2021 12:47:52 -0700 Subject: [PATCH] Add description to returned query stats (#742) Gets the description from the associated query. --- server/datastore/mysql/hosts.go | 6 ++++-- server/kolide/scheduled_queries.go | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/datastore/mysql/hosts.go b/server/datastore/mysql/hosts.go index 0392761dfa..234be740ee 100644 --- a/server/datastore/mysql/hosts.go +++ b/server/datastore/mysql/hosts.go @@ -224,10 +224,12 @@ SELECT sq.id AS scheduled_query_id, sq.query_name AS query_name, p.name AS pack_name, - p.id as pack_id + p.id as pack_id, + q.description FROM scheduled_query_stats sqs JOIN scheduled_queries sq ON (sqs.scheduled_query_id = sq.id) - JOIN packs p ON (sq.pack_id = p.id) + JOIN packs p ON (sq.pack_id = p.id) + JOIN queries q ON (sq.query_name = q.name) WHERE host_id = ? ` var stats []kolide.ScheduledQueryStats diff --git a/server/kolide/scheduled_queries.go b/server/kolide/scheduled_queries.go index c2f8084128..15829095e6 100644 --- a/server/kolide/scheduled_queries.go +++ b/server/kolide/scheduled_queries.go @@ -57,7 +57,8 @@ type ScheduledQueryStats struct { ScheduledQueryName string `json:"scheduled_query_name,omitempty" db:"scheduled_query_name"` ScheduledQueryID uint `json:"scheduled_query_id,omitempty" db:"scheduled_query_id"` - QueryName string `json:"query_name,omitempty" db:"query_name"` + QueryName string `json:"query_name,omitempty" db:"query_name"` + Description string `json:"description,omitempty" db:"description"` PackName string `json:"pack_name,omitempty" db:"pack_name"` PackID uint `json:"pack_id,omitempty" db:"pack_id"`