更新image

Author: yangmv

apps/assets/migrations/0004_auto_20190109_1009.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.1.3 on 2019-01-09 10:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0003_dbserver_role'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='server',
+            name='region',
+            field=models.CharField(blank=True, max_length=16, null=True, verbose_name='区域'),
+        ),
+        migrations.AlterField(
+            model_name='dbserver',
+            name='role',
+            field=models.CharField(choices=[('master', '主'), ('slave', '从'), ('backup', '备')], default='master', max_length=16, verbose_name='角色'),
+        ),
+        migrations.AlterField(
+            model_name='server',
+            name='idc',
+            field=models.CharField(choices=[('qcloud', '腾讯云'), ('aliyun', '阿里云'), ('aws', 'AWS'), ('internal', '内网'), ('other', '其他')], default='other', max_length=16, verbose_name='云厂商'),
+        ),
+    ]

apps/assets/migrations/0005_dbserver_region.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.3 on 2019-01-09 10:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0004_auto_20190109_1009'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dbserver',
+            name='region',
+            field=models.CharField(blank=True, max_length=16, null=True, verbose_name='区域'),
+        ),
+    ]

apps/assets/migrations/__pycache__/0004_auto_20190109_1009.cpython-36.pyc

@@ -34,6 +34,7 @@ class DBServer(models.Model):
     password = models.CharField(max_length=128,null=True, blank=True)
 
     idc = models.CharField('云厂商',max_length=16, choices=IDC_CHOICES, default='other')
+    region = models.CharField('区域',max_length=16, blank=True, null=True)
     db_type = models.CharField('数据库类型',max_length=32, choices=TYPE_CHOICES, default='MySQL')
     db_version = models.CharField('数据库版本', max_length=32, null=True, blank=True)
     comment = models.CharField('备注',max_length=128, blank=True, null=True)
@@ -47,7 +48,9 @@ def model_to_dict(self):
         info = {
             'db_type': self.db_type,
             'db_role': self.role,
-            'db_info': base64.b64encode(db_info.encode('utf-8'))
+            'db_info': base64.b64encode(db_info.encode('utf-8')),
+            'db_idc': self.idc,
+            'db_region': self.region
         }
         return info
 

apps/assets/migrations/__pycache__/0005_dbserver_region.cpython-36.pyc

@@ -17,13 +17,15 @@ class Server(models.Model):
         ('qcloud', '腾讯云'),
         ('aliyun', '阿里云'),
         ('aws', 'AWS'),
+        ('internal', '内网'),
         ('other', '其他')
     )
     hostname = models.CharField(unique=True, max_length=128)
     ip = models.CharField(max_length=32, blank=True, null=True)
     port = models.IntegerField(blank=True, null=True)
 
     idc = models.CharField('云厂商',max_length=16, choices=IDC_CHOICES, default='other')
+    region = models.CharField('区域',max_length=16, blank=True, null=True)
     cpu = models.CharField('CPU',max_length=32, blank=True, null=True)
     memory = models.CharField('内存',max_length=32, blank=True, null=True)
     disk = models.CharField('硬盘',max_length=32, blank=True, null=True)
@@ -50,7 +52,9 @@ def model_to_dict(self):
             'hostname': self.hostname,
             'ip': self.ip,
             'port': self.port,
-            'username': self.admin_user.username if self.admin_user else self.username
+            'username': self.admin_user.username if self.admin_user else self.username,
+            'idc': self.idc,
+            'region': self.region
         }
         return info
 

apps/assets/models/__pycache__/db.cpython-36.pyc

@@ -63,7 +63,7 @@ spec:
 #metadata:
 #  name: codo-cmdb-ingress
 #  annotations:
-#    kubernetes.io/ingress.class: "nginx"
+#    kubernetes.io/ingress.class: "traefik"
 #spec:
 #  rules:
 #  - host: <DOMAIN>