Ask user to confirm info before creating Install

.github/workflows/deploy-to-k8s.yaml

@@ -75,3 +75,4 @@ jobs:
 
         # Rolling restart
         kubectl --kubeconfig ./config --server https://${{ secrets.SSH_TARGET_IP }}:6443 -n ${{ vars.APP_NAMESPACE }} rollout restart deploy
+        kubectl --kubeconfig ./config --server https://${{ secrets.SSH_TARGET_IP }}:6443 -n ${{ vars.APP_NAMESPACE }} rollout restart statefulset

.github/workflows/publish-and-deploy.yaml

@@ -49,8 +49,8 @@ jobs:
     needs: push_to_registry
     if: github.ref == 'refs/heads/main'
 
-  deploy_to_prod1:
-    name: Deploy to prod 1
+  deploy_to_prod:
+    name: Deploy to prod
     uses: ./.github/workflows/deploy-to-k8s.yaml
     with:
       environment: prod

infra/README.md

@@ -32,10 +32,10 @@ These instructions will set up a 4 node k3s cluster on proxmox.
 | `WIREGUARD_PEER_PUBLIC_KEY`  | Public key of the wireguard server for deployment   |
 | `WIREGUARD_PRIVATE_KEY`  |  Private key for connecting to wireguard for deployment  |
 
-3. Create a new environment specific deployment workflow similar to `.github/workflows/deploy_prod1.yaml`
+3. Create a new environment in `.github/workflows/publish-and-deploy.yaml`
 
 4. Run the deployment.
 
-5. If you need a superuser, ssh into the mgr node and: `kubectl exec -it -n meshdbdev3 service/meshdb-meshweb bash` and then `python manage.py createsuperuser`
+5. If you need a superuser, ssh into the mgr node and: `kubectl exec -it -n meshdb service/meshdb-meshweb python manage.py createsuperuser`
 
-6. If you need to import data: `cat meshdb_export.sql | kubectl exec -it --tty -n meshdbprod1 pod/meshdb-postgres-.... -- psql -U meshdb -d meshdb`
+6. If you need to import data: `cat meshdb_export.sql | kubectl exec -it --tty -n meshdb pod/meshdb-postgres-.... -- psql -U meshdb -d meshdb`

infra/helm/meshdb/templates/postgres_pvc.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: longhorn
+  storageClassName: longhorn-encrypted
   resources:
     requests:
       storage: {{ .Values.pg.pvc_size }}

infra/helm/meshdb/values.yaml

@@ -7,7 +7,7 @@ pg:
   user: meshdb
   user_ro: meshdb_ro
   port: "5432"
-  pvc_name: "meshdb-postgres-pvc"
+  pvc_name: "meshdb-postgres-encyrpted-pvc"
   pvc_size: "20Gi"
   liveness_probe: "true"
   podSecurityContext: {}

pyproject.toml

@@ -41,6 +41,7 @@ dependencies = [
     "six==1.16.0",
     "django-flags==5.0.*",
     "django-sql-explorer==5.2.*",
+    "django-simple-history==3.7.*",
 ]
 
 [project.optional-dependencies]

scripts/import_spreadsheet_dump.sh

@@ -2,8 +2,28 @@
 
 DOCKER_PG_COMMAND="docker exec -i meshdb-postgres-1 psql -U meshdb"
 DATA_DIR="./spreadsheet_data/"
-tables=("meshapi_link" "meshapi_accesspoint" "meshapi_sector" "meshapi_device" "meshapi_building_nodes" "meshapi_node" "meshapi_install" "meshapi_building" "meshapi_member")
-#tables=("meshapi_link" "meshapi_building_nodes"  "meshapi_sector" "meshapi_device" "meshapi_install" "meshapi_member"  "meshapi_building" "meshapi_node")
+tables=(
+"meshapi_los"
+"meshapi_link"
+"meshapi_accesspoint"
+"meshapi_sector"
+"meshapi_device"
+"meshapi_building_nodes"
+"meshapi_node"
+"meshapi_install"
+"meshapi_building"
+"meshapi_member"
+"meshapi_historicallos"
+"meshapi_historicallink"
+"meshapi_historicalaccesspoint"
+"meshapi_historicalsector"
+"meshapi_historicaldevice"
+"meshapi_historicalbuilding_nodes"
+"meshapi_historicalnode"
+"meshapi_historicalinstall"
+"meshapi_historicalbuilding"
+"meshapi_historicalmember"
+)
 set -ex
 
 # Make sure our files exist.

src/meshapi/admin/models/access_point.py

@@ -4,7 +4,8 @@
 from django.contrib.postgres.search import SearchVector
 from django.forms import Field, ModelForm
 from django.http import HttpRequest
-from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from import_export.admin import ExportActionMixin, ImportExportMixin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import AccessPoint
 from meshapi.widgets import AutoPopulateLocationWidget, DeviceIPAddressWidget, ExternalHyperlinkWidget
@@ -32,7 +33,7 @@ class Meta:
 
 
 @admin.register(AccessPoint)
-class AccessPointAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class AccessPointAdmin(RankedSearchMixin, ImportExportMixin, ExportActionMixin, SimpleHistoryAdmin):
     form = AccessPointAdminForm
     search_fields = ["name__icontains", "@notes"]
     search_vector = SearchVector("name", weight="A") + SearchVector("notes", weight="D")

src/meshapi/admin/models/building.py

@@ -7,7 +7,8 @@
 from django.db.models import QuerySet
 from django.forms import ModelForm
 from django.http import HttpRequest
-from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from import_export.admin import ExportActionMixin, ImportExportMixin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import Building
 from meshapi.widgets import AutoPopulateLocationWidget, PanoramaViewer
@@ -60,7 +61,7 @@ class Meta:
 
 
 @admin.register(Building)
-class BuildingAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class BuildingAdmin(RankedSearchMixin, ImportExportMixin, ExportActionMixin, SimpleHistoryAdmin):
     form = BuildingAdminForm
     list_display = ["__str__", "street_address", "primary_node"]
     search_fields = [

src/meshapi/admin/models/device.py

@@ -5,7 +5,8 @@
 from django.contrib.postgres.search import SearchVector
 from django.db.models import QuerySet
 from django.http import HttpRequest
-from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from import_export.admin import ExportActionMixin, ImportExportMixin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import Device
 from meshapi.widgets import ExternalHyperlinkWidget
@@ -30,7 +31,7 @@ class Meta:
 
 
 @admin.register(Device)
-class DeviceAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class DeviceAdmin(RankedSearchMixin, ImportExportMixin, ExportActionMixin, SimpleHistoryAdmin):
     form = DeviceAdminForm
     search_fields = ["name__icontains", "@notes"]
     search_vector = SearchVector("name", weight="A") + SearchVector("notes", weight="D")

src/meshapi/admin/models/install.py

@@ -8,7 +8,8 @@
 from django.db.models import QuerySet
 from django.http import HttpRequest
 from import_export import resources
-from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from import_export.admin import ExportActionMixin, ImportExportMixin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import Install
 from meshapi.widgets import ExternalHyperlinkWidget
@@ -43,7 +44,7 @@ class Meta:
 
 
 @admin.register(Install)
-class InstallAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class InstallAdmin(RankedSearchMixin, ImportExportMixin, ExportActionMixin, SimpleHistoryAdmin):
     form = InstallAdminForm
     resource_classes = [InstallImportExportResource]
     list_filter = [

src/meshapi/admin/models/link.py

@@ -1,7 +1,8 @@
 from django import forms
 from django.contrib import admin
 from django.contrib.postgres.search import SearchVector
-from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from import_export.admin import ExportActionMixin, ImportExportMixin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import Link
 
@@ -18,7 +19,7 @@ class Meta:
 
 
 @admin.register(Link)
-class LinkAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class LinkAdmin(RankedSearchMixin, ImportExportMixin, ExportActionMixin, SimpleHistoryAdmin):
     form = LinkAdminForm
     search_fields = [
         "from_device__node__name__icontains",

src/meshapi/admin/models/los.py

@@ -6,7 +6,8 @@
 from django.contrib.postgres.search import SearchVector
 from django.forms import ModelForm
 from django.http import HttpRequest
-from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from import_export.admin import ExportActionMixin, ImportExportMixin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import LOS
 
@@ -20,7 +21,7 @@ class Meta:
 
 
 @admin.register(LOS)
-class LOSAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class LOSAdmin(RankedSearchMixin, ImportExportMixin, ExportActionMixin, SimpleHistoryAdmin):
     form = LOSAdminForm
     search_fields = [
         "from_building__nodes__network_number__iexact",

src/meshapi/admin/models/member.py

@@ -1,7 +1,8 @@
 from django import forms
 from django.contrib import admin
 from django.contrib.postgres.search import SearchVector
-from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from import_export.admin import ExportActionMixin, ImportExportMixin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import Member
 
@@ -22,7 +23,7 @@ class Meta:
 
 
 @admin.register(Member)
-class MemberAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class MemberAdmin(RankedSearchMixin, ImportExportMixin, ExportActionMixin, SimpleHistoryAdmin):
     form = MemberAdminForm
     search_fields = [
         # Search by name

src/meshapi/admin/models/node.py

@@ -9,6 +9,7 @@
 from django.http import HttpRequest
 from import_export import resources
 from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import Building, Node
 from meshapi.widgets import AutoPopulateLocationWidget
@@ -49,7 +50,7 @@ class Meta:
 
 
 @admin.register(Node)
-class NodeAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class NodeAdmin(RankedSearchMixin, ExportActionMixin, ImportExportModelAdmin, SimpleHistoryAdmin):
     form = NodeAdminForm
     resource_classes = [NodeImportExportResource]
     search_fields = [

src/meshapi/admin/models/sector.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.contrib.postgres.search import SearchVector
-from import_export.admin import ExportActionMixin, ImportExportModelAdmin
+from import_export.admin import ExportActionMixin, ImportExportMixin
+from simple_history.admin import SimpleHistoryAdmin
 
 from meshapi.models import Sector
 from meshapi.widgets import ExternalHyperlinkWidget
@@ -22,7 +23,7 @@ class Meta:
 
 
 @admin.register(Sector)
-class SectorAdmin(RankedSearchMixin, ImportExportModelAdmin, ExportActionMixin):
+class SectorAdmin(RankedSearchMixin, ImportExportMixin, ExportActionMixin, SimpleHistoryAdmin):
     form = SectorAdminForm
     search_fields = ["name__icontains", "@notes"]
     search_vector = SearchVector("name", weight="A") + SearchVector("notes", weight="D")

src/meshapi/management/commands/create_groups.py

@@ -35,7 +35,8 @@ def create_base_groups(self) -> None:
 
         for p in all_permissions:
             code = p.codename
-            act, obj = code.split("_")
+
+            act, obj = code.split("_", maxsplit=1)
 
             # read_only
             if act == "view" and obj in models:

src/meshapi/migrations/0031_alter_install_ticket_number.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.13 on 2024-09-19 03:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("meshapi", "0030_merge_20240916_1938"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="install",
+            name="ticket_number",
+            field=models.CharField(
+                blank=True,
+                help_text="The ticket number of the OSTicket used to track communications with the member about this install. Note that although this appears to be an integer, it is not. Leading zeros are important, so this should be stored as a string at all times",
+                null=True,
+            ),
+        ),
+    ]