Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Ignore nonexistent label query executions (#1953)

Browse source
This commit is contained in:
Tomas Touceda 2021-09-07 15:51:49 -03:00 committed by GitHub
parent 0ac4fc4c1a
commit 69e06476a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/issue-744-ignore-nonexistent-labels Normal file
View file

@ -0,0 +1 @@
* When a label is removed, ignore label query executions for that label.

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

@ -361,7 +361,7 @@ func (d *Datastore) RecordLabelQueryExecutions(host *fleet.Host, results map[uin
// Complete inserts if necessary
if len(vals) > 0 {
sql := `
INSERT INTO label_membership (updated_at, label_id, host_id) VALUES
INSERT IGNORE INTO label_membership (updated_at, label_id, host_id) VALUES
`
sql += strings.Join(bindvars, ",") +
`

38
server/datastore/mysql/labels_test.go
View file

@ -65,21 +65,21 @@ func TestLabels(t *testing.T) {
newLabels := []*fleet.LabelSpec{
// Note these are intentionally out of order
&fleet.LabelSpec{
{
Name: "label3",
Query: "query3",
Platform: "darwin",
},
&fleet.LabelSpec{
{
Name: "label1",
Query: "query1",
},
&fleet.LabelSpec{
{
Name: "label2",
Query: "query2",
Platform: "darwin",
},
&fleet.LabelSpec{
{
Name: "label4",
Query: "query4",
Platform: "darwin",
@ -129,7 +129,7 @@ func TestLabels(t *testing.T) {
// A new label targeting another platform should not effect the labels for
// this host
err = db.ApplyLabelSpecs([]*fleet.LabelSpec{
&fleet.LabelSpec{
{
Name: "label5",
Platform: "not-matching",
Query: "query5",
@ -142,7 +142,7 @@ func TestLabels(t *testing.T) {
// If a new label is added, all labels should be returned
err = db.ApplyLabelSpecs([]*fleet.LabelSpec{
&fleet.LabelSpec{
{
Name: "label6",
Platform: "",
Query: "query6",
@ -677,3 +677,29 @@ func TestLabelQueriesForCentOSHost(t *testing.T) {
require.Len(t, queries, 1)
assert.Equal(t, "select 1;", queries[fmt.Sprint(label.ID)])
}
func TestRecordNonexistentQueryLabelExecution(t *testing.T) {
db := CreateMySQLDS(t)
defer db.Close()
h1, err := db.NewHost(&fleet.Host{
DetailUpdatedAt: time.Now(),
LabelUpdatedAt: time.Now(),
SeenTime: time.Now(),
OsqueryHostID: "1",
NodeKey: "1",
UUID: "1",
Hostname: "foo.local",
})
require.Nil(t, err)
l1 := &fleet.LabelSpec{
ID: 1,
Name: "label foo",
Query: "query1",
}
err = db.ApplyLabelSpecs([]*fleet.LabelSpec{l1})
require.Nil(t, err)
require.NoError(t, db.RecordLabelQueryExecutions(h1, map[uint]*bool{99999: ptr.Bool(true)}, time.Now()))
}