Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/router.py =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/router.py (revision 38990) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/router.py (working copy) @@ -14,7 +14,6 @@ import geoip2.database as database from apv.company import * import re -import time lruCache = LRUCacheDict(max_size=10000) reader = database.Reader('/ca/webui/conf/GeoLite2-City.mmdb') @@ -632,7 +631,7 @@ result = result[:3] return HttpResponse(json.dumps({ - "system_version":result[1][0], + "system_version":result[1][0], "patch_version":result[0][0] if result[0] else "", "other_version":result[2][0], })) @@ -721,56 +720,18 @@ "device_healthy_count" : device_count - device_unhealthy_count, "device_unhealthy_count" : device_unhealthy_count, })) - -def prometheus_log_download(request): - lines = 0 - if "lines" in request.GET and request.GET["lines"]: - lines = request.GET["lines"] - sess = get_current_session() - sess.cli.set_enable() - logs = sess.cli.cmd('show prometheus log %s' % lines) - cur_time = time.strftime("%Y%m%d%H%M%S", time.localtime()) - file_name = "%s_%s.%s" % ("Prometheus_log", cur_time, 'txt') - response = HttpResponse(logs) - response['Content-Type'] = 'text/plain; charset=utf-8' - response['Content-Disposition'] = 'attachment; filename=%s' % file_name - return response - - -def get_cloud_page(request): +def get_prometheus_page(request): if not request.GET['type'] or not request.GET['page']: raise Http404('Page not found') env = HiveEnvironment(loader=ChoiceLoader([ - PackageLoader('apv', 'templates')])) - if request.GET['type'] == "azure": - if request.GET['page'] == "basic": - template = env.get_template("/ha/cloud/azure/basic.html") - response = HttpResponse(template.render()) - return response - elif request.GET['page'] == "nic": - template = env.get_template("/ha/cloud/azure/nic.html") - response = HttpResponse(template.render()) - return response - elif request.GET['page'] == "udr": - template = env.get_template("/ha/cloud/azure/udr.html") - response = HttpResponse(template.render()) - return response - elif request.GET['page'] == "log": - template = env.get_template("/ha/cloud/azure/log.html") - response = HttpResponse(template.render()) - return response - - elif request.GET['type'] == "aws": + PackageLoader('apv', 'templates')])) + if request.GET['type'] == "matrix": if request.GET['page'] == "basic": - template = env.get_template("/ha/cloud/aws/basic.html") - response = HttpResponse(template.render()) - return response - elif request.GET['page'] == "eni": - template = env.get_template("/ha/cloud/aws/eni.html") + template = env.get_template("/monitoring/prometheus/index/basic.html") response = HttpResponse(template.render()) return response elif request.GET['page'] == "log": - template = env.get_template("/ha/cloud/aws/log.html") + template = env.get_template("/monitoring/prometheus/index/log.html") response = HttpResponse(template.render()) return response - raise Http404('Page not found') \ No newline at end of file + raise Http404('Page not found') Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/basic.html =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/basic.html (revision 0) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/basic.html (working copy) @@ -0,0 +1,1088 @@ + +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ (0-65535) +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ (3-60)min +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+ + + + + + + + + + + + + +
ID{% trans %}User Name{% endtrans %}{% trans %}Token{% endtrans %}{% trans %}Created Date{% endtrans %}{% trans %}Expired Date{% endtrans %}{% trans %}Last Used Date{% endtrans %}{% trans %}Is Expired{% endtrans %}
+
+
+
+
+ × +
+
+
+
+
+ +
+

Import Certificate

+
+
+
+ +
+
+ + Import Certificate +
+
+ +
+
+ + + +
+
+ +
+
+ +
+ + + +
+ + +
+ + + +
+
+
+ +
+
+
+ + + + + +
+
+ +
+
+
+ +
+
+ +
+
+
+ + + \ No newline at end of file Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/import_certificate.html =================================================================== --- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/import_certificate.html (revision 0) +++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/import_certificate.html (working copy) @@ -0,0 +1,232 @@ +{% block box_content %} +
+
+ +
+

+ Import Certificate +

+
+
+
+
+
+ {% trans %}Request{% endtrans %} +
+
+ +
+
+ + + +
+
+ +
+
+ Header + +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+ +
+
+ +
+
+
+ Request Body +
+
+ +
+
+
+ Response +
+ +
+ +
+ 

+                        

+                        

+                    

+                    

+                

+            

+        

+    
+

+
+
+{% endblock box_content %}
+
+{% block box_script %}
+{% endblock %}
\ No newline at end of file
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/index.html
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/index.html	(revision 0)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/index.html	(working copy)
@@ -0,0 +1,134 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+{% block horizontal_nav %}
+

+    

+        
+    

+    
+

+

+{% endblock horizontal_nav %}
+
+

+{% block model_nav %}
+
+{% endblock model_nav %}
+

+
+{% block sub_nav %}
+
+
+
+{% endblock %}
+
+

+

+
+{% endblock %}
+
+{% block page_javascript %}
+
+
+{% endblock %}
+
+{% block box_script %}
+{% endblock %}
\ No newline at end of file
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/log.html
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/log.html	(revision 0)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/monitoring/prometheus/index/log.html	(working copy)
@@ -0,0 +1,50 @@
+

+    

+        

+            

+                
    
+                    
    • 
+                    
    • 
+                

+                
[[ prometheus_log ]]

+            

+        

+    

+

+
+
\ No newline at end of file
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/tree.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/tree.py	(revision 38990)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/tree.py	(working copy)
@@ -39,6 +39,9 @@
         ('report', {'cls':MenuNode, 'verbose_name':_('Statistics Report'),'sub_nodes':D([
             ('report', {'cls':ModuleNode, 'default_action':'monitor', 'package':''}),
         ])}),
+        ('prometheus', {'cls':MenuNode, 'verbose_name':_('Prometheus Metrix'),'sub_nodes':D([
+            ('index', {'cls':ModuleNode, 'default_action':'index', 'package':''}),
+        ])}),
     ])}),
 
     ('slb', {'cls':ModuleNode, 'verbose_name':_('SLB'), 'icon':'fa-sitemap', 'package':'loadbalancing.slb', 'sub_nodes':D([
@@ -459,9 +462,6 @@
             ('synchronization', {'cls':ModelNode, 'model':'ha.synconfig.SynconfigGeneralSettings'}),
             ('IncrementalSynconfig', {'cls':ModelNode, 'model':'ha.synconfig.IncrementalSynconfig'}),
         ])}),
-        ('cloud', {'cls':MenuNode, 'verbose_name':_('Cloud'),'sub_nodes':D([
-            ('aws', {'cls':ModuleNode, 'default_action':'index', 'package':''}),
-        ])}),
     ])}),
             
     ('ajax', {'cls':MenuNode, 'hidden':True, 'sub_nodes':D([
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/urls.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/urls.py	(revision 38990)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/urls.py	(working copy)
@@ -47,6 +47,5 @@
     url(r'^generate_report$', generateReport),
     url(r'^%s/get_listener_list$' % PRODUCT_KEYWORD, get_listener_list),
     url(r'^%s/get_sslo_status$' % PRODUCT_KEYWORD, get_sslo_status),
-    url(r'^%s/prometheus/Log/download' % PRODUCT_KEYWORD, prometheus_log_download),
-    url(r'^%s/get_cloud_page$' % PRODUCT_KEYWORD, get_cloud_page),
+    url(r'^%s/get_prometheus_page$' % PRODUCT_KEYWORD, get_prometheus_page),
 )