fix aggegator and plugin url

rrd/templates/portal/cluster/creator.html

@@ -5,7 +5,10 @@
 
         <div class="panel panel-default">
             <div class="panel-heading">
-                创建集群监控项
+                创建集群监控项 
+                <a target="_blank" href="https://book.open-falcon.org/zh/usage/aggregator.html" title="aggregator配置说明">
+                    <span class="glyphicon glyphicon-question-sign"></span>
+                </a>
             </div>
 
             <div class="panel-body">
@@ -14,6 +17,11 @@
                     <div class="form-group">
                         <label for="numerator">分子：</label>
                         <textarea rows="4" id="numerator" class="form-control"></textarea>
+                        <span class="help-block">
+                            比如：整个集群的请求失败率 = 所有机器的request_fail数量 ÷ 所有机器的request_total数量 <br/>
+                            分子就是：$(request_fail/module=graph,project=falcon) <br/>
+                            分母就是：$(request_total/module=graph,project=falcon)<br/>
+                        </span>
                     </div>
                     <div class="form-group">
                         <label for="denominator">分母：</label>

rrd/templates/portal/cluster/edit.html

@@ -42,7 +42,7 @@
                         <span class="glyphicon glyphicon-floppy-disk"></span>
                         {{ op }}
                     </button>
-                    <a href="/group/{{ cluster.grp_id }}/cluster" class="btn btn-default">
+                    <a href="/portal/group/{{ cluster.grp_id }}/cluster" class="btn btn-default">
                         <span class="glyphicon glyphicon-arrow-left"></span>
                         列表页
                     </a>

rrd/templates/portal/cluster/list.html

@@ -6,7 +6,7 @@
         <div class="panel-heading" style="padding-left: 8px;">
             集群聚合配置列表
             <div class="pull-right">
-                <a class="btn btn-success btn-xs" href="/group/{{ group.id }}/cluster/creator">
+                <a class="btn btn-success btn-xs" href="/portal/group/{{ group.id }}/cluster/creator">
                     <span class="glyphicon glyphicon-plus"></span>
                     新建
                 </a>

rrd/view/portal/cluster.py

@@ -7,7 +7,7 @@ from rrd.model.portal.cluster import Cluster
 from rrd.utils.params import required_chk
 
 
-@app.route('/group/<group_id>/cluster')
+@app.route('/portal/group/<group_id>/cluster')
 def cluster_list_get(group_id):
     group_id = int(group_id)
 
@@ -19,7 +19,7 @@ def cluster_list_get(group_id):
     return render_template('portal/cluster/list.html', **locals())
 
 
-@app.route('/group/<group_id>/cluster/creator', methods=['GET'])
+@app.route('/portal/group/<group_id>/cluster/creator', methods=['GET'])
 def cluster_creator_get(group_id):
     group_id = int(group_id)
     group = HostGroup.read(where='id = %s', params=[group_id])
@@ -29,7 +29,7 @@ def cluster_creator_get(group_id):
     return render_template('portal/cluster/creator.html', **locals())
 
 
-@app.route('/group/<group_id>/cluster/creator', methods=['POST'])
+@app.route('/portal/group/<group_id>/cluster/creator', methods=['POST'])
 def cluster_node_post(group_id):
     group_id = int(group_id)
     group = HostGroup.read(where='id = %s', params=[group_id])
@@ -77,7 +77,7 @@ def cluster_node_post(group_id):
         return jsonify(msg='occur error')
 
 
-@app.route('/cluster/edit/<cluster_id>', methods=['GET'])
+@app.route('/portal/cluster/edit/<cluster_id>', methods=['GET'])
 def cluster_edit_get(cluster_id):
     cluster_id = int(cluster_id)
     cluster = Cluster.get(cluster_id)
@@ -85,7 +85,7 @@ def cluster_edit_get(cluster_id):
     return render_template('portal/cluster/edit.html', **locals())
 
 
-@app.route('/cluster/clone/<cluster_id>', methods=['GET'])
+@app.route('/portal/cluster/clone/<cluster_id>', methods=['GET'])
 def cluster_clone_get(cluster_id):
     cluster_id = int(cluster_id)
     cluster = Cluster.get(cluster_id)
@@ -95,14 +95,14 @@ def cluster_clone_get(cluster_id):
     return render_template('portal/cluster/edit.html', **locals())
 
 
-@app.route('/cluster/delete/<cluster_id>', methods=['POST'])
+@app.route('/portal/cluster/delete/<cluster_id>', methods=['POST'])
 def cluster_delete_post(cluster_id):
     cluster_id = int(cluster_id)
     Cluster.delete_one(cluster_id)
     return jsonify(msg='')
 
 
-@app.route('/cluster/edit/<cluster_id>', methods=['POST'])
+@app.route('/portal/cluster/edit/<cluster_id>', methods=['POST'])
 def cluster_edit_post(cluster_id):
     cluster_id = int(cluster_id)
     numerator = request.form['numerator'].strip()

rrd/view/portal/plugin.py

@@ -6,7 +6,7 @@ from rrd.model.portal.host_group import HostGroup
 from rrd.model.portal.plugin_dir import PluginDir
 
 
-@app.route('/group/<group_id>/plugins')
+@app.route('/portal/group/<group_id>/plugins')
 def plugin_list_get(group_id):
     group_id = int(group_id)
 
@@ -18,7 +18,7 @@ def plugin_list_get(group_id):
     return render_template('portal/plugin/list.html', group=group, plugins=plugins)
 
 
-@app.route('/plugin/bind', methods=['POST'])
+@app.route('/portal/plugin/bind', methods=['POST'])
 def plugin_bind_post():
     group_id = int(request.form['group_id'].strip())
     plugin_dir = request.form['plugin_dir'].strip()
@@ -30,7 +30,7 @@ def plugin_bind_post():
     return jsonify(msg='')
 
 
-@app.route('/plugin/delete/<plugin_id>')
+@app.route('/portal/plugin/delete/<plugin_id>')
 def plugin_delete_get(plugin_id):
     plugin_id = int(plugin_id)
     plugin = PluginDir.read(where='id = %s', params=[plugin_id])