删除工程配置

apps/dashboard/api/expired.py

@@ -28,14 +28,14 @@ class ExpiredPagination(PageNumberPagination):
 class DashboardExpiredECSAPI(WebTokenAuthentication,generics.ListAPIView):
     module = models.ExpiredAliyunECS
     permission_classes = [AllowAny,]
-    queryset = models.ExpiredAliyunECS.objects.all().order_by('expired')
+    queryset = models.ExpiredAliyunECS.objects.all()
     serializer_class = serializers.DashboardExpiredAliyunECSSerializer
     pagination_class = ExpiredPagination
 
 
 class DashboardExpiredRDSAPI(WebTokenAuthentication,generics.ListAPIView):
     module = models.ExpiredAliyunRDS
     permission_classes = [AllowAny,]
-    queryset = models.ExpiredAliyunRDS.objects.all().order_by('expired')
+    queryset = models.ExpiredAliyunRDS.objects.all()
     serializer_class = serializers.DashboardExpiredAliyunRDSSerializer
     pagination_class = ExpiredPagination

apps/dashboard/tasks.py

@@ -15,7 +15,6 @@
 
 connect = redis.StrictRedis(port=REDIS_PORT,db=REDIS_SPACE)
 
-
 @periodic_task(run_every=crontab(minute='*'))
 def aliyunECSExpiredInfoCatch():
     from dashboard.models import ExpiredAliyunECS
@@ -48,4 +47,30 @@ def aliyunRDSInfoCatch():
                 expiredTime = datetime.datetime.strptime(dt['ExpireTime'],'%Y-%m-%dT%H:%M:%SZ')
                 if 0 < (expiredTime - now).days < EXPIREDTIME:
                     dt['ExpiredDay'] = (expiredTime - now).days
-                    ExpiredAliyunRDS(**resolver.AliyunRDS2Json.decode(dt)).save()
+                    ExpiredAliyunRDS(**resolver.AliyunRDS2Json.decode(dt)).save()
+
+
+@periodic_task(run_every=crontab(minute='*'))
+def managerStatusCatch():
+    connect.delete('MANAGER_STATUS')
+    from manager import models as Manager
+    host_count = Manager.Host.objects.count()
+    group_count = Manager.Group.objects.count()
+    status = {
+        'host_count':host_count,
+        'group_count':group_count,
+    }
+    systypes = Manager.System_Type.objects.all()
+    for sys in systypes:
+        status[sys.name] = sys.hosts_detail.count()
+
+    positions = Manager.Position.objects.all()
+    for pos in positions:
+        status['pos'+str(pos.id)] = pos.hosts_detail.count()
+
+    groups = Manager.Group.objects.all()
+    for group in groups:
+        status[group.uuid] = group.hosts.count()
+
+    connect.hmset('MANAGER_STATUS', status)
+

apps/dashboard/urls/api_urls.py

@@ -4,7 +4,7 @@
 
 urlpatterns=[
     # Resource dashboard api
-    path(r'v1/dashboard/', DashboardAPI.DashboardAPI.as_view()),
+    path(r'v1/manager/', DashboardAPI.DashboardAPI.as_view()),
     #
     # Resource expire api
     path(r'v1/expired/ecs/bypage/', ExpiredAPI.DashboardExpiredECSAPI.as_view()),

apps/manager/tasks.py

@@ -14,31 +14,6 @@
 connect = redis.StrictRedis(port=REDIS_PORT,db=REDIS_SPACE)
 
 
-@periodic_task(run_every=crontab(minute='*'))
-def managerStatusCatch():
-    connect.delete('MANAGER_STATUS')
-    from manager import models as Manager
-    host_count = Manager.Host.objects.count()
-    group_count = Manager.Group.objects.count()
-    status = {
-        'host_count':host_count,
-        'group_count':group_count,
-    }
-    systypes = Manager.System_Type.objects.all()
-    for sys in systypes:
-        status[sys.name] = sys.hosts_detail.count()
-
-    positions = Manager.Position.objects.all()
-    for pos in positions:
-        status['pos'+str(pos.id)] = pos.hosts_detail.count()
-
-    groups = Manager.Group.objects.all()
-    for group in groups:
-        status[group.uuid] = group.hosts.count()
-
-    connect.hmset('MANAGER_STATUS', status)
-
-
 # @periodic_task(run_every=crontab(minute='*'))
 # def aliyunECSInfoCatch():
 #     from deveops.utils import aliyun