Skip to content

Commit e83ba65

Browse files
committed
Fix issues
Signed-off-by: Joshua Yao <yi.a.yao@intel.com>
1 parent bd0748a commit e83ba65

8 files changed

Lines changed: 46 additions & 18 deletions

File tree

AudioQnA/docker_compose/intel/cpu/xeon/prometheus.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ scrape_configs:
1717
metrics_path: /metrics
1818
static_configs:
1919
- targets: ["tgi-service:80"]
20-
- job_name: "docsum-backend-server"
20+
- job_name: "audioqna-backend-server"
2121
metrics_path: /metrics
2222
static_configs:
2323
- targets: ["audioqna-xeon-backend-server:8888"]
2424
- job_name: "prometheus-node-exporter"
25+
scrape_interval: 30s
26+
scrape_timeout: 25s
2527
metrics_path: /metrics
2628
static_configs:
2729
- targets: ["node-exporter:9100"]

AudioQnA/docker_compose/intel/cpu/xeon/set_env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ export BACKEND_SERVICE_ENDPOINT=http://${host_ip}:3008/v1/audioqna
2727
pushd "${SCRIPT_DIR}/grafana/dashboards" > /dev/null
2828
source download_opea_dashboard.sh
2929
popd > /dev/null
30+
31+
export no_proxy="${no_proxy},localhost,127.0.0.1,${host_ip},node-exporter,opea_prometheus,grafana"

AudioQnA/docker_compose/intel/hpu/gaudi/compose.monitoring.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ services:
4747
command:
4848
- '--path.procfs=/host/proc'
4949
- '--path.sysfs=/host/sys'
50-
- --collector.filesystem.ignored-mount-points
50+
- --collector.filesystem.mount-points-exclude
5151
- "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
5252
environment:
5353
no_proxy: ${no_proxy}
@@ -57,3 +57,18 @@ services:
5757
restart: always
5858
deploy:
5959
mode: global
60+
61+
gaudi-metrics-exporter:
62+
image: vault.habana.ai/gaudi-metric-exporter/metric-exporter:latest
63+
privileged: true
64+
container_name: gaudi-metrics-exporter
65+
volumes:
66+
- /proc:/host/proc:ro
67+
- /sys:/host/sys:ro
68+
- /:/rootfs:ro
69+
- /dev:/dev
70+
deploy:
71+
mode: global
72+
ports:
73+
- 41611:41611
74+
restart: unless-stopped

AudioQnA/docker_compose/intel/hpu/gaudi/grafana/dashboards/download_opea_dashboard.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# Copyright (C) 2025 Intel Corporation
33
# SPDX-License-Identifier: Apache-2.0
44

5-
# if ls *.json 1> /dev/null 2>&1; then
6-
# rm *.json
7-
# fi
5+
if ls *.json 1> /dev/null 2>&1; then
6+
rm *.json
7+
fi
88

99
wget https://raw.githubusercontent.com/opea-project/GenAIEval/refs/heads/main/evals/benchmark/grafana/vllm_grafana.json
1010
wget https://raw.githubusercontent.com/opea-project/GenAIEval/refs/heads/main/evals/benchmark/grafana/tgi_grafana.json
11-
# wget https://raw.githubusercontent.com/opea-project/GenAIEval/refs/heads/main/evals/benchmark/grafana/audioqna_megaservice_grafana.json
11+
wget https://raw.githubusercontent.com/opea-project/GenAIEval/refs/heads/main/evals/benchmark/grafana/gaudi_grafana_v2.json
12+
wget https://raw.githubusercontent.com/opea-project/GenAIEval/refs/heads/main/evals/benchmark/grafana/audioqna_megaservice_grafana.json
1213
wget https://raw.githubusercontent.com/opea-project/GenAIEval/refs/heads/main/evals/benchmark/grafana/node_grafana.json

