bug fixes

bird-house · Jun 18, 2024 · 0307996 · 0307996
1 parent a921527
commit 0307996
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/birdhouse/optional-components/prometheus-longterm-metrics/config/monitoring/prometheus.rules b/birdhouse/optional-components/prometheus-longterm-metrics/config/monitoring/prometheus.rules
@@ -13,7 +13,3 @@ groups:
           expr: sum by(instance) (rate(node_network_transmit_bytes_total[1h]) + rate(node_network_receive_bytes_total[1h]))
           labels:
             group: longterm-metrics
-    - name: longterm-metrics-daily
-      interval: 24h
-      rules:
-
diff --git a/birdhouse/optional-components/prometheus-longterm-metrics/default.env b/birdhouse/optional-components/prometheus-longterm-metrics/default.env
@@ -8,6 +8,11 @@ export PROMETHEUS_LONGTERM_TSDB_MAX_BLOCK_DURATION=1d12h
 
 export PROMETHEUS_LONGTERM_RULES_FILE='$([ "${PROMETHEUS_LONGTERM_ENABLE_DEFAULT_RULES}" = "True" ] && echo prometheus.rules || echo prometheus.null.rules)'
 
+OPTIONAL_VARS="
+  $OPTIONAL_VARS
+  \$PROMETHEUS_LONGTERM_SCRAPE_INTERVAL
+"
+
 export DELAYED_EVAL="
   $DELAYED_EVAL
   PROMETHEUS_LONGTERM_RULES_FILE

diff --git a/birdhouse/optional-components/thanos/default.env b/birdhouse/optional-components/thanos/default.env
@@ -5,7 +5,7 @@ export THANOS_IMAGE='${THANOS_DOCKER}:${THANOS_VERSION}'
 
 export THANOS_MINIO_VERSION=RELEASE.2024-05-27T19-17-46Z
 export THANOS_MINIO_DOCKER=minio/minio
-export THANOS_MINIO_IMAGE='${MINIO_DOCKER}:${MINIO_VERSION}'
+export THANOS_MINIO_IMAGE='${THANOS_MINIO_DOCKER}:${THANOS_MINIO_VERSION}'
 
 # Minio uses object storage on disk at this location
 export THANOS_MINIO_DATA_STORE='${BIRDHOUSE_DATA_PERSIST_ROOT}/thanos_minio_data/'