From e22eba7ae957b93c2fc358c03900bca9105fad4a Mon Sep 17 00:00:00 2001 From: nmarrs Date: Tue, 9 Dec 2025 10:34:18 -0800 Subject: [PATCH] Revert expiration default changes to main branch state These changes are being handled in a separate PR branch (short-url-default-never-expire), so removing them from this branch to avoid duplication. --- conf/defaults.ini | 4 ++-- conf/sample.ini | 4 ++-- pkg/setting/setting.go | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index bb462b5c745..a72b0183290 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -1747,9 +1747,9 @@ enabled = true #################################### Short Links ############################# [short_links] -# Short links that are never accessed will be deleted as cleanup. Time is set up in days. The default is -1 (never expire). Maximum value is 365. +# Short links that are never accessed will be deleted as cleanup. Time is set up in days. The default is 7 days. Maximum value is 365. # 0 means they will be deleted approximately every 10 minutes. A negative value (such as -1) will disable expiration. -expire_time = -1 +expire_time = 7 #################################### Internal Grafana Metrics ############ # Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId diff --git a/conf/sample.ini b/conf/sample.ini index ed39a012a2d..d6397f894e4 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -1689,8 +1689,8 @@ default_datasource_uid = #################################### Short Links ############################# [short_links] -# Short links which are never accessed will be deleted as cleanup. Time is in days. Default is -1 (never expire). Max is 365. 0 means they will be deleted approximately every 10 minutes. A negative value (such as -1) will disable expiration. -;expire_time = -1 +# Short links which are never accessed will be deleted as cleanup. Time is in days. Default is 7 days. Max is 365. 0 means they will be deleted approximately every 10 minutes. +;expire_time = 7 #################################### Internal Grafana Metrics ########################## # Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 101a43acc26..f6c0b3d3f19 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -1330,13 +1330,12 @@ func (cfg *Cfg) parseINIFile(iniFile *ini.File) error { cfg.QueryHistoryEnabled = queryHistory.Key("enabled").MustBool(true) shortLinks := iniFile.Section("short_links") - cfg.ShortLinkExpiration = shortLinks.Key("expire_time").MustInt(-1) + cfg.ShortLinkExpiration = shortLinks.Key("expire_time").MustInt(7) if cfg.ShortLinkExpiration > 365 { cfg.Logger.Warn("short_links expire_time must be less than 366 days. Setting to 365 days") cfg.ShortLinkExpiration = 365 } - // -1 means never expire, which is allowed panelsSection := iniFile.Section("panels") cfg.DisableSanitizeHtml = panelsSection.Key("disable_sanitize_html").MustBool(false)