diff --git a/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go b/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go index b800b3409f..c309f76540 100644 --- a/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go +++ b/server/datastore/mysql/migrations/tables/20161118212557_CreateTableLabels.go @@ -23,7 +23,7 @@ func Up_20161118212557(tx *sql.Tx) error { "`description` varchar(255) DEFAULT NULL," + "`query` varchar(255) NOT NULL," + "`platform` varchar(255) DEFAULT NULL," + - fmt.Sprintf("`label_type` INT UNSIGNED NOT NULL DEFAULT %d,", kolide.LabelTypeDefault) + + fmt.Sprintf("`label_type` INT UNSIGNED NOT NULL DEFAULT %d,", kolide.LabelTypeBuiltIn) + "PRIMARY KEY (`id`)," + "UNIQUE KEY `idx_label_unique_name` (`name`)," + "FULLTEXT KEY `labels_search` (`name`)" + diff --git a/server/kolide/labels.go b/server/kolide/labels.go index 1a62d51216..9ec6c95b1d 100644 --- a/server/kolide/labels.go +++ b/server/kolide/labels.go @@ -53,10 +53,10 @@ type LabelPayload struct { type LabelType uint const ( - // LabelTypeDefault - the label can change, this is the default - LabelTypeDefault LabelType = iota - // LabelTypeBuiltIn - this type of label is created by Kolide on start up - // and can't be removed by end user. + // LabelTypeRegular is for user created labels that can be modified. + LabelTypeRegular LabelType = iota + // LabelTypeBuiltIn is for labels built into Kolide that cannot be + // modified by users. LabelTypeBuiltIn )