实现基础的统计指标

2021-06-30 19:59:59 +08:00
parent 9a915a48b5
commit a7aed3d49e
39 changed files with 258 additions and 66 deletions
--- a/web/public/js/components/common/warning-message.js
+++ b/web/public/js/components/common/warning-message.js
@@ -0,0 +1,4 @@
+// 警告消息
+Vue.component("warning-message", {
+	template: `<p class="ui message warning"><i class="icon warning circle"></i><slot></slot></p>`
+})
--- a/web/views/@default/clusters/cluster/settings/metrics/createPopup.html
+++ b/web/views/@default/clusters/cluster/settings/metrics/createPopup.html
@@ -1,8 +1,8 @@
 {$layout "layout_popup"}

-<h3>添加指标</h3>
+<h3>可以添加的指标</h3>

-<p class="comment" v-if="items.length == 0">暂时还没有指标。</p>
+<p class="comment" v-if="items.length == 0">暂时还没有可用的指标。</p>
 <table class="ui table celled selectable" v-if="items.length > 0">
    <thead>
    <tr>
@@ -29,8 +29,8 @@
            <label-on :v-is-on="item.isOn"></label-on>
        </td>
        <td>
-            <a href="" v-if="!item.isChecked">添加</a>
-            <a href="" v-if="item.isChecked"><span class="grey">已添加</span></a>
+            <a href="" @click.prevent="addItem(item)" v-if="!item.isChecked">添加</a>
+            <a href="" @click.prevent="removeItem(item)" v-if="item.isChecked"><span class="grey">已添加</span></a>
        </td>
    </tr>
 </table>
--- a/web/views/@default/clusters/cluster/settings/metrics/createPopup.js
+++ b/web/views/@default/clusters/cluster/settings/metrics/createPopup.js
@@ -0,0 +1,23 @@
+Tea.context(function () {
+	this.addItem = function (item) {
+		this.$post("$")
+			.params({
+				clusterId: this.clusterId,
+				itemId: item.id
+			})
+			.success(function () {
+				item.isChecked = true
+			})
+	}
+
+	this.removeItem = function (item) {
+		this.$post(".delete")
+			.params({
+				clusterId: this.clusterId,
+				itemId: item.id
+			})
+			.success(function () {
+				item.isChecked = false
+			})
+	}
+})
--- a/web/views/@default/clusters/cluster/settings/metrics/index.html
+++ b/web/views/@default/clusters/cluster/settings/metrics/index.html
@@ -4,15 +4,15 @@
 <div class="right-box">
    <first-menu>
        <menu-item :href="'/clusters/cluster/settings/metrics?category=http&clusterId=' + clusterId" :active="category == 'http'">HTTP</menu-item>
-        <menu-item :href="'/clusters/cluster/settings/metrics?category=tcp&clusterId=' + clusterId" :active="category == 'tcp'">TCP</menu-item>
-        <menu-item :href="'/clusters/cluster/settings/metrics?category=udp&clusterId=' + clusterId" :active="category == 'udp'">UDP</menu-item>
+        <!--<menu-item :href="'/clusters/cluster/settings/metrics?category=tcp&clusterId=' + clusterId" :active="category == 'tcp'">TCP</menu-item>
+        <menu-item :href="'/clusters/cluster/settings/metrics?category=udp&clusterId=' + clusterId" :active="category == 'udp'">UDP</menu-item>-->
        <span class="item disabled">|</span>
        <menu-item @click.prevent="createItem">[添加指标]</menu-item>
        <span class="item disabled">|</span>
        <span class="item"><tip-icon content="在这里设置的指标，会自动应用到部署在当前集群上的所有服务上。"></tip-icon></span>
    </first-menu>

-    <p class="comment" v-if="items.length == 0">暂时还没有设置指标。</p>
+    <p class="comment" v-if="items.length == 0">暂时还没有添加指标。</p>

    <table class="ui table celled selectable" v-if="items.length > 0">
        <thead>
