From 1fe08bef981eb15f296595e8330722efa4fd27af Mon Sep 17 00:00:00 2001 From: gqp <446105468@qq.com> Date: Tue, 12 Nov 2024 15:39:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E4=BE=9B=20Agent=20=E5=8C=85?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E5=9F=BA=E7=A1=80=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20(closed=20#1683)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0083_merge_20240911_1050.py | 13 ---- ...packages.py => 0084_auto_20241112_1539.py} | 66 +++++++++++++++---- .../migrations/0084_merge_20241112_1438.py | 13 ---- 3 files changed, 54 insertions(+), 38 deletions(-) delete mode 100644 apps/node_man/migrations/0083_merge_20240911_1050.py rename apps/node_man/migrations/{0082_gsepackagedesc_gsepackages.py => 0084_auto_20241112_1539.py} (60%) delete mode 100644 apps/node_man/migrations/0084_merge_20241112_1438.py diff --git a/apps/node_man/migrations/0083_merge_20240911_1050.py b/apps/node_man/migrations/0083_merge_20240911_1050.py deleted file mode 100644 index 1f98b8346..000000000 --- a/apps/node_man/migrations/0083_merge_20240911_1050.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 3.2.4 on 2024-09-11 02:50 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("node_man", "0082_gsepackagedesc_gsepackages"), - ("node_man", "0082_host_dept_name"), - ] - - operations = [] diff --git a/apps/node_man/migrations/0082_gsepackagedesc_gsepackages.py b/apps/node_man/migrations/0084_auto_20241112_1539.py similarity index 60% rename from apps/node_man/migrations/0082_gsepackagedesc_gsepackages.py rename to apps/node_man/migrations/0084_auto_20241112_1539.py index f10559a4b..fc82cf1c4 100644 --- a/apps/node_man/migrations/0082_gsepackagedesc_gsepackages.py +++ b/apps/node_man/migrations/0084_auto_20241112_1539.py @@ -1,13 +1,4 @@ -# -*- coding: utf-8 -*- -""" -TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-节点管理(BlueKing-BK-NODEMAN) available. -Copyright (C) 2017-2022 THL A29 Limited, a Tencent company. All rights reserved. -Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. -You may obtain a copy of the License at https://opensource.org/licenses/MIT -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. -""" +# Generated by Django 3.2.4 on 2024-11-12 07:39 from django.db import migrations, models @@ -15,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("node_man", "0081_auto_20240307_1656"), + ("node_man", "0083_subscription_operate_info"), ] operations = [ @@ -62,7 +53,13 @@ class Migration(migrations.Migration): ( "os", models.CharField( - choices=[("windows", "windows"), ("linux", "linux"), ("aix", "aix"), ("solaris", "solaris")], + choices=[ + ("windows", "windows"), + ("linux", "linux"), + ("aix", "aix"), + ("solaris", "solaris"), + ("darwin", "darwin"), + ], db_index=True, default="linux", max_length=32, @@ -94,4 +91,49 @@ class Migration(migrations.Migration): "verbose_name_plural": "Gse包（GsePackages）", }, ), + migrations.AlterField( + model_name="job", + name="job_type", + field=models.CharField( + choices=[ + ("INSTALL_AGENT", "INSTALL_AGENT"), + ("RESTART_AGENT", "RESTART_AGENT"), + ("REINSTALL_AGENT", "REINSTALL_AGENT"), + ("UNINSTALL_AGENT", "UNINSTALL_AGENT"), + ("REMOVE_AGENT", "REMOVE_AGENT"), + ("UPGRADE_AGENT", "UPGRADE_AGENT"), + ("DOWNGRADE_AGENT", "DOWNGRADE_AGENT"), + ("IMPORT_AGENT", "IMPORT_AGENT"), + ("RESTART_AGENT", "RESTART_AGENT"), + ("RELOAD_AGENT", "RELOAD_AGENT"), + ("ACTIVATE_AGENT", "ACTIVATE_AGENT"), + ("MAIN_START_PLUGIN", "MAIN_START_PLUGIN"), + ("MAIN_STOP_PLUGIN", "MAIN_STOP_PLUGIN"), + ("MAIN_RESTART_PLUGIN", "MAIN_RESTART_PLUGIN"), + ("MAIN_RELOAD_PLUGIN", "MAIN_RELOAD_PLUGIN"), + ("MAIN_DELEGATE_PLUGIN", "MAIN_DELEGATE_PLUGIN"), + ("MAIN_UNDELEGATE_PLUGIN", "MAIN_UNDELEGATE_PLUGIN"), + ("MAIN_INSTALL_PLUGIN", "MAIN_INSTALL_PLUGIN"), + ("MAIN_STOP_AND_DELETE_PLUGIN", "MAIN_STOP_AND_DELETE_PLUGIN"), + ("DEBUG_PLUGIN", "DEBUG_PLUGIN"), + ("STOP_DEBUG_PLUGIN", "STOP_DEBUG_PLUGIN"), + ("PUSH_CONFIG_PLUGIN", "PUSH_CONFIG_PLUGIN"), + ("REMOVE_CONFIG_PLUGIN", "REMOVE_CONFIG_PLUGIN"), + ("PACKING_PLUGIN", "PACKING_PLUGIN"), + ("INSTALL_PROXY", "INSTALL_PROXY"), + ("RESTART_PROXY", "RESTART_PROXY"), + ("REINSTALL_PROXY", "REINSTALL_PROXY"), + ("REPLACE_PROXY", "REPLACE_PROXY"), + ("UNINSTALL_PROXY", "UNINSTALL_PROXY"), + ("UPGRADE_PROXY", "UPGRADE_PROXY"), + ("IMPORT_PROXY", "IMPORT_PROXY"), + ("RESTART_PROXY", "RESTART_PROXY"), + ("RELOAD_PROXY", "RELOAD_PROXY"), + ], + db_index=True, + default="INSTALL_PROXY", + max_length=45, + verbose_name="作业类型", + ), + ), ] diff --git a/apps/node_man/migrations/0084_merge_20241112_1438.py b/apps/node_man/migrations/0084_merge_20241112_1438.py deleted file mode 100644 index 9a46c7744..000000000 --- a/apps/node_man/migrations/0084_merge_20241112_1438.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 3.2.4 on 2024-11-12 06:38 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("node_man", "0083_merge_20240911_1050"), - ("node_man", "0083_subscription_operate_info"), - ] - - operations = []