From 0001237253ed955e23feef591a0e8b5105991452 Mon Sep 17 00:00:00 2001
From: Andrea Gottardo <andrea@gottardo.me>
Date: Mon, 8 Apr 2024 14:48:17 -0500
Subject: [PATCH] docs/policy: update ADMX and ADML files with new Windows 1.62
 syspolicies

Updates ENG-2776

Updates the .admx and .adml files to include the new ManagedByOrganizationName, ManagedByCaption and ManagedByURL system policies, added in Tailscale v1.62 for Windows.

Co-authored-by: Andrea Gottardo <andrea@gottardo.me>
Signed-off-by: Nick Khyl <nickk@tailscale.com>
---
 docs/windows/policy/en-US/tailscale.adml | 20 ++++++++++++++++++++
 docs/windows/policy/tailscale.admx       | 13 +++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/docs/windows/policy/en-US/tailscale.adml b/docs/windows/policy/en-US/tailscale.adml
index 8dda9b231..e928fade0 100644
--- a/docs/windows/policy/en-US/tailscale.adml
+++ b/docs/windows/policy/en-US/tailscale.adml
@@ -13,6 +13,7 @@
             <string id="SINCE_V1_56">Tailscale version 1.56.0 and later</string>
             <string id="PARTIAL_FULL_SINCE_V1_56">Tailscale version 1.56.0 and later (full support), some earlier versions (partial support)</string>
             <string id="SINCE_V1_58">Tailscale version 1.58.0 and later</string>
+            <string id="SINCE_V1_62">Tailscale version 1.62.0 and later</string>
             <string id="Tailscale_Category">Tailscale</string>
             <string id="UI_Category">UI customization</string>
             <string id="Settings_Category">Settings</string>
@@ -195,6 +196,14 @@ If you enable this policy, then data collection is always enabled.
 If you disable this policy, then data collection is always disabled.
 
 If you do not configure this policy, then data collection depends on if it has been enabled from the CLI (as of Tailscale 1.56), it may be present in the GUI in later versions.]]></string>
+            <string id="ManagedBy">Show the "Managed By {Organization}" menu item</string>
+            <string id="ManagedBy_Help"><![CDATA[Use this policy to configure the “Managed By {Organization}” item in the Tailscale Menu.
+
+If you enable this policy, the menu item will be displayed indicating the organization name. For instance, “Managed By XYZ Corp, Inc.”. Optionally, you can provide a custom message to be displayed when a user clicks on the “Managed By” menu item, and a URL pointing to a help desk webpage or other helpful resources for users in the organization.
+
+If you disable this policy or do not configure it, the corresponding menu item will be hidden.
+
+See https://tailscale.com/kb/1315/mdm-keys#set-your-organization-name for more details.]]></string>
         </stringTable>
         <presentationTable>
             <presentation id="LoginURL">
@@ -217,6 +226,17 @@ If you do not configure this policy, then data collection depends on if it has b
                     <label>Exit Node</label>
                 </textBox>
             </presentation>
+            <presentation id="ManagedBy">
+                <textBox refId="ManagedByOrganization">
+                    <label>Organization Name:</label>
+                </textBox>
+                <textBox refId="ManagedByCustomMessage">
+                    <label>Custom Message:</label>
+                </textBox>
+                <textBox refId="ManagedBySupportURL">
+                    <label>Support URL:</label>
+                </textBox>
+            </presentation>
         </presentationTable>
     </resources>
 </policyDefinitionResources>
diff --git a/docs/windows/policy/tailscale.admx b/docs/windows/policy/tailscale.admx
index 61cc0aeec..c40e94f7d 100644
--- a/docs/windows/policy/tailscale.admx
+++ b/docs/windows/policy/tailscale.admx
@@ -42,6 +42,10 @@
                   displayName="$(string.SINCE_V1_58)">
         <and><reference ref="TAILSCALE_PRODUCT"/></and>
       </definition>
+      <definition name="SINCE_V1_62"
+                  displayName="$(string.SINCE_V1_62)">
+        <and><reference ref="TAILSCALE_PRODUCT"/></and>
+      </definition>
     </definitions>
   </supportedOn>
   <categories>
@@ -252,5 +256,14 @@
         <string>hide</string>
       </disabledValue>
     </policy>
+    <policy name="ManagedBy" class="Machine" displayName="$(string.ManagedBy)" explainText="$(string.ManagedBy_Help)" presentation="$(presentation.ManagedBy)" key="Software\Policies\Tailscale">
+      <parentCategory ref="UI_Category" />
+      <supportedOn ref="SINCE_V1_62" />
+      <elements>
+        <text id="ManagedByOrganization" valueName="ManagedByOrganizationName" required="true" />
+        <text id="ManagedByCustomMessage" valueName="ManagedByCaption" />
+        <text id="ManagedBySupportURL" valueName="ManagedByURL" />
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>