Commit 294ebb18 authored by peng.xu's avatar peng.xu
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

MS-582 grafana displays changes frequently

See merge request megasearch/milvus!604

Former-commit-id: dbb8bdeef79ff61447a037a7ae5eecbd5238c56b
parents dee0428a 6d5410ce

cpp/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,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

docker/docker-compose-monitor.yml

+7 −5
Original line number Diff line number Diff line
@@ -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"

docker/prometheus.yml

+3 −11
Original line number Diff line number Diff line
@@ -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']