add sensible default for monitoring retention (#493)

* add sensible default for monitoring retention * Update index.rst * test sleep * Revert "test sleep" This reverts commit 88ebf90. * pin mosquitto --------- Co-authored-by: Tom Kralidis <tomkralidis@gmail.com>
wmo-im · Aug 23, 2023 · 9e039d2 · 9e039d2
1 parent c991011
commit 9e039d2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/docs/source/reference/monitoring/index.rst b/docs/source/reference/monitoring/index.rst
@@ -25,6 +25,9 @@ wis2box also analyzes prometheus metrics from MinIO.
 
    For more information see the `list of supported MinIO metrics <https://github.com/minio/minio/blob/master/docs/metrics/prometheus/list.md>`_
 
+The default retention period for Prometheus metrics is 10 days. 
+This value can be modified in the Prometheus configuration at ``prometheus/prometheus.yml``. 
+
 Loki logging
 ------------
 
@@ -37,6 +40,9 @@ The logs of the following Docker containers are sent to Loki:
 - wis2box-auth
 - wis2box-ui
 
+The default retention period for Loki logs is 10 days. 
+This value can be modified in the Loki configuration at ``loki/loki-config.yml``. 
+
 Monitoring topics
 -----------------
 

diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
@@ -11,6 +11,11 @@ alerting:
     - targets:
       # - alertmanager:9093
 
+storage:
+  tsdb:
+    retention:
+      time: 240h
+
 scrape_configs:
 - job_name: minio-job
   metrics_path: /minio/v2/metrics/cluster

diff --git a/wis2box-broker/Dockerfile b/wis2box-broker/Dockerfile
@@ -19,7 +19,7 @@
 #
 ###############################################################################
 
-FROM eclipse-mosquitto
+FROM eclipse-mosquitto:2.0.15
 
 RUN mkdir -p /data/wis2box/mosquitto
 RUN ln -s /mosquitto /data/wis2box/mosquitto

diff --git a/wis2box-broker/entrypoint.sh b/wis2box-broker/entrypoint.sh
@@ -10,7 +10,6 @@ if [ -f /tmp/wis2box.crt ]; then
     cp /mosquitto/config/mosquitto-ssl.conf /mosquitto/config/mosquitto.conf
 else
     echo "SSL disabled"
-    cp /mosquitto/config/mosquitto.conf /mosquitto/config/mosquitto.conf
 fi
 
 echo "Setting mosquitto authentication"