fix: removed trailing "d" in retention_days

NethServer · Mar 13, 2024 · 2f796ee · 2f796ee
1 parent b091fd0
commit 2f796ee
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/imageroot/actions/configure-module/10set b/imageroot/actions/configure-module/10set
@@ -12,4 +12,4 @@ import agent
 
 request = json.load(sys.stdin)
 
-agent.set_env('LOKI_RETENTION_PERIOD', f"{request['retention_days']}d")
+agent.set_env('LOKI_RETENTION_PERIOD', f"{request['retention_days']}")
diff --git a/imageroot/actions/configure-module/validate-input.json b/imageroot/actions/configure-module/validate-input.json
@@ -10,7 +10,7 @@
     "properties": {
         "retention_days": {
             "type": "integer",
-            "description": "Retention period of logs, in days. 0 means infinite."
+            "description": "Retention period of logs, in days."
         }
     }
 }
diff --git a/imageroot/actions/create-module/10env b/imageroot/actions/create-module/10env
@@ -24,4 +24,4 @@ agent.set_env('LOKI_API_AUTH_USERNAME', 'loki')
 agent.set_env('LOKI_API_AUTH_PASSWORD', genuuid())
 agent.set_env('LOKI_LOGS_INGRESS_TOKEN', genuuid())
 agent.set_env('LOKI_HTTP_PORT', port)
-agent.set_env('LOKI_RETENTION_PERIOD', '365d')
+agent.set_env('LOKI_RETENTION_PERIOD', '365')
diff --git a/imageroot/actions/get-configuration/10get b/imageroot/actions/get-configuration/10get
@@ -10,5 +10,5 @@ import json
 import sys
 
 json.dump({
-    "retention_days": int(os.getenv('LOKI_RETENTION_PERIOD')[:-1])
+    "retention_days": int(os.getenv('LOKI_RETENTION_PERIOD'))
 }, sys.stdout)
diff --git a/imageroot/actions/get-configuration/validate-output.json b/imageroot/actions/get-configuration/validate-output.json
@@ -10,7 +10,7 @@
     "properties": {
         "retention_days": {
             "type": "integer",
-            "description": "Retention period of logs, in days. 0 means infinite."
+            "description": "Retention period of logs, in days."
         }
     }
 }
diff --git a/imageroot/loki-config.yaml b/imageroot/loki-config.yaml
@@ -49,7 +49,7 @@ chunk_store_config:
 
 table_manager:
   retention_deletes_enabled: false
-  retention_period: ${LOKI_RETENTION_PERIOD:0s}
+  retention_period: ${LOKI_RETENTION_PERIOD:365}d
 
 ruler:
   storage:

diff --git a/imageroot/update-module.d/10config b/imageroot/update-module.d/10config
@@ -11,4 +11,4 @@ import agent
 
 # Set environment variables
 if os.getenv('LOKI_RETENTION_PERIOD') is None:
-    agent.set_env('LOKI_RETENTION_PERIOD', '365d')
+    agent.set_env('LOKI_RETENTION_PERIOD', '365')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ import agent

		request = json.load(sys.stdin)

		agent.set_env('LOKI_RETENTION_PERIOD', f"{request['retention_days']}d")
		agent.set_env('LOKI_RETENTION_PERIOD', f"{request['retention_days']}")