From d84e2c774f589c82221c8e4ffdeb7b3725cb9785 Mon Sep 17 00:00:00 2001
From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com>
Date: Tue, 27 Jan 2026 12:24:56 -0600
Subject: [PATCH] =?UTF-8?q?Consolidate=20"Servers"=20teams=20into=20a=20si?=
 =?UTF-8?q?ngle=20"=E2=98=81=EF=B8=8F=20IT=20Servers"=20team=20(#38851)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This pull request removes the configuration and team settings for the
"Servers (canary)" group and updates the display name for the main
servers team. The most significant changes are the deletion of the
`servers-canary` agent options and team configuration, and a minor
update to the `servers` team name.

Removed configuration for "Servers (canary)":

* Deleted the `servers-canary.agent-options.yml` file, which contained
agent configuration and update channel settings for canary servers.
* Removed the `servers-canary.yml` team configuration, including team
settings, secrets, agent options, controls, and policy/query/software
placeholders.

Updated team naming:

* Changed the display name in `servers.yml` from "☁️ Servers" to "☁️ IT
Servers" for clarity.
---
 .../servers-canary.agent-options.yml          | 18 -----------
 it-and-security/teams/servers-canary.yml      | 32 -------------------
 it-and-security/teams/servers.yml             |  2 +-
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 it-and-security/lib/all/agent-options/servers-canary.agent-options.yml
 delete mode 100644 it-and-security/teams/servers-canary.yml

diff --git a/it-and-security/lib/all/agent-options/servers-canary.agent-options.yml b/it-and-security/lib/all/agent-options/servers-canary.agent-options.yml
deleted file mode 100644
index 7522fbcad5..0000000000
--- a/it-and-security/lib/all/agent-options/servers-canary.agent-options.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-config:
-  decorators:
-    load:
-      - SELECT uuid AS host_uuid FROM system_info;
-      - SELECT hostname AS hostname FROM system_info;
-  options:
-    disable_distributed: false
-    distributed_interval: 10
-    distributed_plugin: tls
-    distributed_tls_max_attempts: 3
-    logger_tls_endpoint: /api/osquery/log
-    logger_tls_period: 10
-    pack_delimiter: /
-update_channels:
-  # We want to use these hosts to smoke test edge releases.
-  osqueryd: edge
-  orbit: edge
-  desktop: edge
diff --git a/it-and-security/teams/servers-canary.yml b/it-and-security/teams/servers-canary.yml
deleted file mode 100644
index 7cf811d5e1..0000000000
--- a/it-and-security/teams/servers-canary.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: "☁️🐣 Servers (canary)"
-team_settings:
-  features:
-    enable_host_users: true
-    enable_software_inventory: true
-  host_expiry_settings:
-    host_expiry_enabled: true
-    host_expiry_window: 30
-  secrets:
-    - secret: $DOGFOOD_SERVERS_CANARY_ENROLL_SECRET
-agent_options:
-  path: ../lib/all/agent-options/servers-canary.agent-options.yml
-controls:
-  enable_disk_encryption: false
-  macos_settings:
-    custom_settings:
-  macos_setup:
-    bootstrap_package: null
-    enable_end_user_authentication: false
-    macos_setup_assistant: null
-  macos_updates:
-    deadline: null
-    minimum_version: null
-  windows_settings:
-    custom_settings: null
-  windows_updates:
-    deadline_days: null
-    grace_period_days: null
-  scripts:
-policies:
-queries:
-software:
diff --git a/it-and-security/teams/servers.yml b/it-and-security/teams/servers.yml
index a93cd6aed5..f53061a5e1 100644
--- a/it-and-security/teams/servers.yml
+++ b/it-and-security/teams/servers.yml
@@ -1,4 +1,4 @@
-name: "☁️ Servers"
+name: "☁️ IT Servers"
 team_settings:
   features:
     enable_host_users: true