Merge pull request #1364 from ifooth/joelei-ui

Add: namespace for metrics query

bcs-ui/backend/container_service/observability/metric/serializers.py

@@ -23,6 +23,7 @@ from backend.container_service.observability.metric import constants
 class BaseMetricSLZ(serializers.Serializer):
     start_at = serializers.DateTimeField(required=False)
     end_at = serializers.DateTimeField(required=False)
+    namespace = serializers.CharField(label='命名空间')
 
     def validate(self, attrs):
         now = arrow.now().timestamp
@@ -41,7 +42,7 @@ class BaseMetricSLZ(serializers.Serializer):
 
 
 class FetchPodMetricSLZ(BaseMetricSLZ):
-    """ 获取多个 Pod 指标信息 """
+    """获取多个 Pod 指标信息"""
 
     pod_name_list = serializers.ListField(
         label='Pod 名称列表', child=serializers.CharField(max_length=64), allow_empty=False
@@ -49,7 +50,7 @@ class FetchPodMetricSLZ(BaseMetricSLZ):
 
 
 class FetchContainerMetricSLZ(BaseMetricSLZ):
-    """ 获取容器指标信息 """
+    """获取容器指标信息"""
 
     container_ids = serializers.ListField(
         label='容器 ID 列表', child=serializers.CharField(max_length=64), allow_empty=False, required=False
@@ -57,7 +58,7 @@ class FetchContainerMetricSLZ(BaseMetricSLZ):
 
 
 class FetchMetricOverviewSLZ(serializers.Serializer):
-    """ 获取指标总览 """
+    """获取指标总览"""
 
     dimensions = serializers.ListField(
         label='指标维度', child=serializers.CharField(max_length=16), allow_empty=True, required=False
@@ -65,7 +66,7 @@ class FetchMetricOverviewSLZ(serializers.Serializer):
 
 
 class FetchTargetsSLZ(serializers.Serializer):
-    """ 获取 Target 列表 """
+    """获取 Target 列表"""
 
     show_discovered = serializers.BooleanField(label='是否展示 Discovered', default=False, required=False)
 
@@ -74,7 +75,7 @@ class FetchTargetsSLZ(serializers.Serializer):
 
 
 class ServiceMonitorInfoSLZ(serializers.Serializer):
-    """ ServiceMonitor 基础信息 """
+    """ServiceMonitor 基础信息"""
 
     name = serializers.CharField(label='名称')
     namespace = serializers.CharField(label='命名空间')
@@ -86,7 +87,7 @@ class ServiceMonitorInfoSLZ(serializers.Serializer):
 
 
 class ServiceMonitorUpdateSLZ(serializers.Serializer):
-    """ 更新 ServiceMonitor """
+    """更新 ServiceMonitor"""
 
     port = serializers.CharField(label='端口')
     path = serializers.CharField(label='绝对路径')
@@ -119,13 +120,13 @@ class ServiceMonitorUpdateSLZ(serializers.Serializer):
 
 
 class ServiceMonitorCreateSLZ(ServiceMonitorInfoSLZ, ServiceMonitorUpdateSLZ):
-    """ 创建 ServiceMonitor """
+    """创建 ServiceMonitor"""
 
     service_name = serializers.CharField(label='Service 名称')
 
 
 class ServiceMonitorBatchDeleteSLZ(serializers.Serializer):
-    """ 批量删除 ServiceMonitor """
+    """批量删除 ServiceMonitor"""
 
     service_monitors = serializers.ListField(
         label='待删除 ServiceMonitor 列表', child=ServiceMonitorInfoSLZ(), allow_empty=False

bcs-ui/backend/container_service/observability/metric/views/container.py

@@ -47,7 +47,7 @@ class ContainerMetricViewSet(SystemViewSet):
         params = self.params_validate(self.serializer_class)
         query_params = {
             'cluster_id': cluster_id,
-            'namespace': METRICS_DEFAULT_NAMESPACE,
+            'namespace': params['namespace'],
             'pod_name': pod_name if pod_name != URL_DEFAULT_PLACEHOLDER else METRICS_DEFAULT_POD_NAME,
             'container_id_list': params['container_ids']
             if params.get('container_ids')
@@ -72,7 +72,7 @@ class ContainerMetricViewSet(SystemViewSet):
 
     @action(methods=['POST'], url_path='cpu_usage', detail=False)
     def cpu_usage(self, request, project_id, cluster_id, pod_name):
-        """ 获取指定 容器 CPU 使用情况 """
+        """获取指定 容器 CPU 使用情况"""
         response_data = self._common_query_handler(prom.get_container_cpu_usage_range, cluster_id, pod_name)
         return Response(response_data)
 
@@ -85,18 +85,18 @@ class ContainerMetricViewSet(SystemViewSet):
 
     @action(methods=['POST'], url_path='memory_usage', detail=False)
     def memory_usage(self, request, project_id, cluster_id, pod_name):
-        """ 获取 容器内存 使用情况 """
+        """获取 容器内存 使用情况"""
         response_data = self._common_query_handler(prom.get_container_memory_usage_range, cluster_id, pod_name)
         return Response(response_data)
 
     @action(methods=['POST'], url_path='disk_read', detail=False)
     def disk_read(self, request, project_id, cluster_id, pod_name):
-        """ 获取 磁盘读 情况 """
+        """获取 磁盘读 情况"""
         response_data = self._common_query_handler(prom.get_container_disk_read, cluster_id, pod_name)
         return Response(response_data)
 
     @action(methods=['POST'], url_path='disk_write', detail=False)
     def disk_write(self, request, project_id, cluster_id, pod_name):
-        """ 获取 磁盘写 情况 """
+        """获取 磁盘写 情况"""
         response_data = self._common_query_handler(prom.get_container_disk_write, cluster_id, pod_name)
         return Response(response_data)

bcs-ui/backend/container_service/observability/metric/views/pod.py

@@ -37,29 +37,29 @@ class PodMetricViewSet(SystemViewSet):
         """
         params = self.params_validate(self.serializer_class)
         return query_metric_func(
-            cluster_id, METRICS_DEFAULT_NAMESPACE, params['pod_name_list'], params['start_at'], params['end_at']
+            cluster_id, params['namespace'], params['pod_name_list'], params['start_at'], params['end_at']
         )
 
     @action(methods=['POST'], url_path='cpu_usage', detail=False)
     def cpu_usage(self, request, project_id, cluster_id):
-        """ 获取指定 Pod CPU 使用情况 """
+        """获取指定 Pod CPU 使用情况"""
         response_data = self._common_query_handler(prom.get_pod_cpu_usage_range, cluster_id)
         return Response(response_data)
 
     @action(methods=['POST'], url_path='memory_usage', detail=False)
     def memory_usage(self, request, project_id, cluster_id):
-        """ 获取 Pod 内存使用情况 """
+        """获取 Pod 内存使用情况"""
         response_data = self._common_query_handler(prom.get_pod_memory_usage_range, cluster_id)
         return Response(response_data)
 
     @action(methods=['POST'], url_path='network_receive', detail=False)
     def network_receive(self, request, project_id, cluster_id):
-        """ 获取 网络入流量 情况 """
+        """获取 网络入流量 情况"""
         response_data = self._common_query_handler(prom.get_pod_network_receive, cluster_id)
         return Response(response_data)
 
     @action(methods=['POST'], url_path='network_transmit', detail=False)
     def network_transmit(self, request, project_id, cluster_id):
-        """ 获取 网络出流量 情况 """
+        """获取 网络出流量 情况"""
         response_data = self._common_query_handler(prom.get_pod_network_transmit, cluster_id)
         return Response(response_data)

bcs-ui/backend/uniapps/application/common_views/query.py

@@ -122,6 +122,7 @@ class K8SContainerInfo(BaseInstanceView, viewsets.ViewSet):
             ret_data = self.compose_container_data(container_id, container_spec, info, spec, status, labels)
             break
 
+        ret_data['namespace'] = getitems(pod_info, ['data', 'metadata', 'namespace'])
         return ret_data
 
     def compose_pod_params(self, request, project_id, instance_id):

bcs-ui/backend/uniapps/application/instance_views.py

@@ -1198,6 +1198,7 @@ class QueryContainerInfo(BaseAPI):
                         "image": image_split_str,
                         "container_ip": status.get("podIP", ""),
                         "host_name": spec.get("nodeName", ""),
+                        "namespace": metadata.get("namespace", ""),
                         "container_name": info.get("name", ""),
                     }
                     break