Browse Source

ajout last_check

Élie Bouttier 7 years ago
parent
commit
a6c9401297
3 changed files with 34 additions and 8 deletions
  1. 7 7
      services/admin.py
  2. 25 0
      services/migrations/0042_auto_20180125_0041.py
  3. 2 1
      services/models.py

+ 7 - 7
services/admin.py

@@ -249,7 +249,7 @@ class IPPrefixAdmin(admin.ModelAdmin):
 
 
 class IPResourceAdmin(admin.ModelAdmin):
-    list_display = ('__str__', 'available_display', 'last_use', 'last_ping',)
+    list_display = ('__str__', 'available_display', 'last_use', 'last_time_up',)
     list_filter = (
         'category',
         ResourceInUseFilter,
@@ -257,8 +257,8 @@ class IPResourceAdmin(admin.ModelAdmin):
         ('prefixes', admin.RelatedOnlyFieldListFilter),
         RouteFilter,
     )
-    fields = ('ip', 'reserved', 'last_ping', 'notes')
-    readonly_fields = ('ip', 'reserved', 'last_ping',)
+    fields = ('ip', 'reserved', 'last_time_up', 'last_check', 'notes')
+    readonly_fields = ('ip', 'reserved', 'last_time_up', 'last_check',)
     search_fields = ('=ip', 'notes',)
 
     def get_inline_instances(self, request, obj=None):
@@ -289,10 +289,10 @@ class IPResourceAdmin(admin.ModelAdmin):
     last_use.short_description = 'Dernière utilisation'
     last_use.admin_order_field = 'last_use'
 
-    def last_ping(self, obj):
-        return obj.last_ping
-    last_ping.short_description = 'Dernier Ping'
-    last_ping.admin_order_field = 'last_ping'
+    def last_time_up(self, obj):
+        return obj.last_time_up
+    last_time_up.short_description = 'Dernier Ping'
+    last_time_up.admin_order_field = 'last_time_up'
 
     def get_actions(self, request):
         actions = super().get_actions(request)

+ 25 - 0
services/migrations/0042_auto_20180125_0041.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.9 on 2018-01-24 23:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('services', '0041_ipresource_last_ping'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='ipresource',
+            old_name='last_ping',
+            new_name='last_time_up',
+        ),
+        migrations.AddField(
+            model_name='ipresource',
+            name='last_check',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Dernier contrôle CheckMK'),
+        ),
+    ]

+ 2 - 1
services/models.py

@@ -98,7 +98,8 @@ class IPResource(models.Model):
     reserved = models.BooleanField(default=False, verbose_name='réservée')
     category = models.IntegerField(choices=CATEGORIES, verbose_name='catégorie')
     notes = models.TextField(blank=True, default='')
-    last_ping = models.DateTimeField(null=True, blank=True, verbose_name='Dernière réponse au ping')
+    last_time_up = models.DateTimeField(null=True, blank=True, verbose_name='Dernière réponse au ping')
+    last_check = models.DateTimeField(null=True, blank=True, verbose_name='Dernier contrôle CheckMK')
 
     objects = IPResourceManager()