Skip to content

Commit

Permalink
fix(helm-charts): helm-chart bugfix #1556
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhangzhw8
zhangzhw8 committed Oct 30, 2023
1 parent 0640ea7 commit 8d4b3d4
Show file tree
Hide file tree
Showing 25 changed files with 149 additions and 251 deletions.
10 changes: 3 additions & 7 deletions dbm-ui/backend/db_monitor/migrations/0013_alter_monitorpolicy_target_level.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

from django.db import migrations, models

from backend.db_monitor.constants import TargetLevel


class Migration(migrations.Migration):

Expand All @@ -14,13 +16,7 @@ class Migration(migrations.Migration):
model_name="monitorpolicy",
name="target_level",
field=models.CharField(
choices=[
("platform", "platform"),
("appid", "app id"),
("db_module", "db module"),
("cluster_domain", "cluster domain"),
("custom", "custom"),
],
choices=TargetLevel.get_choices(),
default="appid",
max_length=64,
verbose_name="监控目标级别，跟随targets调整",
Expand Down
17 changes: 17 additions & 0 deletions dbm-ui/backend/db_monitor/migrations/0014_alter_noticegroup_unique_together.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 3.2.19 on 2023-10-28 08:40

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("db_monitor", "0013_alter_monitorpolicy_target_level"),
]

operations = [
migrations.AlterUniqueTogether(
name="noticegroup",
unique_together={("bk_biz_id", "name")},
),
]
66 changes: 6 additions & 60 deletions dbm-ui/backend/db_report/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
import django.db.models.deletion
from django.db import migrations, models

from backend.db_meta.enums import ClusterType, MachineType
from backend.db_report.enums import MetaCheckSubType


class Migration(migrations.Migration):

