Merge cockroachdb#106530

106530: ui: set ui.display_timezone as public r=zachlite a=zachlite Resolves: cockroachdb#106415 Epic: none Release note (ui change): The visibility of the cluster setting `ui.display_timezone` has been set to public. Documentation of the cluster setting has been added. No functionality has been changed. Co-authored-by: zachlite <[email protected]>
DrewKimball · Jul 10, 2023 · 5e6cc9e · 5e6cc9e
2 parents e2af0b8 + ae013cf
commit 5e6cc9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/generated/settings/settings.html b/docs/generated/settings/settings.html
@@ -258,6 +258,7 @@
 <tr><td><div id="setting-trace-snapshot-rate" class="anchored"><code>trace.snapshot.rate</code></div></td><td>duration</td><td><code>0s</code></td><td>if non-zero, interval at which background trace snapshots are captured</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-trace-span-registry-enabled" class="anchored"><code>trace.span_registry.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if set, ongoing traces can be seen at https://&lt;ui&gt;/#/debug/tracez</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-trace-zipkin-collector" class="anchored"><code>trace.zipkin.collector</code></div></td><td>string</td><td><code></code></td><td>the address of a Zipkin instance to receive traces, as &lt;host&gt;:&lt;port&gt;. If no port is specified, 9411 will be used.</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
+<tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui [etc/utc = 0, america/new_york = 1]</td><td>Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000023.1-14</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 </tbody>
 </table>
diff --git a/pkg/ui/ui.go b/pkg/ui/ui.go
@@ -51,7 +51,7 @@ var _ = settings.RegisterEnumSetting(
 		// See pkg/ui/workspaces/cluster-ui/webpack.config.js
 		// and pkg/ui/workspaces/db-console/webpack.config.js.
 	},
-)
+).WithPublic()
 
 // Assets is used for embedded JS assets required for UI.
 // In case the binary is built without UI, it provides single index.html file with