This is an automated email from the ASF dual-hosted git repository.
yihaochen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new fb19ec41ac Set the `SW_QUERY_MAX_QUERY_COMPLEXITY` default value to
3000 (#11025)
fb19ec41ac is described below
commit fb19ec41acd2db940cc2372383057dc68d933a4c
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Thu Jun 29 23:58:48 2023 +0800
Set the `SW_QUERY_MAX_QUERY_COMPLEXITY` default value to 3000 (#11025)
---
docs/en/changes/changes.md | 1 +
docs/en/setup/backend/configuration-vocabulary.md | 2 +-
oap-server/server-starter/src/main/resources/application.yml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 25e55ee762..cc984da4b2 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -32,6 +32,7 @@
* Add comment for `docker/.env` to explain the usage.
* Fix wrong environment variable name `SW_OTEL_RECEIVER_ENABLED_OTEL_RULES` to
right `SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES`.
* Fix instance query in JDBC implementation.
+* Set the `SW_QUERY_MAX_QUERY_COMPLEXITY` default value to 3000(was 1000).
#### UI
diff --git a/docs/en/setup/backend/configuration-vocabulary.md
b/docs/en/setup/backend/configuration-vocabulary.md
index ac347bf40c..7ad55f6132 100644
--- a/docs/en/setup/backend/configuration-vocabulary.md
+++ b/docs/en/setup/backend/configuration-vocabulary.md
@@ -237,7 +237,7 @@ The Configuration Vocabulary lists all available
configurations provided by `app
| - | - | sampleRate
| Sampling rate for
receiving trace. Precise to 1/10000. 10000 means sampling rate of 100% by
default.
[...]
| query | graphql | -
| GraphQL query
implementation.
[...]
| - | - | enableLogTestTool
| Enable the log testing
API to test the LAL. **NOTE**: This API evaluates untrusted code on the OAP
server. A malicious script can do significant damage (steal keys and secrets,
remove files and directories, install malware, etc). As such, please enable
this API only when you c [...]
-| - | - | maxQueryComplexity
| Maximum complexity
allowed for the GraphQL query that can be used to abort a query if the total
number of data fields queried exceeds the defined threshold.
[...]
+| - | - | maxQueryComplexity
| Maximum complexity
allowed for the GraphQL query that can be used to abort a query if the total
number of data fields queried exceeds the defined threshold.
[...]
| - | - | enableUpdateUITemplate
| Allow user add，disable
and update UI template.
[...]
| - | - | enableOnDemandPodLog
| Ondemand Pod log: fetch
the Pod logs on users' demand, the logs are fetched and displayed in real time,
and are not persisted in any kind. This is helpful when users want to do some
experiments and monitor the logs and see what's happing inside the service.
Note: if you print [...]
| query-zipkin | default | -
| This module is for
Zipkin query API and support zipkin-lens UI
[...]
diff --git a/oap-server/server-starter/src/main/resources/application.yml
b/oap-server/server-starter/src/main/resources/application.yml
index 701cc155f3..a5d21126b7 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -389,7 +389,7 @@ query:
enableLogTestTool: ${SW_QUERY_GRAPHQL_ENABLE_LOG_TEST_TOOL:false}
# Maximum complexity allowed for the GraphQL query that can be used to
# abort a query if the total number of data fields queried exceeds the
defined threshold.
- maxQueryComplexity: ${SW_QUERY_MAX_QUERY_COMPLEXITY:1000}
+ maxQueryComplexity: ${SW_QUERY_MAX_QUERY_COMPLEXITY:3000}
# Allow user add, disable and update UI template
enableUpdateUITemplate: ${SW_ENABLE_UPDATE_UI_TEMPLATE:false}
# "On demand log" allows users to fetch Pod containers' log in real time,