Expand All @@ -28,80 +31,23 @@ class Migration(migrations.Migration):
(
"cluster_type",
models.CharField(
choices=[
("tendbsingle", "tendbsingle"),
("tendbha", "tendbha"),
("tendbcluster", "tendbcluster"),
("redis", "Redis集群"),
("PredixyRedisCluster", "Redis集群"),
("PredixyTendisplusCluster", "Tendisplus存储版集群"),
("TwemproxyRedisInstance", "TendisCache集群"),
("TwemproxyTendisSSDInstance", "TendisSSD集群"),
("TwemproxyTendisplusInstance", "Tendis存储版集群"),
("RedisInstance", "RedisCache主从版"),
("TendisSSDInstance", "TendisSSD主从版"),
("TendisplusInstance", "Tendisplus主从版"),
("RedisCluster", "RedisCluster集群"),
("TendisplusCluster", "TendisplusCluster集群"),
("TendisplusInstance", "Tendisplus存储版集群 GetTendisType 获取redis类型值"),
("RedisInstance", "TendisCache集群 GetTendisType 获取redis类型值"),
("TendisSSDInstance", "TendisSSD集群 GetTendisType 获取redis类型值"),
("es", "ES集群"),
("kafka", "Kafka集群"),
("hdfs", "Hdfs集群"),
("influxdb", "Influxdb实例"),
("pulsar", "Pulsar集群"),
("MongoReplicaSet", "Mongo副本集"),
("MongoShardedCluster", "Mongo分片集群"),
("riak", "Riak集群"),
],
choices=ClusterType.get_choices(),
default="",
max_length=64,
),
),
(
"machine_type",
models.CharField(
choices=[
("spider", "spider"),
("remote", "remote"),
("proxy", "proxy"),
("backend", "backend"),
("single", "single"),
("predixy", "predixy"),
("twemproxy", "twemproxy"),
("redis", "redis"),
("tendiscache", "tendiscache"),
("tendisssd", "tendisssd"),
("tendisplus", "tendisplus"),
("es_datanode", "es_datanode"),
("es_master", "es_master"),
("es_client", "es_client"),
("broker", "broker"),
("zookeeper", "zookeeper"),
("hdfs_master", "hdfs_master"),
("hdfs_datanode", "hdfs_datanode"),
("mongos", "mongos"),
("mongodb", "mongodb"),
("mongo_config", "mongo_config"),
("influxdb", "influxdb"),
("pulsar_zookeeper", "pulsar_zookeeper"),
("pulsar_bookkeeper", "pulsar_bookkeeper"),
("pulsar_broker", "pulsar_broker"),
("riak", "riak"),
],
choices=MachineType.get_choices(),
default="",
max_length=64,
),
),
(
"subtype",
models.CharField(
choices=[
("instance_belong", "实例集群归属"),
("replicate_role", "数据同步实例角色"),
("cluster_topo", "集群结构"),
],
choices=MetaCheckSubType.get_choices(),
default="",
help_text="元数据检查子项",
max_length=64,
Expand Down
30 changes: 3 additions & 27 deletions dbm-ui/backend/db_report/migrations/0002_alter_metacheckreport_cluster_type.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

from django.db import migrations, models

from backend.db_meta.enums import ClusterType


class Migration(migrations.Migration):

Expand All @@ -14,33 +16,7 @@ class Migration(migrations.Migration):
model_name="metacheckreport",
name="cluster_type",
field=models.CharField(
choices=[
("tendbsingle", "tendbsingle"),
("tendbha", "tendbha"),
("tendbcluster", "tendbcluster"),
("redis", "Redis集群"),
("PredixyRedisCluster", "Tendisplus集群"),
("PredixyTendisplusCluster", "Tendisplus存储版集群"),
("TwemproxyRedisInstance", "TendisCache集群"),
("TwemproxyTendisSSDInstance", "TendisSSD集群"),
("TwemproxyTendisplusInstance", "Tendis存储版集群"),
("RedisInstance", "RedisCache主从版"),
("TendisSSDInstance", "TendisSSD主从版"),
("TendisplusInstance", "Tendisplus主从版"),
("RedisCluster", "RedisCluster集群"),
("TendisplusCluster", "TendisplusCluster集群"),
("TendisplusInstance", "Tendisplus存储版集群 GetTendisType 获取redis类型值"),
("RedisInstance", "TendisCache集群 GetTendisType 获取redis类型值"),
("TendisSSDInstance", "TendisSSD集群 GetTendisType 获取redis类型值"),
("es", "ES集群"),
("kafka", "Kafka集群"),
("hdfs", "Hdfs集群"),
("influxdb", "Influxdb实例"),
("pulsar", "Pulsar集群"),
("MongoReplicaSet", "Mongo副本集"),
("MongoShardedCluster", "Mongo分片集群"),
("riak", "Riak集群"),
],
choices=ClusterType.get_choices(),
default="",
max_length=64,
),
Expand Down
65 changes: 6 additions & 59 deletions dbm-ui/backend/db_report/migrations/0003_auto_20231023_1445.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

from django.db import migrations, models

from backend.db_meta.enums import ClusterType
from backend.db_report.enums import RedisBackupCheckSubType


class Migration(migrations.Migration):

Expand All @@ -26,33 +29,7 @@ class Migration(migrations.Migration):
(
"cluster_type",
models.CharField(
choices=[
("tendbsingle", "tendbsingle"),
("tendbha", "tendbha"),
("tendbcluster", "tendbcluster"),
("redis", "Redis集群"),
("PredixyRedisCluster", "Tendisplus集群"),
("PredixyTendisplusCluster", "Tendisplus存储版集群"),
("TwemproxyRedisInstance", "TendisCache集群"),
("TwemproxyTendisSSDInstance", "TendisSSD集群"),
("TwemproxyTendisplusInstance", "Tendis存储版集群"),
("RedisInstance", "RedisCache主从版"),
("TendisSSDInstance", "TendisSSD主从版"),
("TendisplusInstance", "Tendisplus主从版"),
("RedisCluster", "RedisCluster集群"),
("TendisplusCluster", "TendisplusCluster集群"),
("TendisplusInstance", "Tendisplus存储版集群 GetTendisType 获取redis类型值"),
("RedisInstance", "TendisCache集群 GetTendisType 获取redis类型值"),
("TendisSSDInstance", "TendisSSD集群 GetTendisType 获取redis类型值"),
("es", "ES集群"),
("kafka", "Kafka集群"),
("hdfs", "Hdfs集群"),
("influxdb", "Influxdb实例"),
("pulsar", "Pulsar集群"),
("MongoReplicaSet", "Mongo副本集"),
("MongoShardedCluster", "Mongo分片集群"),
("riak", "Riak集群"),
],
choices=ClusterType.get_choices(),
default="",
max_length=64,
),
Expand All @@ -61,11 +38,7 @@ class Migration(migrations.Migration):
(
"subtype",
models.CharField(
choices=[
("full_backup", "集群可用全备"),
("binlog_slave", "从库binlog备份"),
("binlog_seq", "binlog连续性检查"),
],
choices=RedisBackupCheckSubType.get_choices(),
default="",
help_text="备份检查子项",
max_length=64,
Expand All @@ -85,33 +58,7 @@ class Migration(migrations.Migration):
model_name="checksumcheckreport",
name="cluster_type",
field=models.CharField(
choices=[
("tendbsingle", "tendbsingle"),
("tendbha", "tendbha"),
("tendbcluster", "tendbcluster"),
("redis", "Redis集群"),
("PredixyRedisCluster", "Tendisplus集群"),
("PredixyTendisplusCluster", "Tendisplus存储版集群"),
("TwemproxyRedisInstance", "TendisCache集群"),
("TwemproxyTendisSSDInstance", "TendisSSD集群"),
("TwemproxyTendisplusInstance", "Tendis存储版集群"),
("RedisInstance", "RedisCache主从版"),
("TendisSSDInstance", "TendisSSD主从版"),
("TendisplusInstance", "Tendisplus主从版"),
("RedisCluster", "RedisCluster集群"),
("TendisplusCluster", "TendisplusCluster集群"),
("TendisplusInstance", "Tendisplus存储版集群 GetTendisType 获取redis类型值"),
("RedisInstance", "TendisCache集群 GetTendisType 获取redis类型值"),
("TendisSSDInstance", "TendisSSD集群 GetTendisType 获取redis类型值"),
("es", "ES集群"),
("kafka", "Kafka集群"),
("hdfs", "Hdfs集群"),
("influxdb", "Influxdb实例"),
("pulsar", "Pulsar集群"),
("MongoReplicaSet", "Mongo副本集"),
("MongoShardedCluster", "Mongo分片集群"),
("riak", "Riak集群"),
],
choices=ClusterType.get_choices(),
default="",
max_length=64,
verbose_name="集群类型",
Expand Down
51 changes: 51 additions & 0 deletions dbm-ui/backend/db_report/migrations/0004_auto_20231028_1640.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Generated by Django 3.2.19 on 2023-10-28 08:40

from django.db import migrations, models

from backend.db_meta.enums import ClusterType
from backend.db_report.enums import MysqlBackupCheckSubType


class Migration(migrations.Migration):

dependencies = [
("db_report", "0003_auto_20231023_1445"),
]

operations = [
migrations.CreateModel(
name="MysqlBackupCheckReport",
fields=[
("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
("creator", models.CharField(max_length=64, verbose_name="创建人")),
("create_at", models.DateTimeField(auto_now_add=True, verbose_name="创建时间")),
("updater", models.CharField(max_length=64, verbose_name="修改人")),
("update_at", models.DateTimeField(auto_now=True, verbose_name="更新时间")),
("bk_biz_id", models.IntegerField(default=0, help_text="业务的 cmdb id")),
("bk_cloud_id", models.IntegerField(default=0, help_text="云区域 id")),
("status", models.BooleanField(default=True, help_text="巡检结果状态, 默认正常")),
("msg", models.TextField(default="", help_text="备注信息")),
("cluster", models.CharField(default="", max_length=255)),
("cluster_type", models.CharField(choices=ClusterType.get_choices(), default="", max_length=64)),
(
"subtype",
models.CharField(
choices=MysqlBackupCheckSubType.get_choices(), default="", help_text="备份检查子项", max_length=64
),
),
],
options={
"abstract": False,
},
),
migrations.AlterField(
model_name="redisbackupcheckreport",
name="subtype",
field=models.CharField(
choices=[("full_backup", "集群全备"), ("binlog_slave", "从库binlog备份")],
default="",
help_text="备份检查子项",
max_length=64,
),
),
]
Loading

0 comments on commit 8d4b3d4

Please sign in to comment.