Update standalone monitoring config

milvus-io · Nov 14, 2024 · c668bd4 · c668bd4
1 parent 37131cb
commit c668bd4
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/.../standalone_monitoring/docker-compose.yml → .../standalone-monitoring/docker-compose.yml b/.../standalone_monitoring/docker-compose.yml → .../standalone-monitoring/docker-compose.yml
@@ -64,18 +64,20 @@ services:
   prometheus:
     image: prom/prometheus
     container_name: prometheus
+    user: root
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
     ports:
       - 9090:9090
     restart: unless-stopped
     volumes:
       - ./prometheus:/etc/prometheus
-      - prom_data:/prometheus
+      - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/prometheus:/prometheus
 
   grafana:
     image: grafana/grafana
     container_name: grafana
+    user: root
     ports:
       - 3000:3000
     restart: unless-stopped
@@ -86,9 +88,7 @@ services:
       - ./grafana/datasource.yml:/etc/grafana/provisioning/datasources/datasource.yml
       - ./grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/main.yml
       - ./grafana/dashboards:/var/lib/grafana/dashboards
-
-volumes:
-  prom_data:
+      - ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/grafana:/var/lib/grafana
 
 networks:
   default:

diff --git a/...andalone_monitoring/grafana/dashboard.yml → ...andalone-monitoring/grafana/dashboard.yml b/...andalone_monitoring/grafana/dashboard.yml → ...andalone-monitoring/grafana/dashboard.yml
diff --git a/...shboards/milvus-standalone-dashboard.json → ...shboards/milvus-standalone-dashboard.json b/...shboards/milvus-standalone-dashboard.json → ...shboards/milvus-standalone-dashboard.json
diff --git a/...ndalone_monitoring/grafana/datasource.yml → ...ndalone-monitoring/grafana/datasource.yml b/...ndalone_monitoring/grafana/datasource.yml → ...ndalone-monitoring/grafana/datasource.yml
diff --git a/assets/standalone_monitoring/milvus.yaml → assets/standalone-monitoring/milvus.yaml b/assets/standalone_monitoring/milvus.yaml → assets/standalone-monitoring/milvus.yaml
@@ -1005,10 +1005,6 @@ trace:
     secure: true
   initTimeoutSeconds: 10 # segcore initialization timeout in seconds, preventing otlp grpc hangs forever
 
-metrics:
-  serviceMontior:
-    enabled: true
-
 #when using GPU indexing, Milvus will utilize a memory pool to avoid frequent memory allocation and deallocation.
 #here, you can set the size of the memory occupied by the memory pool, with the unit being MB.
 #note that there is a possibility of Milvus crashing when the actual memory demand exceeds the value set by maxMemSize.

diff --git a/...one_monitoring/prometheus/alert_rules.yml → ...one-monitoring/prometheus/alert_rules.yml b/...one_monitoring/prometheus/alert_rules.yml → ...one-monitoring/prometheus/alert_rules.yml
diff --git a/...lone_monitoring/prometheus/prometheus.yml → ...lone-monitoring/prometheus/prometheus.yml b/...lone_monitoring/prometheus/prometheus.yml → ...lone-monitoring/prometheus/prometheus.yml
@@ -27,7 +27,7 @@ scrape_configs:
     - targets: ['localhost:9090']
 
    # Allows ephemeral and batch jobs to expose their metrics to Prometheus 
-  - job_name: 'pushgateway'
+  - job_name: 'milvus-standalone'
     honor_labels: true
     metrics_path: /metrics
     static_configs: