alex/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2026-01-04 09:55:33 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix admin registration using abx hooks

Browse Source
This commit is contained in:
Nick Sweeting
2024-10-14 17:38:38 -07:00
parent 30923c340f
commit c0b7887fd7
13 changed files with 253 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
archivebox/machine/admin.py
View File

@@ -1,94 +1,94 @@
# __package__ = 'archivebox.machine'
__package__ = 'archivebox.machine'
# import abx
import abx
# from django.contrib import admin
# from django.utils.html import format_html
from django.contrib import admin
from django.utils.html import format_html
# from abid_utils.admin import ABIDModelAdmin
from abid_utils.admin import ABIDModelAdmin
# from .models import Machine, NetworkInterface, InstalledBinary
from machine.models import Machine, NetworkInterface, InstalledBinary
# class MachineAdmin(ABIDModelAdmin):
# list_display = ('abid', 'created_at', 'hostname', 'ips', 'os_platform', 'hw_in_docker', 'hw_in_vm', 'hw_manufacturer', 'hw_product', 'os_arch', 'os_family', 'os_release', 'hw_uuid', 'health')
# sort_fields = ('abid', 'created_at', 'hostname', 'ips', 'os_platform', 'hw_in_docker', 'hw_in_vm', 'hw_manufacturer', 'hw_product', 'os_arch', 'os_family', 'os_release', 'hw_uuid')
# # search_fields = ('id', 'abid', 'guid', 'hostname', 'hw_manufacturer', 'hw_product', 'hw_uuid', 'os_arch', 'os_family', 'os_platform', 'os_kernel', 'os_release')
class MachineAdmin(ABIDModelAdmin):
list_display = ('abid', 'created_at', 'hostname', 'ips', 'os_platform', 'hw_in_docker', 'hw_in_vm', 'hw_manufacturer', 'hw_product', 'os_arch', 'os_family', 'os_release', 'hw_uuid', 'health')
sort_fields = ('abid', 'created_at', 'hostname', 'ips', 'os_platform', 'hw_in_docker', 'hw_in_vm', 'hw_manufacturer', 'hw_product', 'os_arch', 'os_family', 'os_release', 'hw_uuid')
# search_fields = ('id', 'abid', 'guid', 'hostname', 'hw_manufacturer', 'hw_product', 'hw_uuid', 'os_arch', 'os_family', 'os_platform', 'os_kernel', 'os_release')
# readonly_fields = ('guid', 'created_at', 'modified_at', 'abid_info', 'ips')
# fields = (*readonly_fields, 'hostname', 'hw_in_docker', 'hw_in_vm', 'hw_manufacturer', 'hw_product', 'hw_uuid', 'os_arch', 'os_family', 'os_platform', 'os_kernel', 'os_release', 'stats', 'num_uses_succeeded', 'num_uses_failed')
readonly_fields = ('guid', 'created_at', 'modified_at', 'abid_info', 'ips')
fields = (*readonly_fields, 'hostname', 'hw_in_docker', 'hw_in_vm', 'hw_manufacturer', 'hw_product', 'hw_uuid', 'os_arch', 'os_family', 'os_platform', 'os_kernel', 'os_release', 'stats', 'num_uses_succeeded', 'num_uses_failed', 'tags')
# list_filter = ('hw_in_docker', 'hw_in_vm', 'os_arch', 'os_family', 'os_platform')
# ordering = ['-created_at']
# list_per_page = 100
# actions = ["delete_selected"]
list_filter = ('hw_in_docker', 'hw_in_vm', 'os_arch', 'os_family', 'os_platform')
ordering = ['-created_at']
list_per_page = 100
actions = ["delete_selected"]
# @admin.display(
# description='Public IP',
# ordering='networkinterface__ip_public',
# )
# def ips(self, machine):
# return format_html(
# '<a href="/admin/machine/networkinterface/?q={}"><b><code>{}</code></b></a>',
# machine.abid,
# ', '.join(machine.networkinterface_set.values_list('ip_public', flat=True)),
# )
@admin.display(
description='Public IP',
ordering='networkinterface__ip_public',
)
def ips(self, machine):
return format_html(
'<a href="/admin/machine/networkinterface/?q={}"><b><code>{}</code></b></a>',
machine.abid,
', '.join(machine.networkinterface_set.values_list('ip_public', flat=True)),
)
# class NetworkInterfaceAdmin(ABIDModelAdmin):
# list_display = ('abid', 'created_at', 'machine_info', 'ip_public', 'dns_server', 'isp', 'country', 'region', 'city', 'iface', 'ip_local', 'mac_address', 'health')
# sort_fields = ('abid', 'created_at', 'machine_info', 'ip_public', 'dns_server', 'isp', 'country', 'region', 'city', 'iface', 'ip_local', 'mac_address')
# search_fields = ('abid', 'machine__abid', 'iface', 'ip_public', 'ip_local', 'mac_address', 'dns_server', 'hostname', 'isp', 'city', 'region', 'country')
class NetworkInterfaceAdmin(ABIDModelAdmin):
list_display = ('abid', 'created_at', 'machine_info', 'ip_public', 'dns_server', 'isp', 'country', 'region', 'city', 'iface', 'ip_local', 'mac_address', 'health')
sort_fields = ('abid', 'created_at', 'machine_info', 'ip_public', 'dns_server', 'isp', 'country', 'region', 'city', 'iface', 'ip_local', 'mac_address')
search_fields = ('abid', 'machine__abid', 'iface', 'ip_public', 'ip_local', 'mac_address', 'dns_server', 'hostname', 'isp', 'city', 'region', 'country')
# readonly_fields = ('machine', 'created_at', 'modified_at', 'abid_info', 'mac_address', 'ip_public', 'ip_local', 'dns_server')
# fields = (*readonly_fields, 'iface', 'hostname', 'isp', 'city', 'region', 'country', 'num_uses_succeeded', 'num_uses_failed')
readonly_fields = ('machine', 'created_at', 'modified_at', 'abid_info', 'mac_address', 'ip_public', 'ip_local', 'dns_server')
fields = (*readonly_fields, 'iface', 'hostname', 'isp', 'city', 'region', 'country', 'num_uses_succeeded', 'num_uses_failed')
# list_filter = ('isp', 'country', 'region')
# ordering = ['-created_at']
# list_per_page = 100
# actions = ["delete_selected"]
list_filter = ('isp', 'country', 'region')
ordering = ['-created_at']
list_per_page = 100
actions = ["delete_selected"]
# @admin.display(
# description='Machine',
# ordering='machine__abid',
# )
# def machine_info(self, iface):
# return format_html(
# '<a href="/admin/machine/machine/{}/change"><b><code>[{}]</code></b> &nbsp; {}</a>',
# iface.machine.id,
# iface.machine.abid,
# iface.machine.hostname,
# )
@admin.display(
description='Machine',
ordering='machine__abid',
)
def machine_info(self, iface):
return format_html(
'<a href="/admin/machine/machine/{}/change"><b><code>[{}]</code></b> &nbsp; {}</a>',
iface.machine.id,
iface.machine.abid,
iface.machine.hostname,
)
# class InstalledBinaryAdmin(ABIDModelAdmin):
# list_display = ('abid', 'created_at', 'machine_info', 'name', 'binprovider', 'version', 'abspath', 'sha256', 'health')
# sort_fields = ('abid', 'created_at', 'machine_info', 'name', 'binprovider', 'version', 'abspath', 'sha256')
# search_fields = ('abid', 'machine__abid', 'name', 'binprovider', 'version', 'abspath', 'sha256')
class InstalledBinaryAdmin(ABIDModelAdmin):
list_display = ('abid', 'created_at', 'machine_info', 'name', 'binprovider', 'version', 'abspath', 'sha256', 'health')
sort_fields = ('abid', 'created_at', 'machine_info', 'name', 'binprovider', 'version', 'abspath', 'sha256')
search_fields = ('abid', 'machine__abid', 'name', 'binprovider', 'version', 'abspath', 'sha256')
# readonly_fields = ('created_at', 'modified_at', 'abid_info')
# fields = ('machine', 'name', 'binprovider', 'abspath', 'version', 'sha256', *readonly_fields, 'num_uses_succeeded', 'num_uses_failed')
readonly_fields = ('created_at', 'modified_at', 'abid_info')
fields = ('machine', 'name', 'binprovider', 'abspath', 'version', 'sha256', *readonly_fields, 'num_uses_succeeded', 'num_uses_failed')
# list_filter = ('name', 'binprovider', 'machine_id')
# ordering = ['-created_at']
# list_per_page = 100
# actions = ["delete_selected"]
list_filter = ('name', 'binprovider', 'machine_id')
ordering = ['-created_at']
list_per_page = 100
actions = ["delete_selected"]
# @admin.display(
# description='Machine',
# ordering='machine__abid',
# )
# def machine_info(self, installed_binary):
# return format_html(
# '<a href="/admin/machine/machine/{}/change"><b><code>[{}]</code></b> &nbsp; {}</a>',
# installed_binary.machine.id,
# installed_binary.machine.abid,
# installed_binary.machine.hostname,
# )
@admin.display(
description='Machine',
ordering='machine__abid',
)
def machine_info(self, installed_binary):
return format_html(
'<a href="/admin/machine/machine/{}/change"><b><code>[{}]</code></b> &nbsp; {}</a>',
installed_binary.machine.id,
installed_binary.machine.abid,
installed_binary.machine.hostname,
)
# @abx.hookimpl
# def register_admin(admin_site):
# admin_site.register(Machine, MachineAdmin)
# admin_site.register(NetworkInterface, NetworkInterfaceAdmin)
# admin_site.register(InstalledBinary, InstalledBinaryAdmin)
@abx.hookimpl
def register_admin(admin_site):
admin_site.register(Machine, MachineAdmin)
admin_site.register(NetworkInterface, NetworkInterfaceAdmin)
admin_site.register(InstalledBinary, InstalledBinaryAdmin)

8
archivebox/machine/apps.py
View File

@@ -2,9 +2,17 @@ __package__ = 'archivebox.machine'
from django.apps import AppConfig
import abx
class MachineConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'machine'
verbose_name = 'Machine Info'
@abx.hookimpl
def register_admin(admin_site):
from machine.admin import register_admin
register_admin(admin_site)

1
archivebox/machine/models.py
View File

@@ -8,7 +8,6 @@ from django.db import models
from django.utils import timezone
from django.utils.functional import cached_property
import abx.archivebox.use
from abx.archivebox.base_binary import BaseBinary, BaseBinProvider
from archivebox.abid_utils.models import ABIDModel, ABIDField, AutoDateTimeField, ModelWithHealthStats