Revert "feat: configurable retention (#5)"

This reverts commit d6da3f7.
NethServer · Apr 3, 2024 · cd2b723 · cd2b723
1 parent d6da3f7
commit cd2b723
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 240 deletions.
diff --git a/README.md b/README.md
@@ -50,47 +50,6 @@ root@leader:~# logcli  query -q --no-labels -t '{nodename="leader"} | json | lin
 
 `logcli` will use the default Loki instance of the cluster, this can be changed using the environment variable [`LOKI_ADDR`](https://grafana.com/docs/loki/latest/getting-started/logcli/#example)
 
-## APIs
-
-The module provides some APIs to interact with the Loki instance:
-
-- `configure-module`
-- `get-configuration`
-
-### `configure-module`
-
-Configure the Loki instance.
-
-#### Parameters
-
-- `retention_days`: The number of days to keep the logs.
-
-#### Example
-
-```bash
-api-cli run module/loki1/configure-module '{"retention_days": 7}'
-```
-
-### `get-configuration`
-
-Get the Loki instance configuration.
-
-#### Example
-
-```bash
-api-cli run module/loki1/get-configuration
-```
-
-```json
-{
-  "retention_days": 7,
-  "active_from": "2021-05-28T15:49:27Z+00:00",
-  "active_to": "2021-05-28T15:49:27Z+00:00"
-}
-```
-
-Note: `active_to` field WILL miss if the instance is still active.
-
 ## Uninstall
 
 To uninstall the instance:

diff --git a/imageroot/actions/configure-module/10set b/imageroot/actions/configure-module/10set
diff --git a/imageroot/actions/configure-module/20restart b/imageroot/actions/configure-module/20restart
diff --git a/imageroot/actions/configure-module/validate-input.json b/imageroot/actions/configure-module/validate-input.json
diff --git a/imageroot/actions/create-module/10env b/imageroot/actions/create-module/10env
@@ -7,7 +7,6 @@
 
 import agent
 import os
-import datetime
 
 def genuuid():
     uuid =  os.popen("uuidgen")
@@ -25,5 +24,3 @@ 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', '365')
-agent.set_env('LOKI_ACTIVE_FROM', datetime.datetime.now().astimezone().isoformat())
diff --git a/imageroot/actions/get-configuration/10get b/imageroot/actions/get-configuration/10get
diff --git a/imageroot/actions/get-configuration/validate-output.json b/imageroot/actions/get-configuration/validate-output.json
diff --git a/imageroot/actions/restore-module/06copyenv b/imageroot/actions/restore-module/06copyenv
@@ -34,6 +34,5 @@ for evar in [
         "LOKI_API_AUTH_PASSWORD",
         "LOKI_LOGS_INGRESS_TOKEN",
         "LOKI_HTTP_PORT",
-        "LOKI_RETENTION_PERIOD",
     ]:
     agent.set_env(evar, original_environment[evar])
diff --git a/imageroot/events/default-instance-changed/10set b/imageroot/events/default-instance-changed/10set
diff --git a/imageroot/loki-config.yaml b/imageroot/loki-config.yaml
diff --git a/imageroot/systemd/user/loki-server.service b/imageroot/systemd/user/loki-server.service
@@ -17,12 +17,9 @@ ExecStart=/usr/bin/podman run \
     --replace \
     --name=%N \
     --volume=loki-server-data:/loki \
-    --volume=%S/loki-config.yaml:/etc/loki/local-config.yaml:Z \
-    --env=LOKI_RETENTION_PERIOD \
     ${LOKI_IMAGE} \
     -config.file=/etc/loki/local-config.yaml \
-    -log.level=warn \
-    -config.expand-env
+    -log.level warn
 
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/loki-server.ctr-id -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/loki-server.ctr-id

diff --git a/imageroot/update-module.d/10config b/imageroot/update-module.d/10config