diff --git a/conf/config-default.yaml b/conf/config-default.yaml index c5cd20e41842..a59590ec3899 100644 --- a/conf/config-default.yaml +++ b/conf/config-default.yaml @@ -217,7 +217,7 @@ plugins: # plugin list (sorted in alphabetical order) - limit-count - limit-req #- log-rotate - - node-status + #- node-status - openid-connect - prometheus - proxy-cache diff --git a/doc/plugins/node-status.md b/doc/plugins/node-status.md index c1eaae808a03..37ea6a690102 100644 --- a/doc/plugins/node-status.md +++ b/doc/plugins/node-status.md @@ -47,7 +47,7 @@ You may need to use [interceptors](../plugin-interceptors.md) to protect it. ## How To Enable -1. Configure `node-status` in the plugin list of the configuration file `apisix/conf/config.yaml`, +1. Configure `node-status` in the plugin list of the configuration file `conf/config.yaml`, then you can add this plugin in any route. ``` diff --git a/doc/zh-cn/plugins/node-status.md b/doc/zh-cn/plugins/node-status.md index 1d5e7ff6deb9..c266a7a4e39b 100644 --- a/doc/zh-cn/plugins/node-status.md +++ b/doc/zh-cn/plugins/node-status.md @@ -46,7 +46,7 @@ ## 启用插件 -1. 配置文件 `apisix/conf/config.yaml` 的 plugin list 中配置 `node-status` +1. 配置文件 `conf/config.yaml` 的 plugin list 中配置 `node-status` ``` plugins: # plugin list diff --git a/t/admin/plugins.t b/t/admin/plugins.t index 40a46d7f74d0..f81697a95fa1 100644 --- a/t/admin/plugins.t +++ b/t/admin/plugins.t @@ -40,7 +40,7 @@ __DATA__ --- request GET /apisix/admin/plugins/list --- response_body_like eval -qr/\["zipkin","request-id","fault-injection","serverless-pre-function","batch-requests","cors","ip-restriction","referer-restriction","uri-blocker","request-validation","openid-connect","wolf-rbac","hmac-auth","basic-auth","jwt-auth","key-auth","consumer-restriction","authz-keycloak","proxy-mirror","proxy-cache","proxy-rewrite","api-breaker","limit-conn","limit-count","limit-req","node-status","redirect","response-rewrite","grpc-transcode","prometheus","echo","http-logger","sls-logger","tcp-logger","kafka-logger","syslog","udp-logger","example-plugin","serverless-post-function"\]/ +qr/\["zipkin","request-id","fault-injection","serverless-pre-function","batch-requests","cors","ip-restriction","referer-restriction","uri-blocker","request-validation","openid-connect","wolf-rbac","hmac-auth","basic-auth","jwt-auth","key-auth","consumer-restriction","authz-keycloak","proxy-mirror","proxy-cache","proxy-rewrite","api-breaker","limit-conn","limit-count","limit-req","redirect","response-rewrite","grpc-transcode","prometheus","echo","http-logger","sls-logger","tcp-logger","kafka-logger","syslog","udp-logger","example-plugin","serverless-post-function"\]/ --- no_error_log [error] @@ -79,6 +79,9 @@ GET /apisix/admin/plugins === TEST 4: get plugin node-status schema +--- extra_yaml_config +plugins: + - node-status --- config location /t { content_by_lua_block { diff --git a/t/admin/schema.t b/t/admin/schema.t index 975b0f943437..fafb6407cbdb 100644 --- a/t/admin/schema.t +++ b/t/admin/schema.t @@ -272,6 +272,9 @@ qr/"disable":\{"type":"boolean"\}/ === TEST 14: get plugin node-status schema +--- extra_yaml_config +plugins: + - node-status --- request GET /apisix/admin/schema/plugins/node-status --- response_body eval diff --git a/t/debug/debug-mode.t b/t/debug/debug-mode.t index e4a7760e5d72..8917ed3a9402 100644 --- a/t/debug/debug-mode.t +++ b/t/debug/debug-mode.t @@ -71,7 +71,6 @@ loaded plugin and sort by priority: 1005 name: api-breaker loaded plugin and sort by priority: 1003 name: limit-conn loaded plugin and sort by priority: 1002 name: limit-count loaded plugin and sort by priority: 1001 name: limit-req -loaded plugin and sort by priority: 1000 name: node-status loaded plugin and sort by priority: 900 name: redirect loaded plugin and sort by priority: 899 name: response-rewrite loaded plugin and sort by priority: 506 name: grpc-transcode diff --git a/t/plugin/node-status.t b/t/plugin/node-status.t index ac7bbc01200f..9e5a86dd1c6f 100644 --- a/t/plugin/node-status.t +++ b/t/plugin/node-status.t @@ -16,6 +16,19 @@ # use t::APISIX 'no_plan'; +add_block_preprocessor(sub { + my ($block) = @_; + + my $extra_yaml_config = <<_EOC_; +plugins: + - node-status +_EOC_ + + $block->set_value("extra_yaml_config", $extra_yaml_config); + + $block; +}); + master_on(); repeat_each(1); no_long_string();