From 124e0ce1b9a3502160a3eb2e32dca658e7b053df Mon Sep 17 00:00:00 2001
From: Javier Marcos <1271349+javuto@users.noreply.github.com>
Date: Wed, 15 Oct 2025 19:04:44 +0200
Subject: [PATCH 1/3] Skip tag creation for UUIDs, localnames and hostname

---
 cmd/admin/handlers/templates.go       |  7 +++++++
 cmd/admin/handlers/types-templates.go |  1 +
 cmd/admin/templates/tags.html         |  6 +++---
 cmd/cli/node.go                       |  6 ------
 pkg/tags/tags.go                      | 30 ++++++++++++++++-----------
 pkg/tags/utils.go                     | 26 -----------------------
 pkg/tags/utils_test.go                |  6 ------
 7 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/cmd/admin/handlers/templates.go b/cmd/admin/handlers/templates.go
index 594afa1e..663fcd55 100644
--- a/cmd/admin/handlers/templates.go
+++ b/cmd/admin/handlers/templates.go
@@ -1422,6 +1422,12 @@ func (h *HandlersAdmin) TagsGETHandler(w http.ResponseWriter, r *http.Request) {
 		log.Err(err).Msg("error getting tags")
 		return
 	}
+	// Get current tags count
+	tagsCount, err := h.Tags.CountTaggedNodes(tags)
+	if err != nil {
+		log.Err(err).Msg("error getting tags count")
+		return
+	}
 	// Get if the user is admin
 	user, err := h.Users.Get(ctx[sessions.CtxUser])
 	if err != nil {
@@ -1434,6 +1440,7 @@ func (h *HandlersAdmin) TagsGETHandler(w http.ResponseWriter, r *http.Request) {
 		Metadata:     h.TemplateMetadata(ctx, h.ServiceMetadata, user.Admin),
 		Environments: h.allowedEnvironments(ctx[sessions.CtxUser], envAll),
 		Tags:         tags,
+		CounterTags:  tagsCount,
 	}
 	if err := t.Execute(w, templateData); err != nil {
 		log.Err(err).Msg("template error")
diff --git a/cmd/admin/handlers/types-templates.go b/cmd/admin/handlers/types-templates.go
index ec037197..31e54c9f 100644
--- a/cmd/admin/handlers/types-templates.go
+++ b/cmd/admin/handlers/types-templates.go
@@ -225,6 +225,7 @@ type TagsTemplateData struct {
 	Environments []environments.TLSEnvironment
 	Platforms    []string
 	Tags         []tags.AdminTag
+	CounterTags  tags.TagCounter
 	Metadata     TemplateMetadata
 	LeftMetadata AsideLeftMetadata
 }
diff --git a/cmd/admin/templates/tags.html b/cmd/admin/templates/tags.html
index 166d3e3a..b82fbf6c 100644
--- a/cmd/admin/templates/tags.html
+++ b/cmd/admin/templates/tags.html
@@ -49,10 +49,12 @@
                       <th>Color</th>
                       <th>Icon</th>
                       <th>Environment</th>
+                      <th>Tagged Nodes</th>
                       <th></th>
                     </tr>
                   </thead>
                   <tbody>
+                  {{ $counterTags := $.CounterTags }}
                   {{range  $i, $t := $.Tags}}
                     <tr>
                       <td>
@@ -70,6 +72,7 @@
                         <b>{{ environmentFinder $t.EnvironmentID $.Environments false }}</b>
                         <input type="hidden" value="{{ environmentFinder $t.EnvironmentID $.Environments true }}" id="tag_env_{{ $t.Name }}">
                       </td>
+                      <td>{{index $counterTags $t.ID}}</td>
                       <td>
                         <button type="button" class="btn btn-sm btn-ghost-danger" onclick="confirmDeleteTag('{{ $t.Name }}');">
                           <i class="far fa-trash-alt"></i>
@@ -138,13 +141,10 @@ <h4 id="modal_title_tag" class="modal-title"></h4>
                         <select class="form-control" name="tag_type" id="tag_type">
                           <option value=""></option>
                           <option value="0">Environment</option>
-                          <option value="1">UUID</option>
                           <option value="2">Platform</option>
-                          <option value="3">Localname</option>
                           <option value="4">Custom</option>
                           <option value="5">Unknown</option>
                           <option value="6">Tag</option>
-                          <option value="7">Hostname</option>
                         </select>
                       </div>
                     </div>
diff --git a/cmd/cli/node.go b/cmd/cli/node.go
index 65523d2d..04620da3 100644
--- a/cmd/cli/node.go
+++ b/cmd/cli/node.go
@@ -163,12 +163,6 @@ func tagNode(c *cli.Context) error {
 	switch tagType {
 	case tags.TagTypeEnvStr:
 		tagTypeInt = tags.TagTypeEnv
-	case tags.TagTypeUUIDStr:
-		tagTypeInt = tags.TagTypeUUID
-	case tags.TagTypeLocalnameStr:
-		tagTypeInt = tags.TagTypeLocalname
-	case tags.TagTypeHostnameStr:
-		tagTypeInt = tags.TagTypeHostname
 	case tags.TagTypePlatformStr:
 		tagTypeInt = tags.TagTypePlatform
 	case tags.TagTypeTagStr:
diff --git a/pkg/tags/tags.go b/pkg/tags/tags.go
index 3c45179e..177cffea 100644
--- a/pkg/tags/tags.go
+++ b/pkg/tags/tags.go
@@ -44,18 +44,12 @@ const (
 	ActionUntag string = "untag"
 	// TagCustomEnv as custom tag for environment name
 	TagCustomEnv string = TagTypeEnvStr
-	// TagCustomUUID as custom tag for node UUID
-	TagCustomUUID string = TagTypeUUIDStr
 	// TagCustomPlatform as custom tag for node platform
 	TagCustomPlatform string = TagTypePlatformStr
-	// TagCustomLocalname as custom tag for node localname
-	TagCustomLocalname string = TagTypeLocalnameStr
 	// TagCustomUnknown as custom tag for unknown tags
 	TagCustomUnknown string = TagTypeUnknownStr
 	// TagCustomTag as custom tag for regular tags
 	TagCustomTag string = TagTypeTagStr
-	// TagCustomHostname as custom tag for hostname tags
-	TagCustomHostname string = TagTypeHostnameStr
 )
 
 // AdminTag to hold all tags
@@ -90,6 +84,9 @@ type TaggedNode struct {
 	UserID     uint
 }
 
+// TagCounter to hold tagged node counts
+type TagCounter map[uint]int
+
 // TagManager have all tags
 type TagManager struct {
 	DB *gorm.DB
@@ -148,13 +145,9 @@ func (m *TagManager) New(name, description, color, icon, user string, envID uint
 	case TagTypeEnv:
 		tagCustom = TagCustomEnv
 		cohort = true
-	case TagTypeUUID:
-		tagCustom = TagCustomUUID
 	case TagTypePlatform:
 		tagCustom = TagCustomPlatform
 		cohort = true
-	case TagTypeLocalname:
-		tagCustom = TagCustomLocalname
 	case TagTypeCustom:
 		tagCustom = custom
 	case TagTypeUnknown:
@@ -399,7 +392,7 @@ func (m *TagManager) ChangeEnvironment(tag *AdminTag, envID uint) error {
 
 // AutoTagNode to automatically tag a node based on multiple fields
 func (m *TagManager) AutoTagNode(env string, node nodes.OsqueryNode, user string) error {
-	l := []string{env, node.UUID, node.Platform, node.Localname}
+	l := []string{env, node.Platform}
 	return m.TagNodeMulti(l, node, user, true, "")
 }
 
@@ -538,8 +531,21 @@ func (m *TagManager) GetNodeTags(tagged []AdminTag) ([]AdminTagForNode, error) {
 // GetTaggedNodes to retrieve tagged nodes with a given tag name and environment
 func (m *TagManager) GetTaggedNodes(tag AdminTag) ([]TaggedNode, error) {
 	var tagged []TaggedNode
-	if err := m.DB.Where("id = ?", tag.ID).Find(&tagged).Error; err != nil {
+	if err := m.DB.Where("admin_tag_id = ?", tag.ID).Find(&tagged).Error; err != nil {
 		return tagged, err
 	}
 	return tagged, nil
 }
+
+// CountTaggedNodes to count tagged nodes for a given list of tags
+func (m *TagManager) CountTaggedNodes(tags []AdminTag) (TagCounter, error) {
+	tagCounter := make(TagCounter)
+	for _, t := range tags {
+		tagged, err := m.GetTaggedNodes(t)
+		if err != nil {
+			return tagCounter, err
+		}
+		tagCounter[t.ID] = len(tagged)
+	}
+	return tagCounter, nil
+}
diff --git a/pkg/tags/utils.go b/pkg/tags/utils.go
index f7271193..6c4caf57 100644
--- a/pkg/tags/utils.go
+++ b/pkg/tags/utils.go
@@ -10,14 +10,8 @@ import (
 const (
 	// TagTypeEnvStr is the tag type for shortened environment
 	TagTypeEnvStr = "env"
-	// TagTypeUUIDStr is the tag type for UUID
-	TagTypeUUIDStr = "uuid"
 	// TagTypePlatformStr is the tag type for platform
 	TagTypePlatformStr = "platform"
-	// TagTypeLocalnameStr is the tag type for localname
-	TagTypeLocalnameStr = "localname"
-	// TagTypeHostnameStr is the tag type for hostname
-	TagTypeHostnameStr = "hostname"
 	// TagTypeCustomStr is the tag type for custom
 	TagTypeCustomStr = "custom"
 	// TagTypeUnknownStr is the tag type for unknown
@@ -50,14 +44,8 @@ func TagTypeDecorator(tagType uint) string {
 	switch tagType {
 	case TagTypeEnv:
 		return TagTypeEnvStr
-	case TagTypeUUID:
-		return TagTypeUUIDStr
 	case TagTypePlatform:
 		return TagTypePlatformStr
-	case TagTypeLocalname:
-		return TagTypeLocalnameStr
-	case TagTypeHostname:
-		return TagTypeHostnameStr
 	case TagTypeCustom:
 		return TagTypeCustomStr
 	case TagTypeTag:
@@ -72,12 +60,8 @@ func TagTypeParser(tagType string) uint {
 	switch strings.ToUpper(tagType) {
 	case strings.ToUpper(TagTypeEnvStr):
 		return TagTypeEnv
-	case strings.ToUpper(TagTypeUUIDStr):
-		return TagTypeUUID
 	case strings.ToUpper(TagTypePlatformStr):
 		return TagTypePlatform
-	case strings.ToUpper(TagTypeLocalnameStr):
-		return TagTypeLocalname
 	case strings.ToUpper(TagTypeCustomStr):
 		return TagTypeCustom
 	case strings.ToUpper(TagTypeTagStr):
@@ -93,14 +77,8 @@ func SetCustomTag(tagType uint, custom string) string {
 	switch tagType {
 	case TagTypeEnv:
 		tagCustom = TagCustomEnv
-	case TagTypeUUID:
-		tagCustom = TagCustomUUID
 	case TagTypePlatform:
 		tagCustom = TagCustomPlatform
-	case TagTypeLocalname:
-		tagCustom = TagCustomLocalname
-	case TagTypeHostname:
-		tagCustom = TagCustomHostname
 	case TagTypeCustom:
 		tagCustom = custom
 	case TagTypeUnknown:
@@ -138,12 +116,8 @@ func ValidateCustom(anyCustom string) string {
 	switch strings.ToUpper(anyCustom) {
 	case strings.ToUpper(TagTypeEnvStr):
 		return TagTypeEnvStr
-	case strings.ToUpper(TagTypeUUIDStr):
-		return TagTypeUUIDStr
 	case strings.ToUpper(TagTypePlatformStr):
 		return TagTypePlatformStr
-	case strings.ToUpper(TagTypeLocalnameStr):
-		return TagTypeLocalnameStr
 	case strings.ToUpper(TagTypeCustomStr):
 		return TagTypeCustomStr
 	case strings.ToUpper(TagTypeTagStr):
diff --git a/pkg/tags/utils_test.go b/pkg/tags/utils_test.go
index c6479c57..066d43a3 100644
--- a/pkg/tags/utils_test.go
+++ b/pkg/tags/utils_test.go
@@ -20,27 +20,21 @@ func TestGetHex(t *testing.T) {
 
 func TestTagTypeDecorator(t *testing.T) {
 	assert.Equal(t, "env", TagTypeDecorator(0))
-	assert.Equal(t, "uuid", TagTypeDecorator(1))
 	assert.Equal(t, "platform", TagTypeDecorator(2))
-	assert.Equal(t, "localname", TagTypeDecorator(3))
 	assert.Equal(t, "custom", TagTypeDecorator(4))
 	assert.Equal(t, "unknown", TagTypeDecorator(5))
 }
 
 func TestTagTypeParser(t *testing.T) {
 	assert.Equal(t, uint(0), TagTypeParser("env"))
-	assert.Equal(t, uint(1), TagTypeParser("uuid"))
 	assert.Equal(t, uint(2), TagTypeParser("platform"))
-	assert.Equal(t, uint(3), TagTypeParser("localname"))
 	assert.Equal(t, uint(4), TagTypeParser("custom"))
 	assert.Equal(t, uint(5), TagTypeParser("unknown"))
 }
 
 func TestTagCustom(t *testing.T) {
 	assert.Equal(t, "env", SetCustomTag(0, "CUSTOM-VALUE"))
-	assert.Equal(t, "uuid", SetCustomTag(1, "CUSTOM-VALUE"))
 	assert.Equal(t, "platform", SetCustomTag(2, "CUSTOM-VALUE"))
-	assert.Equal(t, "localname", SetCustomTag(3, "CUSTOM-VALUE"))
 	assert.Equal(t, "CUSTOM-VALUE", SetCustomTag(4, "CUSTOM-VALUE"))
 	assert.Equal(t, "unknown", SetCustomTag(5, "CUSTOM-VALUE"))
 }

From c182b65bf2d589ff0adc372a6a0a7e6ee58bc1b8 Mon Sep 17 00:00:00 2001
From: Javier Marcos <1271349+javuto@users.noreply.github.com>
Date: Wed, 15 Oct 2025 21:30:30 +0200
Subject: [PATCH 2/3] Update cmd/admin/templates/tags.html

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 cmd/admin/templates/tags.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/admin/templates/tags.html b/cmd/admin/templates/tags.html
index b82fbf6c..6569740a 100644
--- a/cmd/admin/templates/tags.html
+++ b/cmd/admin/templates/tags.html
@@ -72,7 +72,7 @@
                         <b>{{ environmentFinder $t.EnvironmentID $.Environments false }}</b>
                         <input type="hidden" value="{{ environmentFinder $t.EnvironmentID $.Environments true }}" id="tag_env_{{ $t.Name }}">
                       </td>
-                      <td>{{index $counterTags $t.ID}}</td>
+                      <td>{{with index $counterTags $t.ID}}{{.}}{{else}}0{{end}}</td>
                       <td>
                         <button type="button" class="btn btn-sm btn-ghost-danger" onclick="confirmDeleteTag('{{ $t.Name }}');">
                           <i class="far fa-trash-alt"></i>

From 3b496e12ece07c2c39f57d6aa48e0364bea3135e Mon Sep 17 00:00:00 2001
From: Javier Marcos <1271349+javuto@users.noreply.github.com>
Date: Tue, 21 Oct 2025 00:01:13 +0200
Subject: [PATCH 3/3] PR review suggestions

---
 pkg/tags/tags.go | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/pkg/tags/tags.go b/pkg/tags/tags.go
index 177cffea..740bcf68 100644
--- a/pkg/tags/tags.go
+++ b/pkg/tags/tags.go
@@ -18,20 +18,14 @@ const (
 	DefaultAutocreated = "Autocreated"
 	// TagTypeEnv as tag type for environment name
 	TagTypeEnv uint = 0
-	// TagTypeUUID as tag type for node UUID
-	TagTypeUUID uint = 1
 	// TagTypePlatform as tag type for node platform
 	TagTypePlatform uint = 2
-	// TagTypeLocalname as tag type for node localname
-	TagTypeLocalname uint = 3
 	// TagTypeCustom as tag type for custom tags
 	TagTypeCustom uint = 4
 	// TagTypeUnknown as tag type for unknown tags
 	TagTypeUnknown uint = 5
 	// TagTypeTag as tag type for regular tags
 	TagTypeTag uint = 6
-	// TagTypeHostname as tag type for hostname tags
-	TagTypeHostname uint = 7
 	// ActionAdd as action to add a tag
 	ActionAdd string = "add"
 	// ActionEdit as action to edit a tag
@@ -540,12 +534,38 @@ func (m *TagManager) GetTaggedNodes(tag AdminTag) ([]TaggedNode, error) {
 // CountTaggedNodes to count tagged nodes for a given list of tags
 func (m *TagManager) CountTaggedNodes(tags []AdminTag) (TagCounter, error) {
 	tagCounter := make(TagCounter)
-	for _, t := range tags {
-		tagged, err := m.GetTaggedNodes(t)
-		if err != nil {
-			return tagCounter, err
+	if len(tags) == 0 {
+		return tagCounter, nil
+	}
+	// Collect tag IDs
+	tagIDs := make([]uint, len(tags))
+	for i, t := range tags {
+		tagIDs[i] = t.ID
+	}
+	// Result struct for query
+	type result struct {
+		AdminTagID uint
+		Count      int
+	}
+	var results []result
+	// Grouped count query
+	if err := m.DB.
+		Model(&TaggedNode{}).
+		Select("admin_tag_id, COUNT(*) as count").
+		Where("admin_tag_id IN ?", tagIDs).
+		Group("admin_tag_id").
+		Scan(&results).Error; err != nil {
+		return tagCounter, err
+	}
+	// Populate TagCounter from results
+	for _, r := range results {
+		tagCounter[r.AdminTagID] = r.Count
+	}
+	// Ensure all tags are present in the map (with zero if not found)
+	for _, id := range tagIDs {
+		if _, ok := tagCounter[id]; !ok {
+			tagCounter[id] = 0
 		}
-		tagCounter[t.ID] = len(tagged)
 	}
 	return tagCounter, nil
 }