Skip to content

Commit c5c8727

Browse files
committed
fix test case
1 parent b1d04e7 commit c5c8727

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

apisix/plugins/prometheus/exporter.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ function _M.collect()
136136
local config = core.config.new()
137137
local version, err = config:server_version()
138138
if version then
139-
metrics.etcd_reachable:set(1, app_name_label_name)
139+
metrics.etcd_reachable:set(1, core.name)
140140

141141
else
142-
metrics.etcd_reachable:set(0, app_name_label_name)
142+
metrics.etcd_reachable:set(0, core.name)
143143
core.log.error("prometheus: failed to reach config server while ",
144144
"processing metrics endpoint: ", err)
145145
end

t/plugin/prometheus.t

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ passed
121121
--- request
122122
GET /apisix/prometheus/metrics
123123
--- response_body_like
124-
apisix_etcd_reachable 1
124+
apisix_etcd_reachable{application_name="APISIX"} 1
125125
--- no_error_log
126126
[error]
127127

@@ -151,7 +151,7 @@ apisix_etcd_reachable 1
151151
--- request
152152
GET /apisix/prometheus/metrics
153153
--- response_body eval
154-
qr/apisix_bandwidth\{type="egress",route="1",service="",node="127.0.0.1"\} \d+/
154+
qr/apisix_bandwidth\{type="egress",route="1",service="",node="127.0.0.1",application_name="APISIX"\} \d+/
155155
--- no_error_log
156156
[error]
157157

@@ -293,7 +293,7 @@ passed
293293
--- request
294294
GET /apisix/prometheus/metrics
295295
--- response_body eval
296-
qr/apisix_bandwidth\{type="egress",route="1",service="",node="127.0.0.1"\} \d+/
296+
qr/apisix_bandwidth\{type="egress",route="1",service="",node="127.0.0.1",application_name="APISIX"\} \d+/
297297
--- no_error_log
298298
[error]
299299

@@ -303,7 +303,7 @@ qr/apisix_bandwidth\{type="egress",route="1",service="",node="127.0.0.1"\} \d+/
303303
--- request
304304
GET /apisix/prometheus/metrics
305305
--- response_body eval
306-
qr/apisix_http_latency_count\{type="request",service="",node="127.0.0.1"\} \d+/
306+
qr/apisix_http_latency_count\{type="request",service="",node="127.0.0.1",application_name="APISIX"\} \d+/
307307
--- no_error_log
308308
[error]
309309

@@ -386,7 +386,7 @@ passed
386386
--- request
387387
GET /apisix/prometheus/metrics
388388
--- response_body eval
389-
qr/apisix_bandwidth\{type="egress",route="2",service="1",node="127.0.0.1"\} \d+/
389+
qr/apisix_bandwidth\{type="egress",route="2",service="1",node="127.0.0.1",application_name="APISIX"\} \d+/
390390
--- no_error_log
391391
[error]
392392

@@ -521,6 +521,6 @@ passed
521521
--- request
522522
GET /apisix/prometheus/metrics
523523
--- response_body eval
524-
qr/apisix_http_status\{code="404",route="3",service="",node="127.0.0.1"\} 2/
524+
qr/apisix_http_status\{code="404",route="3",service="",node="127.0.0.1",application_name="APISIX"\} 2/
525525
--- no_error_log
526526
[error]

0 commit comments

Comments
 (0)