Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Backend (ListHostsInLabels): Surface used by data when filtering hosts by labels (#14050)

Browse source
This commit is contained in:
RachelElysia 2023-09-22 15:56:44 -04:00 committed by GitHub
parent 8f6368da4e
commit e1513086f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/11346-add-used-by-data-filtered-by-labels Normal file
View file

@ -0,0 +1 @@
- Bug fix: surface used by data when filtering hosts by labels

24
server/datastore/mysql/labels.go
View file

@ -458,7 +458,7 @@ func (ds *Datastore) ListLabelsForHost(ctx context.Context, hid uint) ([]*fleet.
}
// ListHostsInLabel returns a list of fleet.Host that are associated
// with fleet.Label referened by Label ID
// with fleet.Label referenced by Label ID
func (ds *Datastore) ListHostsInLabel(ctx context.Context, filter fleet.TeamFilter, lid uint, opt fleet.HostListOptions) ([]*fleet.Host, error) {
queryFmt := `
SELECT
@ -508,6 +508,7 @@ func (ds *Datastore) ListHostsInLabel(ctx context.Context, filter fleet.TeamFilt
(SELECT name FROM teams t WHERE t.id = h.team_id) AS team_name
%s
%s
%s
FROM label_membership lm
JOIN hosts h ON (lm.host_id = h.id)
LEFT JOIN host_seen_times hst ON (h.id=hst.host_id)
@ -515,6 +516,7 @@ func (ds *Datastore) ListHostsInLabel(ctx context.Context, filter fleet.TeamFilt
LEFT JOIN host_disks hd ON (h.id=hd.host_id)
%s
%s
%s
`
failingPoliciesSelect := `,
COALESCE(failing_policies.count, 0) AS failing_policies_count,
@ -530,7 +532,25 @@ func (ds *Datastore) ListHostsInLabel(ctx context.Context, filter fleet.TeamFilt
failingPoliciesJoin = ""
}
query := fmt.Sprintf(queryFmt, hostMDMSelect, failingPoliciesSelect, hostMDMJoin, failingPoliciesJoin)
deviceMappingJoin := `LEFT JOIN (
SELECT
host_id,
CONCAT('[', GROUP_CONCAT(JSON_OBJECT('email', email, 'source', source)), ']') AS device_mapping
FROM
host_emails
GROUP BY
host_id) dm ON dm.host_id = h.id`
if !opt.DeviceMapping {
deviceMappingJoin = ""
}
var deviceMappingSelect string
if opt.DeviceMapping {
deviceMappingSelect = `,
COALESCE(dm.device_mapping, 'null') as device_mapping`
}
query := fmt.Sprintf(queryFmt, hostMDMSelect, failingPoliciesSelect, deviceMappingSelect, hostMDMJoin, failingPoliciesJoin, deviceMappingJoin)
query, params := ds.applyHostLabelFilters(filter, lid, query, opt)