diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 09929ed8d0..c8701a3fda 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -62,6 +62,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-510 - unittest out of memory and crashed - MS-507 - Dataset 10m-512, index type sq8,performance in-normal when set CPU_CACHE to 16 or 64 - MS-543 - SearchTask fail without exception +- MS-582 - grafana displays changes frequently ## Improvement - MS-327 - Clean code for milvus diff --git a/docker/docker-compose-monitor.yml b/docker/docker-compose-monitor.yml index 9cb1fb1902..81e7084af9 100644 --- a/docker/docker-compose-monitor.yml +++ b/docker/docker-compose-monitor.yml @@ -40,15 +40,17 @@ services: networks: - monitor - milvus: + milvus_server: runtime: nvidia image: registry.zilliz.com/milvus/engine:branch-0.4.0-release - container_name: milvus - hostname: milvus restart: always + links: + - prometheus + environment: + WEB_APP: host.docker.internal volumes: - - ../cpp/conf/server_config.yaml:/opt/milvus/cpp/conf/server_config.yaml - - ../cpp/conf/log_config.conf:/opt/milvus/cpp/conf/log_config.conf + - ../cpp/conf/server_config.yaml:/opt/milvus/conf/server_config.yaml + - ../cpp/conf/log_config.conf:/opt/milvus/conf/log_config.conf ports: - "8080:8080" - "19530:19530" diff --git a/docker/prometheus.yml b/docker/prometheus.yml index 7a2a07b390..91c64458a5 100644 --- a/docker/prometheus.yml +++ b/docker/prometheus.yml @@ -24,23 +24,15 @@ scrape_configs: # scheme defaults to 'http'. static_configs: - - targets: ['localhost:9090'] + - targets: ['prometheus:9090'] # scrape metrics of server - job_name: 'milvus_server' scrape_interval: 1s static_configs: - - targets: ['localhost:8080'] - - # scrape metrics of server - - job_name: 'milvus_server_1' - scrape_interval: 1s - static_configs: - - targets: ['localhost:8080'] - - + - targets: ['milvus_server:8080'] # under development - job_name: 'pushgateway' static_configs: - - targets: ['localhost:9091'] + - targets: ['pushgateway:9091']