8000 fix: add some fields to the application view by ZhangSetSail · Pull Request #1581 · goodrain/rainbond-console · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: add some fields to the application view #1581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2024
Merged

fix: add some fields to the application view #1581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion console/services/group_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
from console.exception.bcode import ErrUserNotFound, ErrApplicationNotFound, ErrK8sAppExists
from console.exception.main import AbortRequest, ServiceHandleException
from console.repositories.app import service_repo, service_source_repo
from console.repositories.app_config import (domain_repo, env_var_repo, port_repo, tcp_domain, dep_relation_repo)
from console.repositories.app_config import (domain_repo, env_var_repo, port_repo, tcp_domain, dep_relation_repo,
volume_repo)
from console.repositories.app_config_group import app_config_group_repo
from console.repositories.backup_repo import backup_record_repo
from console.repositories.compose_repo import compose_repo
Expand Down Expand Up @@ -552,6 +553,12 @@ def get_multi_apps_all_info(self, sort, groups, app_ids, region, tenant_name, en

app_id_statuses = self.get_region_app_statuses(tenant_name, region, app_ids)
apps = dict()
volumes = volume_repo.get_services_volumes(service_ids)
service_volume = dict()
for volume in volumes:
if volume.volume_type != "config-file":
volume.volume_capacity = 10 if volume.volume_capacity == 0 else volume.volume_capacity
service_volume[volume.service_id] = service_volume.get(volume.service_id, 0) + volume.volume_capacity
for app in app_list:
app_status = app_id_statuses.get(app.ID)
apps[app.ID] = {
Expand All @@ -562,6 +569,8 @@ def get_multi_apps_all_info(self, sort, groups, app_ids, region, tenant_name, en
"group_note": app.note,
"service_list": [],
"used_mem": app_status.get("memory", 0) if app_status else 0,
"used_cpu": app_status.get("cpu", 0) if app_status else 0,
"used_disk": 0,
"status": app_status.get("status", "UNKNOWN") if app_status else "UNKNOWN",
"logo": app.logo,
"accesses": [],
Expand All @@ -573,6 +582,7 @@ def get_multi_apps_all_info(self, sort, groups, app_ids, region, tenant_name, en
svc_sas = service_status.get(service.service_id, {"status": "failure", "used_mem": 0})
service.status = svc_sas["status"]
service.used_mem = svc_sas["used_mem"]
apps[service.group_id]["used_disk"] = apps[service.group_id]["used_disk"] + service_volume.get(service.service_id, 0)
apps[service.group_id]["service_list"].append(service)
apps[service.group_id]["accesses"].append(accesses[service.service_id])

Expand Down
6 changes: 4 additions & 2 deletions console/services/market_app/new_components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ def _template_to_ports(self, component, ports):
port_protocol = port.get("protocol", "tcp")
if port_protocol not in ["tcp", "udp", "http"]:
port_protocol = "tcp"
port = TenantServicesPort(
if port_protocol == "tcp":
port["is_outer_service"] = False
t_port = TenantServicesPort(
tenant_id=component.tenant_id,
service_id=component.service_id,
container_port=int(component_port),
Expand All @@ -315,7 +317,7 @@ def _template_to_ports(self, component, ports):
name=port.get("name", ""),
k8s_service_name=k8s_service_name,
)
new_ports.append(port)
new_ports.append(t_port)
return new_ports

@staticmethod
Expand Down
12 changes: 2 additions & 10 deletions console/views/public_areas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,20 +174,12 @@ def get(self, request, *args, **kwargs):
if source:
try:
overview_detail["region_health"] = True
overview_detail["team_service_memory_count"] = int(source["memory"])
overview_detail["memory_usage"] = int(source["memory"])
overview_detail["team_service_total_disk"] = int(source["disk"])
overview_detail["team_service_total_cpu"] = int(source["limit_cpu"])
overview_detail["team_service_total_memory"] = int(source["limit_memory"])
overview_detail["team_service_use_cpu"] = int(source["cpu"])
overview_detail["cpu_usage"] = int(source["cpu"])
overview_detail["running_component_num"] = int(source.get("service_running_num", 0))
cpu_usage = 0
memory_usage = 0
if int(source["limit_cpu"]) != 0:
cpu_usage = float(int(source["cpu"])) / float(int(source["limit_cpu"])) * 100
if int(source["limit_memory"]) != 0:
memory_usage = float(int(source["memory"])) / float(int(source["limit_memory"])) * 100
overview_detail["cpu_usage"] = round(cpu_usage, 2)
overview_detail["memory_usage"] = round(memory_usage, 2)
except Exception as e:
logger.debug(source)
logger.exception(e)
Expand Down
Loading
0