Add log_upload config option to configure log upload separately from local app log level

tailscale/DOCS.md

@@ -75,6 +75,7 @@ advertise_routes:
 always_use_derp: false
 exit_node: 100.101.102.103
 log_level: info
+log_upload: false
 login_server: "https://controlplane.tailscale.com"
 share_homeassistant: disabled
 share_on_port: 443
@@ -206,9 +207,7 @@ node is specified. This is required by the Home Assistant environment.
 ### Option: `log_level`
 
 Optionally enable tailscaled debug messages in the app's log. Turn it on only
-in case you are troubleshooting, because Tailscale's daemon is quite chatty. If
-`log_level` is set to `info` or less severe level, the app also opts out of
-client log upload to log.tailscale.io.
+in case you are troubleshooting, because Tailscale's daemon is quite chatty.
 
 The `log_level` option controls the level of log output by the app and can
 be changed to be more or less verbose, which might be useful when you are
@@ -227,6 +226,16 @@ more severe level, e.g., `debug` also shows `info` messages. By default,
 the `log_level` is set to `info`, which is the recommended setting unless
 you are troubleshooting.
 
+### Option: `log_upload`
+
+Controls Tailscale's client log upload to log.tailscale.com. Enable it if your
+tailnet policy/Admin Console requires client log upload, otherwise Tailscale
+and the app can refuse to start.
+
+**Note:** When disabled, turns on Tailscale's `--no-logs-no-support` flag.
+
+This option is disabled by default.
+
 ### Option: `login_server`
 
 This option lets you to specify a custom control server instead of the default

tailscale/config.yaml

@@ -49,6 +49,7 @@ options:
     - local_subnets
   always_use_derp: false
   log_level: info
+  log_upload: false
   login_server: "https://controlplane.tailscale.com"
   share_homeassistant: disabled
   share_on_port: 443
@@ -75,6 +76,7 @@ schema:
   always_use_derp: bool
   exit_node: "match(^(?:(?:(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]?)\\d)\\.){3}(?:25[0-5]|(?:2[0-4]|1\\d|[1-9]?)\\d)|[a-fA-F\\d.:]+:[a-fA-F\\d.:]+|[a-fA-F\\d]{8}(?:-[a-fA-F\\d]{4}){3}-[a-fA-F\\d]{12}|auto:any)$)?"
   log_level: list(trace|debug|info|notice|warning|error|fatal)
+  log_upload: bool
   login_server: url
   share_homeassistant: list(disabled|serve|funnel)
   share_on_port: match(^(?:443|8443|10000)$)

tailscale/rootfs/etc/s6-overlay/s6-rc.d/init-magicdns-proxies-upstream-list/run

@@ -34,7 +34,7 @@ if bashio::config.true "accept_dns"; then
   black_white_list+=("${login_server}")
 
   # When log upload is enabled, resolve log server also
-  if bashio::debug; then
+  if bashio::config.true "log_upload"; then
     black_white_list+=("${LOG_SERVER}")
   fi
 

tailscale/rootfs/etc/s6-overlay/s6-rc.d/tailscaled/run

@@ -18,7 +18,7 @@ options+=(--state=/data/tailscaled.state)
 options+=(--statedir=/data/state)
 
 # Opt out of client log upload to log.tailscale.io
-if ! bashio::debug ; then
+if bashio::config.false "log_upload"; then
   options+=(--no-logs-no-support)
 fi
 

tailscale/translations/en.yaml

@@ -53,6 +53,13 @@ configuration:
     description: >-
       Controls the level of log details the app provides.
       This only applies to the app itself, not Tailscale.
+  log_upload:
+    name: Log upload
+    description: >-
+      Controls Tailscale's client log upload to log.tailscale.com. Enable it if your
+      tailnet policy/Admin Console requires client log upload, otherwise Tailscale
+      and the app can refuse to start.
+      This option is disabled by default.
   login_server:
     name: Login server
     description: >-