feat(helm): ✨ add metrics path option

Signed-off-by: Mario Vejlupek <[email protected]>

Author: devopsmariocom

Makefile

@@ -1,6 +1,9 @@
 test:
 	helm upgrade --install --debug -n customer-monitoring-system --set-file script_py=./examples/s3-metrics.py -f ./tmp/values.test.yaml s3-metrics ./helm
 
+test_cleanup:
+	helm uninstall -n customer-monitoring-system s3-metrics
+
 template:
 	helm template --debug --output-dir=./tmp/ -n customer-monitoring-system --set-file script_py=./examples/s3-metrics.py -f ./tmp/values.test.yaml s3-metrics ./helm
 

examples/rds-metrics.py

@@ -101,4 +101,4 @@ def collect_metrics():
             freeable_memory_gauge.labels(DBInstanceIdentifier=db_instance_id).set(freeable_memory)
 while True:
     collect_metrics()
-    time.sleep(60) # Collect metrics every minute
+    time.sleep(parse_time_string(os.environ.get('METRICS_SCRAPE_INTERVAL')).seconds)

examples/s3-metrics.py

@@ -2,6 +2,7 @@
 import boto3
 from prometheus_client import start_http_server, Gauge
 import time
+from datetime import datetime,timedelta
 import logging
 from pythonjsonlogger import jsonlogger
 
@@ -19,6 +20,19 @@
 # Create a Gauge metric for Prometheus
 s3_bucket_folder_size = Gauge('s3_bucket_folder_size', 'Size of the S3 bucket folders', ['bucket', 'folder'])
 
+def parse_time_string(time_string):
+    value = int(time_string[:-1])
+    unit = time_string[-1]
+
+    if unit == 's':
+        return timedelta(seconds=value)
+    elif unit == 'm':
+        return timedelta(minutes=value)
+    elif unit == 'h':
+        return timedelta(hours=value)
+    else:
+        raise ValueError(f"Unknown time unit: {unit}")
+
 def get_s3_bucket_folder_sizes(bucket_name):
     logger.info({"state": "processing", "bucket": bucket_name, "message": "Getting folder sizes"})
     s3 = boto3.client('s3')
@@ -52,4 +66,4 @@ def update_metrics(bucket_names):
     # Update metrics every minute
     while True:
         update_metrics(buckets)
-        time.sleep(60)
+        time.sleep(parse_time_string(os.environ.get('METRICS_SCRAPE_INTERVAL')).seconds)

helm/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 name: python-aws-exporter-base
 description: Base image for Python scripts exporting AWS resources using boto library to Prometheus
-version: 5.0.0
-appVersion: v5.0
+version: 6.0.0
+appVersion: v6.0

helm/templates/servicemonitor.yaml

@@ -11,5 +11,5 @@ spec:
   - port: http
     interval: {{ .Values.serviceMonitor.interval }}
     scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
-    path: /
+    path: {{ .Values.serviceMonitor.path }}
 {{- end }}

helm/values.yaml

@@ -28,6 +28,7 @@ serviceMonitor:
   enabled: true
   interval: 3600s
   scrapeTimeout: 30s
+  path: /metrics
 
 service:
   type: ClusterIP