This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/master by this push:
new f74ef4dc40 update links (#2495)
f74ef4dc40 is described below
commit f74ef4dc4059384814e5f4c4bd928db65b5ac235
Author: Ken Liu <[email protected]>
AuthorDate: Mon Apr 3 22:00:19 2023 +0800
update links (#2495)
---
content/en/blog/releases/3.0.2.md | 3 +-
content/zh-cn/blog/news/releases/3.0.2.md | 5 +-
content/zh-cn/blog/news/releases/dubbo-go-1.4.md | 2 +-
content/zh-cn/blog/news/releases/dubbo-go-1.5.1.md | 2 +-
.../golang/dubbo-go-1.5/configuration/client.md | 2 +-
.../golang/dubbo-go-1.5/configuration/provider.md | 2 +-
.../overview/reference/integrations/grafana.md | 74 +++++++++++++--------
.../overview/reference/integrations/prometheus.md | 6 +-
static/imgs/v3/advantages/grafana-dashboard-1.png | Bin 103400 -> 428591 bytes
static/imgs/v3/advantages/grafana-dashboard-2.png | Bin 213682 -> 432535 bytes
10 files changed, 54 insertions(+), 42 deletions(-)
diff --git a/content/en/blog/releases/3.0.2.md
b/content/en/blog/releases/3.0.2.md
index 68a44fab95..5594a6d47e 100644
--- a/content/en/blog/releases/3.0.2.md
+++ b/content/en/blog/releases/3.0.2.md
@@ -85,8 +85,7 @@ Thanks for these contribution to improve stability of Apache
Dubbo.
[#8161](https://github.com/apache/dubbo/pull/8161),
[#8183](https://github.com/apache/dubbo/pull/8183),
[#8205](https://github.com/apache/dubbo/pull/8205),
-[#8215](https://github.com/apache/dubbo/pull/8215),
-[#8173](https://github.com/apache/dubbo/pull/8173),
+[#8173](https://github.com/apache/dubbo/pull/8173),
[#8219](https://github.com/apache/dubbo/pull/8219),
[#8228](https://github.com/apache/dubbo/pull/8228),
[#8232](https://github.com/apache/dubbo/pull/8232),
diff --git a/content/zh-cn/blog/news/releases/3.0.2.md
b/content/zh-cn/blog/news/releases/3.0.2.md
index 7c74b883ba..d1a59c1642 100644
--- a/content/zh-cn/blog/news/releases/3.0.2.md
+++ b/content/zh-cn/blog/news/releases/3.0.2.md
@@ -84,9 +84,8 @@ description: >
[#8180](https://github.com/apache/dubbo/pull/8180),
[#8161](https://github.com/apache/dubbo/pull/8161),
[#8183](https://github.com/apache/dubbo/pull/8183),
-[#8205](https://github.com/apache/dubbo/pull/8205),
-[#8215](https://github.com/apache/dubbo/pull/8215),
-[#8173](https://github.com/apache/dubbo/pull/8173),
+[#8205](https://github.com/apache/dubbo/pull/8205),
+[#8173](https://github.com/apache/dubbo/pull/8173),
[#8219](https://github.com/apache/dubbo/pull/8219),
[#8228](https://github.com/apache/dubbo/pull/8228),
[#8232](https://github.com/apache/dubbo/pull/8232),
diff --git a/content/zh-cn/blog/news/releases/dubbo-go-1.4.md
b/content/zh-cn/blog/news/releases/dubbo-go-1.4.md
index 72e4bffeb3..031cac102d 100644
--- a/content/zh-cn/blog/news/releases/dubbo-go-1.4.md
+++ b/content/zh-cn/blog/news/releases/dubbo-go-1.4.md
@@ -147,7 +147,7 @@ Dubbo 鉴权认证是为了避免敏感接口被匿名用户调用而在 SDK 层
目前这些规划的 任务清单[^4]，都已经放入在 dubbo-go 项目的 issue 里面，欢迎感兴趣的朋友认领参与开发。dubbo-go 社区在
**钉钉群 23331795** 欢迎你的加入。
-[^1]:
https://github.com/apache/dubbo-go-samples/tree/release-1.5/registry/kubernetes
+[^1]: https://github.com/apache/dubbo-go-samples/tree/1.5/registry/kubernetes
[^2]:
https://github.com/dubbogo/dubbo-samples/tree/master/golang/router/condition
[^3]:
https://github.com/dubbogo/dubbo-samples/tree/master/golang/configcenter/nacos
[^4]: https://github.com/apache/dubbo-go/milestone/1
diff --git a/content/zh-cn/blog/news/releases/dubbo-go-1.5.1.md
b/content/zh-cn/blog/news/releases/dubbo-go-1.5.1.md
index 54857c8f45..21fc8d5e65 100644
--- a/content/zh-cn/blog/news/releases/dubbo-go-1.5.1.md
+++ b/content/zh-cn/blog/news/releases/dubbo-go-1.5.1.md
@@ -28,7 +28,7 @@ description: >
基于 Seata 扩展实现。通过增加过滤器，在服务端接收 xid 并结合
[seata-golang](https://github.com/seata-golang/seata-golang) 达到支持分布式事务的目的。 从而使
Dubbo-go 在分布式场景下，让用户有更多的选择，能适应更多的个性化场景。
-我们在 dubbo-samples 中给出了
[事务测试用例](https://github.com/apache/dubbo-go-samples/tree/release-1.5/seata) 。
+我们在 dubbo-samples 中给出了
[事务测试用例](https://github.com/apache/dubbo-go-samples/tree/1.5/seata) 。
## 3 多注册中心集群负载均衡
diff --git
a/content/zh-cn/docs/languages/golang/dubbo-go-1.5/configuration/client.md
b/content/zh-cn/docs/languages/golang/dubbo-go-1.5/configuration/client.md
index c72c4075f0..e2c4f7a53a 100644
--- a/content/zh-cn/docs/languages/golang/dubbo-go-1.5/configuration/client.md
+++ b/content/zh-cn/docs/languages/golang/dubbo-go-1.5/configuration/client.md
@@ -208,4 +208,4 @@ type: docs
```
-本文章源码详情见git：https://github.com/apache/dubbo-go-samples/tree/release-1.5/helloworld/go-client
+本文章源码详情见git：https://github.com/apache/dubbo-go-samples/tree/1.5/helloworld/go-client
diff --git
a/content/zh-cn/docs/languages/golang/dubbo-go-1.5/configuration/provider.md
b/content/zh-cn/docs/languages/golang/dubbo-go-1.5/configuration/provider.md
index 673568ab47..a0e1a56ffa 100644
--- a/content/zh-cn/docs/languages/golang/dubbo-go-1.5/configuration/provider.md
+++ b/content/zh-cn/docs/languages/golang/dubbo-go-1.5/configuration/provider.md
@@ -206,4 +206,4 @@ type: docs
```
-本文章源码详情见git：https://github.com/apache/dubbo-go-samples/tree/release-1.5/helloworld/go-server
+本文章源码详情见git：https://github.com/apache/dubbo-go-samples/tree/1.5/helloworld/go-server
diff --git a/content/zh-cn/overview/reference/integrations/grafana.md
b/content/zh-cn/overview/reference/integrations/grafana.md
index 0d36042696..a9498fd1a7 100644
--- a/content/zh-cn/overview/reference/integrations/grafana.md
+++ b/content/zh-cn/overview/reference/integrations/grafana.md
@@ -8,8 +8,18 @@ type: docs
weight: 3
---
-## 安装
-### Kubernetes 安装
+Grafana 是一种开源的监控解决方案，可用于为 Dubbo 配置可视化仪表板，您可以使用 Grafana 来监控 Dubbo 集群的运行状况。
+
+## 配置可视化控制面板
+
+以下是 Dubbo 社区提供的默认指标面板，您配置好数据源并直接导入使用即可。如果默认面板不能满足要求，您还可以自定义 Grafana 面板。
+
+* [**Apache Dubbo Observability
Dashboard：**](https://grafana.com/grafana/dashboards/18051)
+* [**JVM (Micrometer)
Dashboard：**](https://grafana.com/grafana/dashboards/4701)
+
+您可以通过以下几种方式快速的导入 Grafana 监控面板。
+
+### 方式一：Kubernetes 安装
你可以使用 Dubbo 社区提供的示例配置快速安装 Grafana，安装后的 Grafana 提供了社区默认指标面板视图。
@@ -17,40 +27,46 @@ weight: 3
kubectl create -f .
```
-获得访问地址
-```sh
-$ kubectl port-forward service/grafana 3000:3000
-```
-
-访问页面 `http://localhost:3000`
-
-
+你可能需要端口映射获得访问地址 `$ kubectl port-forward service/grafana 3000:3000`，打开浏览器访问页面
`http://localhost:3000`。
> 获取登录信息
> ```bash
> kubectl get secrets grafana -o jsonpath="{.data.admin-user}" | base64
> --decode ; echo && kubectl get secrets grafana -o
> jsonpath="{.data.admin-password}" | base64 --decode ; echo
> ```
-### VM 安装
-下载项目至本地到切换指定项目
+### 方式二：向已经安装好的集群导入 dashboard
-```bash
-wget https://dl.grafana.com/oss/release/grafana-9.3.6-1.x86_64.rpm && yum
install -y grafana-9.3.6-1.x86_64.rpm
-```
-
-启动服务
-```bash
-systemctl daemon-reload && systemctl enable --now grafana-server
-```
-
-访问页面 `http://localhost:3000`，默认用户名与密码为`admin`
+如果你已经有安装好的 Grafana 服务了，则还可以通过 [Grafana
控制台的导入菜单](https://grafana.com/docs/grafana/v8.4/dashboards/export-import/#importing-a-dashboard)
导入 dashboard。根据 Grafana 的要求，导入 dashboard 的过程中需要同时指定 Prometheus 数据源地址。
-
+你也可以选择使用以下脚本快速导入。
-## 配置数据面板
-
-以下是 Dubbo 社区提供的默认指标面板，您配置好数据源并直接导入使用即可。如果默认面板不能满足要求，您还可以自定义 Grafana 面板。
-
-**Apache Dubbo Observability Dashboard：**
[https://grafana.com/grafana/dashboards/18051](https://grafana.com/grafana/dashboards/18051)
+```sh
+$ # Address of Grafana
+$ GRAFANA_HOST="http://localhost:3000";
+$ # Login credentials, if authentication is used
+$ GRAFANA_CRED="USER:PASSWORD"
+$ # The name of the Prometheus data source to use
+$ GRAFANA_DATASOURCE="Prometheus"
+$ # The version of Dubbo to deploy
+$ VERSION=3.2.0
+$ # Import all Dubbo dashboards
+$ for DASHBOARD in 18051 4701; do
+$ #REVISION="$(curl -s
https://grafana.com/api/dashboards/${DASHBOARD}/revisions -s | jq ".items[] |
select(.description | contains(\"${VERSION}\")) | .revision")"
+$ REVISION=1
+$ curl -s
https://grafana.com/api/dashboards/${DASHBOARD}/revisions/${REVISION}/download
> /tmp/dashboard.json
+$ echo "Importing $(cat /tmp/dashboard.json | jq -r '.title') (revision
${REVISION}, id ${DASHBOARD})..."
+$ curl -s -k -u "$GRAFANA_CRED" -XPOST \
+$ -H "Accept: application/json" \
+$ -H "Content-Type: application/json" \
+$ -d "{\"dashboard\":$(cat /tmp/dashboard.json),\"overwrite\":true, \
+$ \"inputs\":[{\"name\":\"DS_PROMETHEUS\",\"type\":\"datasource\",
\
+$
\"pluginId\":\"prometheus\",\"value\":\"$GRAFANA_DATASOURCE\"}]}" \
+$ $GRAFANA_HOST/api/dashboards/import
+$ echo -e "\nDone\n"
+$ done
+```
-**JVM (Micrometer) Dashboard：**
[https://grafana.com/grafana/dashboards/4701](https://grafana.com/grafana/dashboards/4701)
\ No newline at end of file
+### 方式三：自定义
+Grafana 可以通过其他方法进行安装和配置，可以参阅有关安装方法的文档了解如何制作和导入 Dubbo 检测面板
+* [Grafana provisioning
官方文档](https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards)
+* [为 `stable/grafana` Helm chart
导入面板](https://github.com/helm/charts/tree/master/stable/grafana#import-dashboards)
\ No newline at end of file
diff --git a/content/zh-cn/overview/reference/integrations/prometheus.md
b/content/zh-cn/overview/reference/integrations/prometheus.md
index a0d889704f..6606db3325 100644
--- a/content/zh-cn/overview/reference/integrations/prometheus.md
+++ b/content/zh-cn/overview/reference/integrations/prometheus.md
@@ -18,7 +18,7 @@ kubectl create -f .
```
> 本安装仅适用于测试或体验使用，生产级别的安装请参考 Prometheus 官方安装文档。
-访问页面 `http://localhost:9090`
+访问页面 `http://localhost:9090`，切换到 graph 视图。
@@ -35,9 +35,7 @@ wget
https://github.com/prometheus/prometheus/releases/download/v2.42.0/promethe
nohup ./prometheus > /dev/null 2>&1 &
```
-访问页面 `http://localhost:9090`
-
-
+访问页面 `http://localhost:9090/graph` 并切换到 graph 视图。
> 具体请参考 Prometheus 官方安装文档
diff --git a/static/imgs/v3/advantages/grafana-dashboard-1.png
b/static/imgs/v3/advantages/grafana-dashboard-1.png
index ff38ba6a26..ace4d8bace 100644
Binary files a/static/imgs/v3/advantages/grafana-dashboard-1.png and
b/static/imgs/v3/advantages/grafana-dashboard-1.png differ
diff --git a/static/imgs/v3/advantages/grafana-dashboard-2.png
b/static/imgs/v3/advantages/grafana-dashboard-2.png
index 049ae9a354..f820eb4e86 100644
Binary files a/static/imgs/v3/advantages/grafana-dashboard-2.png and
b/static/imgs/v3/advantages/grafana-dashboard-2.png differ
