Fix prometheus on

Author: kosyachniy

Makefile

@@ -1,19 +1,18 @@
 include .env
 
-run:
+up:
 	docker compose -p base up --build -d
 
-stop:
+down:
 	docker compose -p base stop
 
-check:
+status:
 	docker ps --format "table {{.ID}}\t{{.Names}}\t{{.Image}}\t{{.Status}}\t{{.Ports}}"
 
 mongo:
 	docker exec -it `docker ps -a | grep base-mongo | cut -d ' ' -f 1` mongosh -u ${MONGO_USER} -p ${MONGO_PASS}
 
-log:
-	docker compose logs
+# TODO: logs:
 
 set:
 	sudo chmod 0755 ~

README.md

@@ -4,21 +4,19 @@ A base of file storages and databases to support ecosystem projects
 ## Run
 1. Create `.secrets/base.env` from `.env.example`
 
-2. Create folders `data/s3`, `data/mongo`, `data/redis`, `data/logs`
+2. Create folders `data/s3`, `data/mongo`, `data/prometheus`, `data/loki`, `data/alloy`, `data/grafana`, `data/redis`
 
-3. Create empty files `data/logs/mongodb.log`
-
-4. Change configuration for MongoDB:
+3. Change configuration for MongoDB:
 ```
 sudo sysctl -w vm.max_map_count=262144
 ```
 
-5. Run `make run`
+4. Run `make run`
 
-6. Set up domains `make set`
+5. Set up domains `make set`
 
-7. Set up all subdomains `sudo certbot --nginx`
+6. Set up all subdomains `sudo certbot --nginx`
 
-8. Set up S3 buckets on `https://console.chill.services/`
+7. Set up S3 buckets on `https://console.chill.services/`
 
-9. Connect to MongoDB on `mongo mongo.chill.services -u <user> -p <pass> --authenticationDatabase admin`
+8. Connect to MongoDB on `mongo mongo.chill.services -u <user> -p <pass> --authenticationDatabase admin`

compose.yml

@@ -25,8 +25,7 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASS}
     volumes:
       - ${DATA_PATH}/mongo:/data/db
-      - ${DATA_PATH}/logs:/data/logs
-      - ./configs/mongod.conf:/etc/mongod.conf
+      - ./infra/mongo/mongod.conf:/etc/mongod.conf
     command: --config /etc/mongod.conf
 
   # redis:
@@ -57,9 +56,9 @@ services:
       - "--collector.textfile.directory=/textfile"
       - "--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc|rootfs)($$|/)"
 
-  node-exporter-textfile:
+  node_exporter_textfile:
     image: busybox:1.37.0
-    container_name: base-node-exporter-textfile
+    container_name: base-node_exporter_textfile
     restart: unless-stopped
     volumes:
       - /proc:/host/proc:ro

configs/mongod.conf infra/mongo/mongod.confconfigs/mongod.conf renamed to infra/mongo/mongod.conf

@@ -19,19 +19,10 @@ server {
         add_header Access-Control-Allow-Origin "*";
     }
 
-    location /prometheus/ {
-        proxy_pass http://0.0.0.0:${PROMETHEUS_PORT}/;
-    }
-    location /grafana/ {
-        proxy_pass http://0.0.0.0:${GRAFANA_PORT}/;
-        proxy_set_header Host $http_host;
-    }
-    location /grafana/api/live {
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $http_host;
-        proxy_pass http://0.0.0.0:${GRAFANA_PORT}/;
+    # Health check
+    location /health {
+        return 200 'ok';
+        add_header Content-Type text/plain;
     }
 }
 
@@ -49,6 +40,27 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
     }
+
+    location /prometheus/ {
+        proxy_pass http://0.0.0.0:${PROMETHEUS_PORT}/;
+    }
+    location /grafana/ {
+        proxy_pass http://0.0.0.0:${GRAFANA_PORT}/;
+        proxy_set_header Host $http_host;
+    }
+    location /grafana/api/live {
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $http_host;
+        proxy_pass http://0.0.0.0:${GRAFANA_PORT}/;
+    }
+
+    # Health check
+    location /health {
+        return 200 'ok';
+        add_header Content-Type text/plain;
+    }
 }
 
 server {
@@ -65,4 +77,10 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
     }
+
+    # Health check
+    location /health {
+        return 200 'ok';
+        add_header Content-Type text/plain;
+    }
 }

infra/nginx/prod.conf

@@ -19,9 +19,9 @@ scrape_configs:
     static_configs:
       - targets: ['redis-exporter:9121']
 
-  - job_name: node-exporter
+  - job_name: node_exporter
     static_configs:
-      - targets: ['node-exporter:9100']
+      - targets: ['node_exporter:9100']
         labels:
           env: prod
           name: master