--- a/web/views/@default/clusters/cluster/settings/metrics/index.js
+++ b/web/views/@default/clusters/cluster/settings/metrics/index.js
@@ -1,13 +1,17 @@
 Tea.context(function () {
 	this.createItem = function () {
 		teaweb.popup(Tea.url(".createPopup", {
-			clusterId: this.clusterId
+			clusterId: this.clusterId,
+			category: this.category
 		}), {
 			callback: function () {
 				teaweb.success("保存成功", function () {
 					teaweb.reload()
 				})
 			},
+			onClose: function () {
+				teaweb.reload()
+			},
 			width: "50em",
 			height: "25em"
 		})
@@ -18,6 +22,7 @@ Tea.context(function () {
 		teaweb.confirm("确定要删除这个指标吗？", function () {
 			that.$post(".delete")
 				.params({
+					clusterId: that.clusterId,
 					itemId: itemId
 				})
 				.success(function () {
--- a/web/views/@default/servers/iplists/index.html
+++ b/web/views/@default/servers/iplists/index.html
@@ -10,9 +10,9 @@
        <tr>
            <th class="one wide">ID</th>
            <th>名称</th>
-            <th class="one wide">类型</th>
+            <th class="two wide">类型</th>
            <th>备注</th>
-            <th class="one wide">IP数量</th>
+            <th class="two wide">IP数量</th>
            <th class="two op">操作</th>
        </tr>
    </thead>
--- a/web/views/@default/servers/metrics/@item_menu.html
+++ b/web/views/@default/servers/metrics/@item_menu.html
@@ -4,4 +4,5 @@
    <menu-item :href="'/servers/metrics/item?itemId=' + item.id" code="item">"{{item.name}}"详情</menu-item>
    <menu-item :href="'/servers/metrics/update?itemId=' + item.id" code="update">修改</menu-item>
    <menu-item :href="'/servers/metrics/charts?itemId=' + item.id" code="chart">图表</menu-item>
+    <menu-item :href="'/servers/metrics/stats?itemId=' + item.id" code="stat">数据</menu-item>
 </first-menu>
--- a/web/views/@default/servers/metrics/charts.html
+++ b/web/views/@default/servers/metrics/charts.html
@@ -1,4 +1,4 @@
 {$layout}
 {$template "item_menu"}

-<p class="ui message warning">此功能暂未开通，敬等期待。</p>
+<warning-message>此功能暂未开通，敬等期待。</warning-message>
--- a/web/views/@default/servers/metrics/createPopup.html
+++ b/web/views/@default/servers/metrics/createPopup.html
@@ -28,24 +28,17 @@
            <td>
                <!-- HTTP -->
                <select class="ui dropdown auto-width" name="value" v-if="category == 'http'">
-                    <option value="${countRequest}">请求数</option>
-                    <option value="${countConnection}">连接数</option>
-                    <option value="${countTrafficIn}">下行流量</option>
-                    <option value="${countTrafficOut}">上行流量</option>
+                    <option v-for="def in valueDefinitions" :value="def.code">{{def.name}}</option>
                </select>

                <!-- TCP -->
                <select class="ui dropdown auto-width" name="value" v-if="category == 'tcp'">
-                    <option value="${countConnection}">连接数</option>
-                    <option value="${countTrafficIn}">下行流量</option>
-                    <option value="${countTrafficOut}">上行流量</option>
+                    <option v-for="def in valueDefinitions" :value="def.code">{{def.name}}</option>
                </select>

                <!-- UDP -->
                <select class="ui dropdown auto-width" name="value" v-if="category == 'udp'">
-                    <option value="${countConnection}">连接数</option>
-                    <option value="${countTrafficIn}">下行流量</option>
-                    <option value="${countTrafficOut}">上行流量</option>
+                    <option v-for="def in valueDefinitions" :value="def.code">{{def.name}}</option>
                </select>
            </td>
        </tr>
--- a/web/views/@default/servers/metrics/index.html
+++ b/web/views/@default/servers/metrics/index.html
@@ -2,8 +2,8 @@

 <first-menu>
    <menu-item :href="'/servers/metrics?category=http'" :active="category == 'http'">HTTP</menu-item>
-    <menu-item :href="'/servers/metrics?category=tcp'" :active="category == 'tcp'">TCP</menu-item>
-    <menu-item :href="'/servers/metrics?category=udp'" :active="category == 'udp'">UDP</menu-item>
+    <!--<menu-item :href="'/servers/metrics?category=tcp'" :active="category == 'tcp'">TCP</menu-item>
+    <menu-item :href="'/servers/metrics?category=udp'" :active="category == 'udp'">UDP</menu-item>-->
    <span class="item disabled">|</span>
    <menu-item @click.prevent="createItem">[创建指标]</menu-item>
    <span class="item disabled">|</span>
--- a/web/views/@default/servers/metrics/item.html
+++ b/web/views/@default/servers/metrics/item.html
@@ -12,6 +12,12 @@
        <td>状态</td>
        <td><label-on :v-is-on="item.isOn"></label-on></td>
    </tr>
+    <tr>
+        <td>统计对象</td>
+        <td>
+            <span v-for="key in item.keys" class="ui label small basic">{{key}}</span>
+        </td>
+    </tr>
    <tr>
        <td>统计周期</td>
        <td>
--- a/web/views/@default/servers/metrics/stats.html
+++ b/web/views/@default/servers/metrics/stats.html
@@ -0,0 +1,27 @@
+{$layout}
+{$template "item_menu"}
+
+<p class="comment" v-if="stats.length == 0">暂时还没有统计数据。</p>
+
+<table class="ui table selectable celled" v-if="stats.length > 0">
+    <thead>
+        <tr>
+            <th>指标对象</th>
+            <th>指标值</th>
+            <th>时间</th>
+            <th>集群</th>
+            <th>节点</th>
+            <th>服务</th>
+        </tr>
+    </thead>
+    <tr v-for="stat in stats">
+        <td>{{stat.keys}}</td>
+        <td>{{stat.value}}</td>
+        <td>{{stat.time}}</td>
+        <td>{{stat.cluster.name}}</td>
+        <td>{{stat.node.name}}</td>
+        <td>{{stat.server.name}}<link-icon :href="'/servers/server/stat?serverId=' + stat.server.id"></link-icon></td>
+    </tr>
+</table>
+
+<div class="page" v-html="page"></div>
--- a/web/views/@default/servers/metrics/update.html
+++ b/web/views/@default/servers/metrics/update.html
@@ -1,6 +1,8 @@
 {$layout "layout"}
 {$template "item_menu"}

+<warning-message>修改统计对象、统计周期、统计数值等参数后，将重新记录数据。</warning-message>
+
 <form class="ui form" data-tea-action="$" data-tea-success="success">
    <csrf-token></csrf-token>
    <input type="hidden" name="itemId" :value="item.id"/>
@@ -28,24 +30,17 @@
            <td>
                <!-- HTTP -->
                <select class="ui dropdown auto-width" name="value" v-if="item.category == 'http'" v-model="item.value">
-                    <option value="${countRequest}">请求数</option>
-                    <option value="${countConnection}">连接数</option>
-                    <option value="${countTrafficIn}">下行流量</option>
-                    <option value="${countTrafficOut}">上行流量</option>
+                    <option v-for="def in valueDefinitions" :value="def.code">{{def.name}}</option>
                </select>

                <!-- TCP -->
                <select class="ui dropdown auto-width" name="value" v-if="item.category == 'tcp'">
-                    <option value="${countConnection}">连接数</option>
-                    <option value="${countTrafficIn}">下行流量</option>
-                    <option value="${countTrafficOut}">上行流量</option>
+                    <option v-for="def in valueDefinitions" :value="def.code">{{def.name}}</option>
                </select>

                <!-- UDP -->
                <select class="ui dropdown auto-width" name="value" v-if="item.category == 'udp'">
-                    <option value="${countConnection}">连接数</option>
-                    <option value="${countTrafficIn}">下行流量</option>
-                    <option value="${countTrafficOut}">上行流量</option>
+                    <option v-for="def in valueDefinitions" :value="def.code">{{def.name}}</option>
                </select>
            </td>
        </tr>
--- a/web/views/@default/servers/server/settings/locations/reverseProxy/index.html
+++ b/web/views/@default/servers/server/settings/locations/reverseProxy/index.html
@@ -10,7 +10,7 @@
 		<div class="margin"></div>
 		<div v-if="!reverseProxyRef.isPrior || !reverseProxyRef.isOn">
 			<div class="margin"></div>
-			<p class="ui message warning">当前代理服务没有开启，可以通过点击 <a :href="'/servers/server/settings/locations/reverseProxy/setting?serverId=' + serverId + '&locationId=' + locationId">[更多设置]</a> 开启 。</p>
+            <warning-message>当前代理服务没有开启，可以通过点击 <a :href="'/servers/server/settings/locations/reverseProxy/setting?serverId=' + serverId + '&locationId=' + locationId">[更多设置]</a> 开启 。</warning-message>
 		</div>

 		<origin-list-box :v-primary-origins="primaryOrigins" :v-backup-origins="backupOrigins"
--- a/web/views/@default/servers/server/settings/reverseProxy/index.html
+++ b/web/views/@default/servers/server/settings/reverseProxy/index.html
@@ -6,7 +6,7 @@

 	<div v-if="!reverseProxyRef.isOn">
 		<div class="margin"></div>
-		<p class="ui message warning">当前代理服务没有开启，可以通过点击 <a :href="'/servers/server/settings/reverseProxy/setting?serverId=' + serverId">[更多设置]</a> 开启 。</p>
+        <warning-message>当前代理服务没有开启，可以通过点击 <a :href="'/servers/server/settings/reverseProxy/setting?serverId=' + serverId">[更多设置]</a> 开启 。</warning-message>
 	</div>

 	<origin-list-box :v-primary-origins="primaryOrigins" :v-backup-origins="backupOrigins"
--- a/web/views/@default/servers/server/settings/serverNames/index.html
+++ b/web/views/@default/servers/server/settings/serverNames/index.html
@@ -4,7 +4,7 @@
 <div class="right-box">
    <!-- 审核中 -->
    <div v-show="isAuditing">
-        <p class="ui message warning">当前域名正在审核中，请审核域名的所有人、备案情况等。</p>
+        <warning-message>当前域名正在审核中，请审核域名的所有人、备案情况等。</warning-message>
        <form method="post" class="ui form" data-tea-action=".audit" data-tea-success="auditSuccess">
            <csrf-token></csrf-token>
            <input type="hidden" name="serverId" :value="serverId"/>
--- a/web/views/@default/servers/server/settings/waf/groups.html
+++ b/web/views/@default/servers/server/settings/waf/groups.html
@@ -8,7 +8,7 @@
 		<a href="" class="item" @click.prevent="createGroup(type)">[添加分组]</a>
 	</second-menu>

-    <p class="ui message warning" v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</p>
+    <warning-message v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</warning-message>

 	<p class="comment" v-if="groups.length == 0">暂时还没有规则分组。</p>

--- a/web/views/@default/servers/server/settings/waf/ipadmin/allowList.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/allowList.html
@@ -4,7 +4,7 @@
 <div class="right-box">
    {$template "../menu"}

-    <div class="ui message warning" v-if="!featureIsOn">尚未为当前用户开通此功能。</div>
+    <warning-message v-if="!featureIsOn">尚未为当前用户开通此功能。</warning-message>

    {$ if .featureIsOn}
    <second-menu>
@@ -15,7 +15,7 @@
        <div class="item"><ip-list-bind-box :v-http-firewall-policy-id="firewallPolicyId" :v-type="'white'"></ip-list-bind-box></div>
    </second-menu>

-    <p class="ui message warning" v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</p>
+    <warning-message v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</warning-message>

    <p class="comment" v-if="items.length == 0">暂时还没有IP。</p>
    <ip-list-table v-if="items.length > 0" :v-items="items" @update-item="updateItem" @delete-item="deleteItem"></ip-list-table>
--- a/web/views/@default/servers/server/settings/waf/ipadmin/countries.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/countries.html
@@ -4,10 +4,10 @@
 <div class="right-box">
    {$template "../menu"}

-    <div class="ui message warning" v-if="!featureIsOn">尚未为当前用户开通此功能。</div>
+    <warning-message v-if="!featureIsOn">尚未为当前用户开通此功能。</warning-message>

    {$ if .featureIsOn}
-    <p class="ui message warning" v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</p>
+    <warning-message v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</warning-message>

 	<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 		<input type="hidden" name="firewallPolicyId" :value="firewallPolicyId"/>
--- a/web/views/@default/servers/server/settings/waf/ipadmin/denyList.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/denyList.html
@@ -4,7 +4,7 @@
 <div class="right-box">
    {$template "../menu"}

-    <div class="ui message warning" v-if="!featureIsOn">尚未为当前用户开通此功能。</div>
+    <warning-message v-if="!featureIsOn">尚未为当前用户开通此功能。</warning-message>

    {$ if .featureIsOn}
    <second-menu>
@@ -15,7 +15,7 @@
        <div class="item"><ip-list-bind-box :v-http-firewall-policy-id="firewallPolicyId" :v-type="'black'"></ip-list-bind-box></div>
    </second-menu>

-    <p class="ui message warning" v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</p>
+    <warning-message v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</warning-message>

    <p class="comment" v-if="items.length == 0">暂时还没有IP。</p>
    <ip-list-table v-if="items.length > 0" :v-items="items" @update-item="updateItem" @delete-item="deleteItem"></ip-list-table>
--- a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html
@@ -4,10 +4,10 @@
 <div class="right-box">
    {$template "../menu"}

-    <div class="ui message warning" v-if="!featureIsOn">尚未为当前用户开通此功能。</div>
+    <warning-message v-if="!featureIsOn">尚未为当前用户开通此功能。</warning-message>

    {$ if .featureIsOn}
-    <p class="ui message warning" v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</p>
+    <warning-message v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</warning-message>

 	<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 		<input type="hidden" name="firewallPolicyId" :value="firewallPolicyId"/>
--- a/web/views/@default/servers/server/settings/waf/ipadmin/test.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/test.html
@@ -4,10 +4,10 @@
 <div class="right-box">
    {$template "../menu"}

-    <div class="ui message warning" v-if="!featureIsOn">尚未为当前用户开通此功能。</div>
+    <warning-message v-if="!featureIsOn">尚未为当前用户开通此功能。</warning-message>

    {$ if .featureIsOn}
-    <p class="ui message warning" v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</p>
+    <warning-message v-if="!wafIsOn">当前WAF未启用，设置将在<a :href="'/servers/server/settings/waf?serverId=' + serverId">[启用]</a>后生效。</warning-message>

 	<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 		<input type="hidden" name="firewallPolicyId" :value="firewallPolicyId"/>
--- a/web/views/@default/settings/authority/index.html
+++ b/web/views/@default/settings/authority/index.html
@@ -1,7 +1,7 @@
 {$layout}
 {$template "menu"}

-<div class="ui message warning" v-if="key == null">认证之后，可以使用企业版功能，当前你还没有认证，<a href="http://edge.teaos.cn/docs/Plus/Authority/Index.md" target="_blank">[在这里看认证方法]</a>。</div>
+<warning-message v-if="key == null">认证之后，可以使用企业版功能，当前你还没有认证，<a href="http://edge.teaos.cn/docs/Plus/Authority/Index.md" target="_blank">[在这里看认证方法]</a>。</warning-message>

 <div v-if="key != null">
    <div class="margin"></div>
--- a/web/views/@default/settings/server/index.html
+++ b/web/views/@default/settings/server/index.html
@@ -1,6 +1,6 @@
 {$layout}

-<div class="ui message warning" v-if="serverIsChanged">服务配置已修改，请在命令行下重启后生效。</div>
+<warning-message v-if="serverIsChanged">服务配置已修改，请在命令行下重启后生效。</warning-message>

 <h3>HTTP <a href="/settings/server/http" v-if="!teaDemoEnabled" @click.prevent="updateHTTP()">修改</a><a v-if="teaDemoEnabled">[演示版无法修改]</a></h3>