[skywalking] branch master updated: Fix a missing part about tag in the alarm doc and be clear about JDK versions of agent (#6859)

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 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 1ff0e42  Fix a missing part about tag in the alarm doc and be clear about JDK versions of agent (#6859)
1ff0e42 is described below

commit 1ff0e42ab842e53fce75a7f9a357112b5a3d7cd1
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Apr 28 12:09:20 2021 +0800

    Fix a missing part about tag in the alarm doc and be clear about JDK versions of agent (#6859)
---
 docs/en/setup/backend/backend-alarm.md           | 2 +-
 docs/en/setup/service-agent/java-agent/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/setup/backend/backend-alarm.md b/docs/en/setup/backend/backend-alarm.md
index 21ffb19..e3d2381 100644
--- a/docs/en/setup/backend/backend-alarm.md
+++ b/docs/en/setup/backend/backend-alarm.md
@@ -30,7 +30,7 @@ Alarm rule is constituted by following keys
 - **Exclude labels**. The following labels of the metric are excluded in this rule.
 - **Include labels regex**. Provide a regex to include labels. If both setting the include label list and include label regex, both rules will take effect.
 - **Exclude labels regex**. Provide a regex to exclude labels. If both setting the exclude label list and exclude label regex, both rules will take effect.
-- **Tags**. Tags are key/value pairs that are attached to alarms. Tags are intended to be used to specify identifying attributes of alarms that are meaningful and relevant to users.
+- **Tags**. Tags are key/value pairs that are attached to alarms. Tags are intended to be used to specify identifying attributes of alarms that are meaningful and relevant to users. If you want to these tags searchable on SkyWalking UI, you need to set the tag keys in `core/default/searchableAlarmTags`, or through system environment variable, `SW_SEARCHABLE_ALARM_TAG_KEYS`. The default supported key is `level`.
 
 *The settings of labels is required by meter-system which intends to store metrics from label-system platform, just like Prometheus, Micrometer, etc.
 The function supports the above four settings should implement `LabeledValueHolder`.*
diff --git a/docs/en/setup/service-agent/java-agent/README.md b/docs/en/setup/service-agent/java-agent/README.md
index 562ee7d..337d1f5 100755
--- a/docs/en/setup/service-agent/java-agent/README.md
+++ b/docs/en/setup/service-agent/java-agent/README.md
@@ -1,5 +1,5 @@
 # Setup java agent
-1. Agent is available for JDK 8 - 14 in 7.x releases. JDK 1.6 - JDK 12 are supported in all 6.x releases [NOTICE¹](#notice)
+1. Agent is available for JDK 8 - 14.
 1. Find `agent` folder in SkyWalking release package
 1. Set `agent.service_name` in `config/agent.config`. Could be any String in English.
 1. Set `collector.backend_service` in `config/agent.config`. Default point to `127.0.0.1:11800`, only works for local backend.