diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 2685f40..b1a75a8 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -26,6 +26,8 @@ services: --reload-dir /app/src depends_on: - qdrant + networks: + - maicro-network healthcheck: test: ["CMD-SHELL", "curl -f http://localhost:8000/api/v1/health || exit 1"] @@ -44,8 +46,49 @@ services: - "6334:6334" volumes: - qdrant_data:/qdrant/storage + networks: + - maicro-network healthcheck: disable: true + prometheus: + image: prom/prometheus:latest + container_name: prometheus_dev + ports: + - "9090:9090" + volumes: + - ./prometheus.yml:/etc/prometheus/prometheus.yml + - prometheus_data:/prometheus + command: + - '--config.file=/etc/prometheus/prometheus.yml' + - '--storage.tsdb.path=/prometheus' + networks: + - maicro-network + depends_on: + - maicro + + grafana: + image: grafana/grafana:latest + container_name: grafana_dev + ports: + - "3000:3000" + environment: + - GF_SECURITY_ADMIN_USER=${GRAFANA_ADMIN_USER:-admin} + - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD:-admin} + volumes: + - grafana_data:/var/lib/grafana + - ./grafana/provisioning:/etc/grafana/provisioning:ro + - ./grafana/dashboards:/var/lib/grafana/dashboards:ro + networks: + - maicro-network + depends_on: + - prometheus + volumes: qdrant_data: + prometheus_data: + grafana_data: + +networks: + maicro-network: + driver: bridge diff --git a/docker-compose.yml b/docker-compose.yml index d475ec1..55746e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,8 @@ services: env_file: - .env restart: unless-stopped + networks: + - maicro-network healthcheck: test: [ @@ -20,3 +22,46 @@ services: interval: 30s timeout: 10s retries: 3 + + prometheus: + image: prom/prometheus:latest + container_name: prometheus + ports: + - "9090:9090" + volumes: + - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro + - prometheus_data:/prometheus + command: + - "--config.file=/etc/prometheus/prometheus.yml" + - "--storage.tsdb.path=/prometheus" + depends_on: + - maicro + restart: unless-stopped + networks: + - maicro-network + + grafana: + image: grafana/grafana:latest + container_name: grafana + ports: + - "3000:3000" + environment: + GF_SECURITY_ADMIN_USER: ${GRAFANA_ADMIN_USER:-admin} + GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_ADMIN_PASSWORD:-admin} + volumes: + - grafana_data:/var/lib/grafana + - ./grafana/provisioning:/etc/grafana/provisioning:ro + - ./grafana/dashboards:/var/lib/grafana/dashboards:ro + depends_on: + - prometheus + restart: unless-stopped + networks: + - maicro-network + +volumes: + prometheus_data: + grafana_data: + +networks: + maicro-network: + driver: bridge diff --git a/grafana/dashboards/maicro-overview.json b/grafana/dashboards/maicro-overview.json new file mode 100644 index 0000000..d511efa --- /dev/null +++ b/grafana/dashboards/maicro-overview.json @@ -0,0 +1,197 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "links": [], + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": 0 + }, + { + "color": "green", + "value": 1 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 0 + }, + "id": 1, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "center", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "textMode": "auto" + }, + "pluginVersion": "11.0.0", + "targets": [ + { + "editorMode": "code", + "expr": "up{job=\"maicro\"}", + "legendFormat": "", + "range": true, + "refId": "A" + } + ], + "title": "mAIcro Up", + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 2, + "pointSize": 4, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "short" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 16, + "x": 8, + "y": 0 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "11.0.0", + "targets": [ + { + "editorMode": "code", + "expr": "up{job=\"maicro\"}", + "legendFormat": "up", + "range": true, + "refId": "A" + } + ], + "title": "mAIcro Availability (Time Series)", + "type": "timeseries" + } + ], + "refresh": "10s", + "schemaVersion": 39, + "style": "dark", + "tags": [ + "maicro", + "observability" + ], + "templating": { + "list": [] + }, + "time": { + "from": "now-15m", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "mAIcro Overview", + "uid": "maicro-overview", + "version": 1, + "weekStart": "" +} diff --git a/grafana/provisioning/dashboards/dashboards.yml b/grafana/provisioning/dashboards/dashboards.yml new file mode 100644 index 0000000..71fd7e5 --- /dev/null +++ b/grafana/provisioning/dashboards/dashboards.yml @@ -0,0 +1,11 @@ +apiVersion: 1 + +providers: + - name: mAIcro Dashboards + orgId: 1 + folder: mAIcro + type: file + disableDeletion: false + editable: true + options: + path: /var/lib/grafana/dashboards diff --git a/grafana/provisioning/datasources/prometheus.yml b/grafana/provisioning/datasources/prometheus.yml new file mode 100644 index 0000000..1a57b69 --- /dev/null +++ b/grafana/provisioning/datasources/prometheus.yml @@ -0,0 +1,9 @@ +apiVersion: 1 + +datasources: + - name: Prometheus + type: prometheus + access: proxy + url: http://prometheus:9090 + isDefault: true + editable: true diff --git a/prometheus.yml b/prometheus.yml new file mode 100644 index 0000000..f8f8822 --- /dev/null +++ b/prometheus.yml @@ -0,0 +1,13 @@ +global: + scrape_interval: 15s + evaluation_interval: 15s + +scrape_configs: + - job_name: 'maicro' + static_configs: + - targets: ['maicro:8000'] + metrics_path: '/metrics' + + - job_name: 'qdrant' + static_configs: + - targets: ['qdrant:6333'] \ No newline at end of file diff --git a/src/core/log.py b/src/core/log.py new file mode 100644 index 0000000..abb6fe0 --- /dev/null +++ b/src/core/log.py @@ -0,0 +1,14 @@ + + +import logging + + +logging.basicConfig( + level=logging.INFO, + format="%(asctime)s | %(levelname)s | %(name)s | %(message)s", +) + + +def get_logger(name: str) -> logging.Logger: + """Get a logger instance with the app's default configuration.""" + return logging.getLogger(name) \ No newline at end of file diff --git a/src/main.py b/src/main.py index 294c615..055cc1a 100644 --- a/src/main.py +++ b/src/main.py @@ -4,6 +4,7 @@ from contextlib import asynccontextmanager from fastapi import FastAPI +from core.log import get_logger from api.error_handlers import register_exception_handlers from api.routes import router @@ -12,13 +13,7 @@ from core.ingestion import ingest_from_discord, run_startup_audit import logging -logging.basicConfig( - level=logging.INFO, - format="%(asctime)s | %(levelname)s | %(name)s | %(message)s", -) - -logger = logging.getLogger(__name__) - +logger = get_logger(__name__) @asynccontextmanager async def lifespan(app: FastAPI):