Skip to content

Commit

Permalink
[monitor] support history chart query 3 mouth time range and update 1…
Browse files Browse the repository at this point in the history
…8n (#265)

  [home]update i18n

  Add @woshiniusange as a contributor

  [webapp] support history chart query 3 mouth time range
  • Loading branch information
tomsun28 committed Aug 28, 2022
1 parent 1bff57b commit bfe07cf
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 4 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,15 @@
"contributions": [
"doc"
]
},
{
"login": "woshiniusange",
"name": "woshiniusange",
"avatar_url": "https://avatars.githubusercontent.com/u/91513022?v=4",
"profile": "https://github.com/woshiniusange",
"contributions": [
"doc"
]
}
],
"contributorsPerLine": 7
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ Thanks these wonderful people, welcome to join us:
<tr>
<td align="center"><a href="https://github.com/oyiyou"><img src="https://avatars.githubusercontent.com/u/39228891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lambert</b></sub></a><br /><a href="https://github.com/tomsun28/hertzbeat/commits?author=oyiyou" title="Code">💻</a></td>
<td align="center"><a href="http://mroldx.xyz/"><img src="https://avatars.githubusercontent.com/u/34847828?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mroldx</b></sub></a><br /><a href="https://github.com/tomsun28/hertzbeat/commits?author=mroldx" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/woshiniusange"><img src="https://avatars.githubusercontent.com/u/91513022?v=4?s=100" width="100px;" alt=""/><br /><sub><b>woshiniusange</b></sub></a><br /><a href="https://github.com/tomsun28/hertzbeat/commits?author=woshiniusange" title="Documentation">📖</a></td>
</tr>
</table>

Expand Down
1 change: 1 addition & 0 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ Thanks these wonderful people, welcome to join us:
<tr>
<td align="center"><a href="https://github.com/oyiyou"><img src="https://avatars.githubusercontent.com/u/39228891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lambert</b></sub></a><br /><a href="https://github.com/tomsun28/hertzbeat/commits?author=oyiyou" title="Code">💻</a></td>
<td align="center"><a href="http://mroldx.xyz/"><img src="https://avatars.githubusercontent.com/u/34847828?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mroldx</b></sub></a><br /><a href="https://github.com/tomsun28/hertzbeat/commits?author=mroldx" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/woshiniusange"><img src="https://avatars.githubusercontent.com/u/91513022?v=4?s=100" width="100px;" alt=""/><br /><sub><b>woshiniusange</b></sub></a><br /><a href="https://github.com/tomsun28/hertzbeat/commits?author=woshiniusange" title="Documentation">📖</a></td>
</tr>
</table>

