Rename Monitoring.Retention to Monitoring.DataRetention

jhiemstrawisc · Oct 23, 2024 · 7ee3824 · 7ee3824
1 parent c584c46
commit 7ee3824
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/config/resources/defaults.yaml b/config/resources/defaults.yaml
@@ -88,7 +88,7 @@ Monitoring:
   MetricAuthorization: true
   PromQLAuthorization: true
   AggregatePrefixes: ["/*"]
-  Retention: 360h
+  DataRetention: 360h
 Shoveler:
   MessageQueueProtocol: amqp
   PortLower: 9930

diff --git a/docs/parameters.yaml b/docs/parameters.yaml
@@ -2255,7 +2255,7 @@ type: bool
 default: true
 components: ["origin", "cache", "director", "registry"]
 ---
-name: Monitoring.Retention
+name: Monitoring.DataRetention
 description: |+
   The duration of which Prometheus should retain the monitoring data.
 type: duration

diff --git a/param/parameters.go b/param/parameters.go
diff --git a/param/parameters_struct.go b/param/parameters_struct.go
diff --git a/web_ui/prometheus.go b/web_ui/prometheus.go
@@ -413,7 +413,7 @@ func ConfigureEmbeddedPrometheus(ctx context.Context, engine *gin.Engine) error
 		cfg.tsdb.OutOfOrderTimeWindow = promCfg.StorageConfig.TSDBConfig.OutOfOrderTimeWindow
 	}
 
-	retention, err := model.ParseDuration(param.Monitoring_Retention.GetDuration().String())
+	retention, err := model.ParseDuration(param.Monitoring_DataRetention.GetDuration().String())
 	if err != nil {
 		// If we are here, it means that the duration that was set in the config is invalid
 		return fmt.Errorf("failed to parse retention duration: %v", err)