Skip to content

Commit

Permalink
feat: website supports switching to v3.x and add notice for not suppo…
Browse files Browse the repository at this point in the history
…rting JDK 6/7 (#2891)
  • Loading branch information
siuhui authored Sep 13, 2024
1 parent ee6fca1 commit ba4e1c7
Show file tree
Hide file tree
Showing 13 changed files with 76 additions and 246 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Arthas was built to solve these issues. A developer can troubleshoot your produc
* Supports telnet and websocket, which enables both local and remote diagnostics with command line and browsers.
* Supports profiler/Flame Graph
* Support get objects in the heap that are instances of the specified class.
* Supports JDK 6+.
* Supports JDK 6+ (version 4.x no longer supports JDK 6 and JDK 7).
* Supports Linux/Mac/Windows.


Expand Down
2 changes: 1 addition & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ English version goes [here](README.md).
0. 怎么快速定位应用的热点,生成火焰图?
0. 怎样直接从JVM内查找某个类的实例?

`Arthas`支持JDK 6+,支持Linux/Mac/Windows,采用命令行交互模式,同时提供丰富的 `Tab` 自动补全功能,进一步方便进行问题的定位和诊断。
`Arthas`支持JDK 6+(4.x 版本不再支持 JDK 6 和 JDK 7),支持Linux/Mac/Windows,采用命令行交互模式,同时提供丰富的 `Tab` 自动补全功能,进一步方便进行问题的定位和诊断。


### 在线教程(推荐)
Expand Down
2 changes: 2 additions & 0 deletions bin/as.sh
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,8 @@ Usage:
[--use-version <value>] [--repo-mirror <value>] [--versions] [--use-http]
[--attach-only] [-c <value>] [-f <value>] [-v] [pid]
NOTE: Arthas 4 supports JDK 8+. If you need to diagnose applications running on JDK 6/7, you can use Arthas 3.
Options and Arguments:
-h,--help Print usage
--target-ip <value> The target jvm listen ip, default 127.0.0.1
Expand Down
3 changes: 2 additions & 1 deletion boot/src/main/java/com/taobao/arthas/boot/Bootstrap.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
*/
@Name("arthas-boot")
@Summary("Bootstrap Arthas")
@Description("EXAMPLES:\n" + " java -jar arthas-boot.jar <pid>\n"
@Description("NOTE: Arthas 4 supports JDK 8+. If you need to diagnose applications running on JDK 6/7, you can use Arthas 3.\n\n"
+"EXAMPLES:\n" + " java -jar arthas-boot.jar <pid>\n"
+ " java -jar arthas-boot.jar --telnet-port 9999 --http-port -1\n"
+ " java -jar arthas-boot.jar --username admin --password <password>\n"
+ " java -jar arthas-boot.jar --tunnel-server 'ws://192.168.10.11:7777/ws' --app-name demoapp\n"
Expand Down
9 changes: 9 additions & 0 deletions site/docs/.vuepress/configs/navbar/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,13 @@ export const navbarEN = [
text: "DOWNLOAD",
link: "/en/doc/download.md",
},
{
text: "VERSIONS",
children: [
{
text: "v3.x",
link: "https://arthas.aliyun.com/3.x/en/",
},
],
},
];
9 changes: 9 additions & 0 deletions site/docs/.vuepress/configs/navbar/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,13 @@ export const navbarZH = [
text: "专家答疑",
link: "/doc/expert/intro.md",
},
{
text: "版本",
children: [
{
text: "v3.x",
link: "https://arthas.aliyun.com/3.x/",
},
],
},
];
2 changes: 1 addition & 1 deletion site/docs/doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Arthas 旨在解决这些问题。开发人员可以在线解决生产问题。
6. 怎么快速定位应用的热点,生成火焰图?
7. 怎样直接从 JVM 内查找某个类的实例?

`Arthas` 支持 JDK 6+,支持 Linux/Mac/Windows,采用命令行交互模式,同时提供丰富的 `Tab` 自动补全功能,进一步方便进行问题的定位和诊断。
`Arthas` 支持 JDK 6+(4.x 版本不再支持 JDK 6 和 JDK 7),支持 Linux/Mac/Windows,采用命令行交互模式,同时提供丰富的 `Tab` 自动补全功能,进一步方便进行问题的定位和诊断。

**如果您在使用 Arthas,请让我们知道,您的使用对我们非常重要:[查看](https://github.com/alibaba/arthas/issues/111)**

Expand Down
6 changes: 6 additions & 0 deletions site/docs/doc/download.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@ java -jar arthas-boot.jar -h
## 下载离线文档

下载文档:[![](https://img.shields.io/maven-central/v/com.taobao.arthas/arthas-packaging.svg?style=flat-square "Arthas")](https://arthas.aliyun.com/download/doc/latest_version?mirror=aliyun)

---

::: warning
如需诊断 jdk 6/7 应用,请点击[此处下载 arthas 3](https://arthas.aliyun.com/3.x/doc/download.html)
:::
6 changes: 6 additions & 0 deletions site/docs/doc/install-detail.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,9 @@ as.sh
```

- Windows 平台直接删除 user home 下面的`.arthas``logs/arthas`目录

---

::: warning
如需诊断 jdk 6/7 应用,请点击[此处下载 arthas 3](https://arthas.aliyun.com/3.x/doc/install-detail.html)。
:::
2 changes: 1 addition & 1 deletion site/docs/en/doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Arthas is built to solve these issues. A developer can troubleshoot production i
- Supports telnet and WebSocket, which enables both local and remote diagnostics with command line and browsers.
- Supports profiler/Flame Graph
- Support get objects in the heap that are instances of the specified class.
- Supports JDK 6+
- Supports JDK 6+ (version 4.x no longer supports JDK 6 and JDK 7)
- Supports Linux/Mac/Windows

**If you are using Arthas, please let us know. Your feedback is very important to us: [View](https://github.com/alibaba/arthas/issues/111)**
Expand Down
6 changes: 6 additions & 0 deletions site/docs/en/doc/download.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@ java -jar arthas-boot.jar -h
## Download Offline Help Documentation

Latest Version Documentation, Click To Download:[![](https://img.shields.io/maven-central/v/com.taobao.arthas/arthas-packaging.svg?style=flat-square "Arthas")](https://arthas.aliyun.com/download/doc/latest_version)

---

:::warning
If you need to diagnose applications running on JDK 6/7, please click [here to download arthas 3](https://arthas.aliyun.com/3.x/en/doc/download.html).
:::
6 changes: 6 additions & 0 deletions site/docs/en/doc/install-detail.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,9 @@ Latest Version Documentation, Click To Download:[![](https://img.shields.io/mave
```

- On Windows, delete `.arthas` and `logs/arthas` directory under user home.

---

::: warning
If you need to diagnose applications running on JDK 6/7, please click [here to install arthas 3](https://arthas.aliyun.com/3.x/en/doc/install-detail.html).
:::
Loading

0 comments on commit ba4e1c7

Please sign in to comment.