Expand Down
4 changes: 2 additions & 2 deletions home/i18n/en/code.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
"message": "The HertzBeat code is open source, and anyone who are interested in it are very welcome to participate. We will make progress together, and the rich resource documents are being improved. {br}We believe that open source can change the world! {br}{github} {br}{gitee}."
},
"易用友好的云监控系统": {
"message": "Friendly Cloud Monitor System"
"message": "Friendly Real-Time Monitor System"
},
"即刻登录免费使用": {
"message": "Login Now"
Expand Down Expand Up @@ -286,4 +286,4 @@
"message": "On this page",
"description": "The label used by the button on the collapsible TOC component"
}
}
}
2 changes: 1 addition & 1 deletion home/i18n/en/docusaurus-plugin-content-docs/current.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version.label": {
"message": "下一篇",
"message": "Current",
"description": "The label for version current"
},
"sidebar.docs.category.快速入门": {
Expand Down
2 changes: 1 addition & 1 deletion home/i18n/zh-cn/code.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"message": "HertzBeat监控系统代码开源,非常欢迎任何对此有兴趣的同学参与中来,我们一起进步,丰富的资源文档正在完善中。{br}中二的我们相信开源改变世界!{br}{github} {br}{gitee}"
},
"易用友好的云监控系统": {
"message": "易用友好的云监控系统"
"message": "易用友好的实时监控系统"
},
"即刻登录免费使用": {
"message": "即刻登录免费使用"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,19 @@ export class MonitorDataChartComponent implements OnInit {
this.loadData('4w');
}
},
myPeriod3m: {
show: true,
title: this.i18nSvc.fanyi('monitors.detail.chart.query-3m'),
icon: 'path://M827.871087 196.128913C743.498468 111.756293 631.321596 65.290005 512 65.290005c-119.319549 0-231.499491 46.465265-315.871087 130.837884S65.290005 392.680451 65.290005 512s46.465265 231.499491 130.837884 315.871087 196.551538 130.837884 315.871087 130.837884c119.321596 0 231.499491-46.465265 315.871087-130.837884S958.708971 631.319549 958.708971 512 912.243707 280.500509 827.871087 196.128913zM531.556405 917.246651l0-74.145697c0-11.31572-9.174963-20.491707-20.491707-20.491707-11.316743 0-20.491707 9.174963-20.491707 20.491707l0 74.059739C283.276738 906.322857 116.693746 739.164766 106.755396 531.634176l72.351841 0c11.31572 0 20.491707-9.174963 20.491707-20.491707 0-11.31572-9.174963-20.491707-20.491707-20.491707l-72.273047 0c10.769274-206.737528 177.01253-373.005342 383.740848-383.813502l0 72.346725c0 11.316743 9.174963 20.491707 20.491707 20.491707 11.31572 0 20.491707-9.17394 20.491707-20.491707L531.558451 106.752326c207.593012 9.901511 374.807385 176.539762 385.609405 383.89946l-74.142627 0c-11.316743 0-20.491707 9.174963-20.491707 20.491707 0 11.316743 9.174963 20.491707 20.491707 20.491707l74.220399 0C907.275555 739.78796 739.720422 907.317511 531.556405 917.246651z;M532.098757 503.118726 532.098757 258.240529c0-11.316743-9.174963-20.491707-20.491707-20.491707-11.31572 0-20.491707 9.17394-20.491707 20.491707l0 254.66612c0 7.858992 4.429893 14.677281 10.924817 18.114566L693.447539 722.42757c4.002151 4.000104 9.245572 6.001691 14.490016 6.001691s10.487865-2.001587 14.490016-6.001691c8.002254-8.002254 8.002254-20.977777 0-28.980032L532.098757 503.118726z',
emphasis: {
iconStyle: {
textPosition: 'left'
}
},
onclick: () => {
this.loadData('12w');
}
},
myRefresh: {
show: true,
title: this.i18nSvc.fanyi('common.refresh'),
Expand Down
1 change: 1 addition & 0 deletions web-app/src/assets/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
"monitors.detail.chart.query-1d": "Query 1 Day",
"monitors.detail.chart.query-1w": "Query 1 Week",
"monitors.detail.chart.query-1m": "Query 1 Month",
"monitors.detail.chart.query-3m": "Query 3 Month",
"monitors.detail.chart.no-data": "No Metrics Data",
"monitors.detail.chart.unit": "Unit",
"common.name": "Name",
Expand Down
1 change: 1 addition & 0 deletions web-app/src/assets/i18n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
"monitors.detail.chart.query-1d": "查询近1天",
"monitors.detail.chart.query-1w": "查询近1周",
"monitors.detail.chart.query-1m": "查询近1月",
"monitors.detail.chart.query-3m": "查询近3月",
"monitors.detail.chart.no-data": "暂无数据",
"monitors.detail.chart.unit": "单位",
"common.name": "名称",
Expand Down
1 change: 1 addition & 0 deletions web-app/src/assets/i18n/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
"monitors.detail.chart.query-1d": "查詢近1天",
"monitors.detail.chart.query-1w": "查詢近1周",
"monitors.detail.chart.query-1m": "查詢近1月",
"monitors.detail.chart.query-3m": "查詢近3月",
"monitors.detail.chart.no-data": "暫無數據",
"monitors.detail.chart.unit": "單位",
"common.name": "名稱",
Expand Down

0 comments on commit bfe07cf

Please sign in to comment.