Django 3.1

This commit is contained in:
wh1te909 2020-08-10 05:47:13 +00:00
parent bc008b917a
commit e5a15c6fef
10 changed files with 120 additions and 13 deletions

View File

@ -0,0 +1,18 @@
# Generated by Django 3.1 on 2020-08-10 05:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounts', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='user',
name='first_name',
field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
),
]

View File

@ -0,0 +1,28 @@
# Generated by Django 3.1 on 2020-08-10 05:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('agents', '0011_recoveryaction'),
]
operations = [
migrations.AlterField(
model_name='agent',
name='disks',
field=models.JSONField(null=True),
),
migrations.AlterField(
model_name='agent',
name='services',
field=models.JSONField(null=True),
),
migrations.AlterField(
model_name='agent',
name='wmi_detail',
field=models.JSONField(null=True),
),
]

View File

@ -13,7 +13,6 @@ from loguru import logger
from django.db import models
from django.conf import settings
from django.contrib.postgres.fields import JSONField
from core.models import TZ_CHOICES
@ -34,11 +33,11 @@ class Agent(models.Model):
local_ip = models.TextField(null=True)
agent_id = models.CharField(max_length=200)
last_seen = models.DateTimeField(null=True, blank=True)
services = JSONField(null=True)
services = models.JSONField(null=True)
public_ip = models.CharField(null=True, max_length=255)
total_ram = models.IntegerField(null=True)
used_ram = models.IntegerField(null=True)
disks = JSONField(null=True)
disks = models.JSONField(null=True)
boot_time = models.FloatField(null=True)
logged_in_username = models.CharField(null=True, max_length=200)
client = models.CharField(max_length=200)
@ -56,7 +55,7 @@ class Agent(models.Model):
update_pending = models.BooleanField(default=False)
salt_update_pending = models.BooleanField(default=False)
choco_installed = models.BooleanField(default=False)
wmi_detail = JSONField(null=True)
wmi_detail = models.JSONField(null=True)
time_zone = models.CharField(
max_length=255, choices=TZ_CHOICES, null=True, blank=True
)

View File

@ -0,0 +1,23 @@
# Generated by Django 3.1 on 2020-08-10 05:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('checks', '0004_check_parent_check'),
]
operations = [
migrations.AlterField(
model_name='check',
name='extra_details',
field=models.JSONField(blank=True, null=True),
),
migrations.AlterField(
model_name='check',
name='outage_history',
field=models.JSONField(blank=True, null=True),
),
]

View File

@ -5,7 +5,7 @@ from statistics import mean
from django.db import models
from django.conf import settings
from django.contrib.postgres.fields import ArrayField, JSONField
from django.contrib.postgres.fields import ArrayField
from django.core.validators import MinValueValidator, MaxValueValidator
from core.models import CoreSettings
@ -86,8 +86,8 @@ class Check(models.Model):
fail_count = models.PositiveIntegerField(default=0)
email_sent = models.DateTimeField(null=True, blank=True)
text_sent = models.DateTimeField(null=True, blank=True)
outage_history = JSONField(null=True, blank=True) # store
extra_details = JSONField(null=True, blank=True)
outage_history = models.JSONField(null=True, blank=True) # store
extra_details = models.JSONField(null=True, blank=True)
# check specific fields

View File

@ -0,0 +1,18 @@
# Generated by Django 3.1 on 2020-08-10 05:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('logs', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='pendingaction',
name='details',
field=models.JSONField(blank=True, null=True),
),
]

View File

@ -1,7 +1,6 @@
import datetime as dt
from django.db import models
from django.contrib.postgres.fields import JSONField
from agents.models import Agent
@ -28,7 +27,7 @@ class PendingAction(models.Model):
max_length=255, choices=STATUS_CHOICES, default="pending",
)
celery_id = models.CharField(null=True, blank=True, max_length=255)
details = JSONField(null=True, blank=True)
details = models.JSONField(null=True, blank=True)
def __str__(self):
return f"{self.agent.hostname} - {self.action_type}"

View File

@ -7,7 +7,7 @@ cffi==1.14.1
chardet==3.0.4
cryptography==3.0
decorator==4.4.2
Django==3.0.8
Django==3.1
django-cors-headers==3.4.0
django-rest-knox==4.1.0
djangorestframework==3.11.1

View File

@ -0,0 +1,23 @@
# Generated by Django 3.1 on 2020-08-10 05:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('software', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='chocosoftware',
name='chocos',
field=models.JSONField(),
),
migrations.AlterField(
model_name='installedsoftware',
name='software',
field=models.JSONField(),
),
]

View File

@ -1,11 +1,10 @@
from django.db import models
from django.contrib.postgres.fields import JSONField
from agents.models import Agent
class ChocoSoftware(models.Model):
chocos = JSONField()
chocos = models.JSONField()
added = models.DateTimeField(auto_now_add=True)
@classmethod
@ -54,7 +53,7 @@ class ChocoLog(models.Model):
class InstalledSoftware(models.Model):
agent = models.ForeignKey(Agent, on_delete=models.CASCADE)
software = JSONField()
software = models.JSONField()
def __str__(self):
return self.agent.hostname