AudioQnA/docker_compose/intel/hpu/gaudi/prometheus.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,23 @@ scrape_configs:
1212
- job_name: "vllm"
1313
metrics_path: /metrics
1414
static_configs:
15-
- targets: ["vllm-service:80"]
15+
- targets: ["vllm-gaudi-service:80"]
1616
- job_name: "tgi"
1717
metrics_path: /metrics
1818
static_configs:
19-
- targets: ["tgi-service:80"]
20-
- job_name: "docsum-backend-server"
19+
- targets: ["tgi-gaudi-service:80"]
20+
- job_name: "audioqna-backend-server"
2121
metrics_path: /metrics
2222
static_configs:
2323
- targets: ["audioqna-gaudi-backend-server:8888"]
2424
- job_name: "prometheus-node-exporter"
25+
scrape_interval: 30s
26+
scrape_timeout: 25s
2527
metrics_path: /metrics
2628
static_configs:
2729
- targets: ["node-exporter:9100"]
30+
- job_name: "gaudi-metrics-exporter"
31+
scrape_interval: 30s
32+
metrics_path: /metrics
33+
static_configs:
34+
- targets: ["gaudi-metrics-exporter:41611"]

AudioQnA/docker_compose/intel/hpu/gaudi/set_env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ export BACKEND_SERVICE_ENDPOINT=http://${host_ip}:3008/v1/audioqna
3232
pushd "${SCRIPT_DIR}/grafana/dashboards" > /dev/null
3333
source download_opea_dashboard.sh
3434
popd > /dev/null
35+
36+
export no_proxy="${no_proxy},localhost,127.0.0.1,${host_ip},node-exporter,opea_prometheus,grafana"

AudioQnA/tests/test_compose_on_gaudi.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function start_services() {
4343
docker compose -f compose.yaml -f compose.monitoring.yaml up -d > ${LOG_PATH}/start_services_with_compose.log
4444
n=0
4545
until [[ "$n" -ge 200 ]]; do
46-
docker logs vllm-gaudi-service > $LOG_PATH/vllm_service_start.log 2>&1
46+
docker logs vllm-gaudi-service 2>&1| tee $LOG_PATH/vllm_service_start.log
4747
if grep -q complete $LOG_PATH/vllm_service_start.log; then
4848
break
4949
fi
@@ -53,8 +53,8 @@ function start_services() {
5353

5454
n=0
5555
until [[ "$n" -ge 100 ]]; do
56-
docker logs whisper-service > $LOG_PATH/whisper_service_start.log
57-
if grep -q "Uvicorn server setup on port" $LOG_PATH/whisper_service_start.log; then
56+
docker logs whisper-service 2>&1| tee $LOG_PATH/whisper_service_start.log
57+
if grep -q "Uvicorn running on" $LOG_PATH/whisper_service_start.log; then
5858
break
5959
fi
6060
sleep 5s
@@ -65,16 +65,15 @@ function start_services() {
6565

6666
function validate_megaservice() {
6767
response=$(http_proxy="" curl http://${ip_address}:3008/v1/audioqna -XPOST -d '{"audio": "UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA", "max_tokens":64}' -H 'Content-Type: application/json')
68-
# always print the log
69-
docker logs whisper-service > $LOG_PATH/whisper-service.log
70-
docker logs speecht5-service > $LOG_PATH/tts-service.log
71-
docker logs vllm-gaudi-service > $LOG_PATH/vllm-gaudi-service.log
72-
docker logs audioqna-gaudi-backend-server > $LOG_PATH/audioqna-gaudi-backend-server.log
7368
echo "$response" | sed 's/^"//;s/"$//' | base64 -d > speech.mp3
7469

7570
if [[ $(file speech.mp3) == *"RIFF"* ]]; then
7671
echo "Result correct."
7772
else
73+
docker logs whisper-service > $LOG_PATH/whisper-service.log
74+
docker logs speecht5-service > $LOG_PATH/tts-service.log
75+
docker logs vllm-gaudi-service > $LOG_PATH/vllm-gaudi-service.log
76+
docker logs audioqna-gaudi-backend-server > $LOG_PATH/audioqna-gaudi-backend-server.log
7877
echo "Result wrong."
7978
exit 1
8079
fi

AudioQnA/tests/test_compose_tgi_on_gaudi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function start_services() {
5252
n=0
5353
until [[ "$n" -ge 100 ]]; do
5454
docker logs whisper-service > $LOG_PATH/whisper_service_start.log
55-
if grep -q "Uvicorn server setup on port" $LOG_PATH/whisper_service_start.log; then
55+
if grep -q "Uvicorn running on" $LOG_PATH/whisper_service_start.log; then
5656
break
5757
fi
5858
sleep 5s

0 commit comments

Comments
 (0)