Merge pull request jly8866#87 from hhyo/github

慢日志也支持同时管理rds和本地实例

sql/query.py

@@ -24,7 +24,7 @@
 from .const import WorkflowDict
 from .inception import InceptionDao
 from .models import users, master_config, slave_config, QueryPrivilegesApply, QueryPrivileges, QueryLog, SlowQuery, \
-    SlowQueryHistory
+    SlowQueryHistory, AliyunRdsConfig
 from .data_masking import Masking
 from .workflow import Workflow
 from .permission import role_required, superuser_required
@@ -818,9 +818,12 @@ def slowquery_review(request):
 
     # 判断是RDS还是其他实例
     cluster_info = master_config.objects.get(cluster_name=cluster_name)
-    if settings.ALIYUN_RDS_MANAGE:
-        # 调用阿里云慢日志接口
-        result = aliyun_rds_slowquery_review(request)
+    if len(AliyunRdsConfig.objects.filter(cluster_name=cluster_name)) > 0:
+        if settings.ALIYUN_RDS_MANAGE:
+            # 调用阿里云慢日志接口
+            result = aliyun_rds_slowquery_review(request)
+        else:
+            raise Exception('未开启rds管理，无法查看rds数据！')
     else:
         StartTime = request.POST.get('StartTime')
         EndTime = request.POST.get('EndTime')
@@ -920,9 +923,12 @@ def slowquery_review_history(request):
 
     # 判断是RDS还是其他实例
     cluster_info = master_config.objects.get(cluster_name=cluster_name)
-    if settings.ALIYUN_RDS_MANAGE:
-        # 调用阿里云慢日志接口
-        result = aliyun_rds_slowquery_review_history(request)
+    if len(AliyunRdsConfig.objects.filter(cluster_name=cluster_name)) > 0:
+        if settings.ALIYUN_RDS_MANAGE:
+            # 调用阿里云慢日志接口
+            result = aliyun_rds_slowquery_review_history(request)
+        else:
+            raise Exception('未开启rds管理，无法查看rds数据！')
     else:
         StartTime = request.POST.get('StartTime')
         EndTime = request.POST.get('EndTime')

sql/urls.py

@@ -64,13 +64,5 @@
     url(r'^kill_session/$', views_ajax.kill_session, name='kill_session'),
     url(r'^sapce_status/$', views_ajax.tablesapce, name='tablesapce'),
     url(r'^del_sqlcronjob/$', jobs.del_sqlcronjob, name='del_sqlcronjob'),
-
 ]
 
-if settings.ALIYUN_RDS_MANAGE:
-    from . import aliyun_function
-
-    aliyun_function_url = [
-        url(r'^sapce_status/$', aliyun_function.sapce_status, name='sapce_status'),
-    ]
-    urlpatterns.extend(aliyun_function_url)