From 29eee20ce6317e34c8cb536a864d69280b8087af Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Mon, 19 Jul 2021 15:23:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=85=AC=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/utils/lookup.go | 2 +- .../clusters/cluster/settings/metrics/createPopup.go | 1 + .../default/clusters/cluster/settings/metrics/index.go | 1 + .../web/actions/default/servers/metrics/createPopup.go | 2 ++ internal/web/actions/default/servers/metrics/index.go | 1 + .../actions/default/servers/metrics/metricutils/utils.go | 1 + internal/web/actions/default/servers/metrics/update.go | 2 ++ web/public/js/components/server/http-firewall-rules.js | 2 +- .../clusters/cluster/settings/metrics/createPopup.html | 6 +++++- .../@default/clusters/cluster/settings/metrics/index.html | 6 +++++- web/views/@default/dns/tasks/listPopup.html | 2 +- web/views/@default/servers/metrics/createPopup.html | 7 +++++++ web/views/@default/servers/metrics/index.html | 6 +++++- web/views/@default/servers/metrics/item.html | 7 +++++++ web/views/@default/servers/metrics/update.html | 7 +++++++ 15 files changed, 47 insertions(+), 6 deletions(-) diff --git a/internal/utils/lookup.go b/internal/utils/lookup.go index 75d1d96d..fb3b6c9a 100644 --- a/internal/utils/lookup.go +++ b/internal/utils/lookup.go @@ -4,7 +4,7 @@ import ( "github.com/miekg/dns" ) -// 获取CNAME +// LookupCNAME 获取CNAME func LookupCNAME(host string) (string, error) { config, err := dns.ClientConfigFromFile("/etc/resolv.conf") if err != nil { diff --git a/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go b/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go index 0e930af0..d5b52ddb 100644 --- a/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go +++ b/internal/web/actions/default/clusters/cluster/settings/metrics/createPopup.go @@ -70,6 +70,7 @@ func (this *CreatePopupAction) RunGet(params struct { "value": item.Value, "valueName": serverconfigs.FindMetricValueName(item.Category, item.Value), "category": item.Category, + "isPublic": item.IsPublic, "isChecked": exists, }) } diff --git a/internal/web/actions/default/clusters/cluster/settings/metrics/index.go b/internal/web/actions/default/clusters/cluster/settings/metrics/index.go index d464dce9..37b0f278 100644 --- a/internal/web/actions/default/clusters/cluster/settings/metrics/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/metrics/index.go @@ -49,6 +49,7 @@ func (this *IndexAction) RunGet(params struct { "value": item.Value, "valueName": serverconfigs.FindMetricValueName(item.Category, item.Value), "category": item.Category, + "isPublic": item.IsPublic, }) } this.Data["items"] = itemMaps diff --git a/internal/web/actions/default/servers/metrics/createPopup.go b/internal/web/actions/default/servers/metrics/createPopup.go index 7dad80ca..f493cc64 100644 --- a/internal/web/actions/default/servers/metrics/createPopup.go +++ b/internal/web/actions/default/servers/metrics/createPopup.go @@ -34,6 +34,7 @@ func (this *CreatePopupAction) RunPost(params struct { KeysJSON []byte PeriodJSON []byte Value string + IsPublic bool Must *actions.Must CSRF *actionutils.CSRF @@ -75,6 +76,7 @@ func (this *CreatePopupAction) RunPost(params struct { Period: period, PeriodUnit: periodUnit, Value: params.Value, + IsPublic: params.IsPublic, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/metrics/index.go b/internal/web/actions/default/servers/metrics/index.go index 22a5f18d..8f72c5ee 100644 --- a/internal/web/actions/default/servers/metrics/index.go +++ b/internal/web/actions/default/servers/metrics/index.go @@ -56,6 +56,7 @@ func (this *IndexAction) RunGet(params struct { "value": item.Value, "valueName": serverconfigs.FindMetricValueName(item.Category, item.Value), "category": item.Category, + "isPublic": item.IsPublic, }) } this.Data["items"] = itemMaps diff --git a/internal/web/actions/default/servers/metrics/metricutils/utils.go b/internal/web/actions/default/servers/metrics/metricutils/utils.go index 61e3937a..5a263e40 100644 --- a/internal/web/actions/default/servers/metrics/metricutils/utils.go +++ b/internal/web/actions/default/servers/metrics/metricutils/utils.go @@ -43,6 +43,7 @@ func InitItem(parent *actionutils.ParentAction, itemId int64) (*pb.MetricItem, e "periodUnit": item.PeriodUnit, "periodUnitName": serverconfigs.FindMetricPeriodUnitName(item.PeriodUnit), "category": item.Category, + "isPublic": item.IsPublic, "countCharts": countCharts, } return item, nil diff --git a/internal/web/actions/default/servers/metrics/update.go b/internal/web/actions/default/servers/metrics/update.go index a474b2ab..a8463d58 100644 --- a/internal/web/actions/default/servers/metrics/update.go +++ b/internal/web/actions/default/servers/metrics/update.go @@ -41,6 +41,7 @@ func (this *UpdateAction) RunPost(params struct { PeriodJSON []byte Value string IsOn bool + IsPublic bool Must *actions.Must CSRF *actionutils.CSRF @@ -78,6 +79,7 @@ func (this *UpdateAction) RunPost(params struct { PeriodUnit: periodUnit, Value: params.Value, IsOn: params.IsOn, + IsPublic: params.IsPublic, }) if err != nil { this.ErrorPage(err) diff --git a/web/public/js/components/server/http-firewall-rules.js b/web/public/js/components/server/http-firewall-rules.js index 8e2f9d15..e6d3be1c 100644 --- a/web/public/js/components/server/http-firewall-rules.js +++ b/web/public/js/components/server/http-firewall-rules.js @@ -169,7 +169,7 @@ Vue.component("http-firewall-checkpoint-cc", { } }, template: `
- + diff --git a/web/views/@default/clusters/cluster/settings/metrics/createPopup.html b/web/views/@default/clusters/cluster/settings/metrics/createPopup.html index 4b4a1aad..19d8547a 100644 --- a/web/views/@default/clusters/cluster/settings/metrics/createPopup.html +++ b/web/views/@default/clusters/cluster/settings/metrics/createPopup.html @@ -15,7 +15,11 @@ - + diff --git a/web/views/@default/clusters/cluster/settings/metrics/index.html b/web/views/@default/clusters/cluster/settings/metrics/index.html index 860db1e0..3d59d83b 100644 --- a/web/views/@default/clusters/cluster/settings/metrics/index.html +++ b/web/views/@default/clusters/cluster/settings/metrics/index.html @@ -26,7 +26,11 @@ - + diff --git a/web/views/@default/dns/tasks/listPopup.html b/web/views/@default/dns/tasks/listPopup.html index bebb939e..42853296 100644 --- a/web/views/@default/dns/tasks/listPopup.html +++ b/web/views/@default/dns/tasks/listPopup.html @@ -26,7 +26,7 @@ 服务域名 - diff --git a/web/views/@default/servers/metrics/createPopup.html b/web/views/@default/servers/metrics/createPopup.html index 4a2f8300..5c2a4da5 100644 --- a/web/views/@default/servers/metrics/createPopup.html +++ b/web/views/@default/servers/metrics/createPopup.html @@ -42,6 +42,13 @@ + + + +
{{item.name}}{{item.name}} +
+ 公用 +
+
{{item.name}}{{item.name}} +
+ 公用 +
+
+ {{task.error}} 正在同步...
是否公用 + +

选中表示所有集群自动使用此指标。

+
\ No newline at end of file diff --git a/web/views/@default/servers/metrics/index.html b/web/views/@default/servers/metrics/index.html index 1db8bef6..ffed7b15 100644 --- a/web/views/@default/servers/metrics/index.html +++ b/web/views/@default/servers/metrics/index.html @@ -23,7 +23,11 @@ - {{item.name}} + {{item.name}} +
+ 公用 +
+
diff --git a/web/views/@default/servers/metrics/item.html b/web/views/@default/servers/metrics/item.html index 49a011aa..0fe2ddcc 100644 --- a/web/views/@default/servers/metrics/item.html +++ b/web/views/@default/servers/metrics/item.html @@ -30,4 +30,11 @@ {{item.valueName}} + + 是否公用 + + 公用 + 非公用 + + \ No newline at end of file diff --git a/web/views/@default/servers/metrics/update.html b/web/views/@default/servers/metrics/update.html index e7905150..486ed29e 100644 --- a/web/views/@default/servers/metrics/update.html +++ b/web/views/@default/servers/metrics/update.html @@ -44,6 +44,13 @@ + + 是否公用 + + +

选中表示所有集群自动使用此指标。

+ + 是否启用