Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

netbox: 3.7.8 -> 4.1.3 #331750

Merged
merged 11 commits into from
Oct 25, 2024
Merged

netbox: 3.7.8 -> 4.1.3 #331750

merged 11 commits into from
Oct 25, 2024

Conversation

minijackson
Copy link
Member

@minijackson minijackson commented Aug 2, 2024 •
edited
Loading

Description of changes

Finally!

Some upgrades and new Python packages were needed by the NetBox upgrade.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
    • NixOS tests: netbox and netbox-upgrade
    • made sure NixOS tests are linked to the relevant packages
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

cc NetBox maintainers: @RaitoBezarius & @n0emis
django-mptt maintainer: @mweinelt
and people interested in the upgrade: @KiruyaMomochi & @xanderio & @Xyz00777

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 2, 2024
This was referenced Aug 2, 2024
Closed
Closed
Merged
Merged
Open
Merged
@xanderio
Copy link
Contributor

xanderio commented Aug 2, 2024

Result of nixpkgs-review pr 331750 run on x86_64-linux 1

1 package blacklisted:
  • nixos-install-tools
5 packages failed to build:
  • netbox
  • python311Packages.netbox-reorder-rack
  • python311Packages.netbox-reorder-rack.dist
  • python312Packages.netbox-reorder-rack
  • python312Packages.netbox-reorder-rack.dist
16 packages built:
  • python311Packages.django-choices-field
  • python311Packages.django-choices-field.dist
  • python311Packages.django-htmx
  • python311Packages.django-htmx.dist
  • python311Packages.django-mptt
  • python311Packages.django-mptt.dist
  • python311Packages.strawberry-django
  • python311Packages.strawberry-django.dist
  • python312Packages.django-choices-field
  • python312Packages.django-choices-field.dist
  • python312Packages.django-htmx
  • python312Packages.django-htmx.dist
  • python312Packages.django-mptt
  • python312Packages.django-mptt.dist
  • python312Packages.strawberry-django
  • python312Packages.strawberry-django.dist

@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Aug 2, 2024
@ofborg ofborg bot requested review from n0emis, mweinelt and RaitoBezarius August 2, 2024 12:31
@minijackson
Copy link
Member Author

@xanderio your nixpkgs-review might have failed because this PR depends on the djangorestframework PR. While testing my changes, I had those djangorestframework changes in my local tree.

@minijackson minijackson added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Aug 2, 2024
@xanderio
Copy link
Contributor

xanderio commented Aug 2, 2024

That explains it nixpkgs-review only applied this PR.

@minijackson minijackson force-pushed the netbox_4 branch 2 times, most recently from 41d5642 to eab9adc Compare August 27, 2024 08:24
@minijackson minijackson marked this pull request as ready for review August 27, 2024 08:45
@minijackson minijackson requested a review from natsukium as a code owner August 27, 2024 08:45
@minijackson
Copy link
Member Author

Dependent PR was merged, so this is now ready for review!

Both the netbox_4_0 and the netbox-upgrade passes.

Result of nixpkgs-review run on x86_64-linux 1

1 package blacklisted:
  • nixos-install-tools
22 packages built:
  • disko
  • netbox
  • python311Packages.django-choices-field
  • python311Packages.django-choices-field.dist
  • python311Packages.django-htmx
  • python311Packages.django-htmx.dist
  • python311Packages.django-mptt
  • python311Packages.django-mptt.dist
  • python311Packages.netbox-reorder-rack
  • python311Packages.netbox-reorder-rack.dist
  • python311Packages.strawberry-django
  • python311Packages.strawberry-django.dist
  • python312Packages.django-choices-field
  • python312Packages.django-choices-field.dist
  • python312Packages.django-htmx
  • python312Packages.django-htmx.dist
  • python312Packages.django-mptt
  • python312Packages.django-mptt.dist
  • python312Packages.netbox-reorder-rack
  • python312Packages.netbox-reorder-rack.dist
  • python312Packages.strawberry-django
  • python312Packages.strawberry-django.dist

@xanderio
Copy link
Contributor

Happy to report the nixpkgs-review is happy again :D

Result of nixpkgs-review pr 331750 run on x86_64-linux 1

1 package blacklisted:
  • nixos-install-tools
22 packages built:
  • disko
  • netbox
  • python311Packages.django-choices-field
  • python311Packages.django-choices-field.dist
  • python311Packages.django-htmx
  • python311Packages.django-htmx.dist
  • python311Packages.django-mptt
  • python311Packages.django-mptt.dist
  • python311Packages.netbox-reorder-rack
  • python311Packages.netbox-reorder-rack.dist
  • python311Packages.strawberry-django
  • python311Packages.strawberry-django.dist
  • python312Packages.django-choices-field
  • python312Packages.django-choices-field.dist
  • python312Packages.django-htmx
  • python312Packages.django-htmx.dist
  • python312Packages.django-mptt
  • python312Packages.django-mptt.dist
  • python312Packages.netbox-reorder-rack
  • python312Packages.netbox-reorder-rack.dist
  • python312Packages.strawberry-django
  • python312Packages.strawberry-django.dist

@minijackson
python3Packages.django-choices-field: init at 2.3.0
e814754
@minijackson
python3Packages.strawberry-django: init at 0.47.1
4b9f89c
@minijackson
python3Packages.django-mptt: 0.13.4 -> 0.16
bfcf52b 
This fixes an issue with Django 5

pytest checks were removed due to a dependency on model_mommy,
which is deprecated.
@minijackson
python3Packages.django-htmx: init at 1.19.0
bda93d1
@minijackson
python3Packages.django-polymorphic: Django >= 5.1.0
e9cb4bd
@minijackson
netbox_4_0: init at 4.0.11
9781553 
Migrate to pkgs/by-name,
and update the test so that it passes for all versions

This version is added as EOL, since NetBox 4.1 is out,
but it might be still useful in case of an upgrade issue.
@minijackson
netbox_4_1: init at 4.1.3
c0e16eb
@minijackson
netbox: switch to netbox_4_1, mark netbox_3_7 as EOL
69610ea 
also switch the netbox-upgrade test to check upgrade from 3.7 -> 4.1
@minijackson
netbox_3_6: remove
d09eb59
@minijackson
nixos/netbox: increase timeout for NetBox pre-start script
4409a8d 
since the script does database migrations and index,
it could timeout on slower system with a big enough database
@minijackson
python3Packages.netbox-reorder-rack: 1.0.0 -> 1.1.2
5bf6575 
needed by the NetBox 4.0+ upgrade
@minijackson
Copy link
Member Author

Merging, as this is the last day breaking changes are allowed. If this causes issues (hopefully not), I'll open follow-up PRs.

@minijackson minijackson merged commit 0433962 into NixOS:master Oct 25, 2024
28 of 29 checks passed
@minijackson minijackson deleted the netbox_4 branch October 25, 2024 09:09
@felbinger
Copy link
Member

felbinger commented Nov 4, 2024 •
edited
Loading

@minijackson My netbox instance is partly broken now ;( It might be related to something in my setup...
Did you test if you can set a something (e.g. role, platform, site) on an object like a device or vm?
image
image
It does still work in the demo instance.

@minijackson
Copy link
Member Author

@felbinger I can reproduce the issue on an instance upgraded from 3.7, but not on a fresh 4.1 instance. Not sure where this comes from yet.

I think the demo instance is recreated from scratch on each upgrade, so this doesn't tell us if the issue is from the packaging or on the NetBox side, unfortunately.

@minijackson
Copy link
Member Author

minijackson commented Nov 4, 2024 •
edited
Loading

@felbinger Okay, I think I found the issue, and I'll open a fix tomorrow. In the meantime you can run:

rm -rf /var/lib/netbox/static
netbox-manage collectstatic

and hard refresh / clear the cache of the page in your browser.

@SuperSandro2000
Copy link
Member

We probably want to save the version of netbox somewhere in /var/lib/netbox a d when that changes invalidate the static cache.

Or can we use a cheap symlink?

@felbinger
Copy link
Member

@felbinger Okay, I think I found the issue, and I'll open a fix tomorrow. In the meantime you can run:

rm -rf /var/lib/netbox/static
netbox-manage collectstatic

and hard refresh / clear the cache of the page in your browser.

thanks a lot, it's working!

@SuperSandro2000
Copy link
Member

or maybe we can build it at runtime like paperless-ngx does

nixpkgs/pkgs/applications/office/paperless-ngx/default.nix

Line 217 in 7e44cf1

${python.pythonOnBuildForHost.interpreter} src/manage.py collectstatic --clear --no-input
?

@minijackson
Copy link
Member Author

minijackson commented Nov 6, 2024 •
edited
Loading

We probably want to save the version of netbox somewhere in /var/lib/netbox a d when that changes invalidate the static cache.

We're actually already doing that here:

nixpkgs/nixos/modules/services/web-apps/netbox.nix

Lines 301 to 303 in 71408df

if [[ -e "$versionFile" && "$(cat "$versionFile")" == "${cfg.package.version}" ]]; then
exit 0
fi

The issue was that old files were not cleared, and it seems upstream's upgrade.sh script doesn't do it either: https://github.com/netbox-community/netbox/blob/58bc3884578a98595b02d7d7412c83d41fc7bbfa/upgrade.sh#L100-L101

Or can we use a cheap symlink?

That's a great suggestion, I was thinking of putting the hash in order for the upgrade script to be run when plugins are added, but the symlink is probably even simpler. Thanks!

or maybe we can build it at runtime like paperless-ngx does

I'm not completely sure of the advantages / drawbacks of doing that, but I actually didn't know of the --clear option, which is exactly what I was looking for for a quick fix!

@minijackson minijackson mentioned this pull request Nov 6, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mastermindaxe Mastermindaxe Mastermindaxe left review comments

@natsukium natsukium natsukium left review comments

@AkechiShiro AkechiShiro AkechiShiro left review comments

@dasJ dasJ dasJ approved these changes

@n0emis n0emis Awaiting requested review from n0emis

@mweinelt mweinelt Awaiting requested review from mweinelt

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@Conni2461 Conni2461 Awaiting requested review from Conni2461

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: changelog 8.has: clean-up 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@minijackson @xanderio @dasJ @mweinelt @AkechiShiro @Mastermindaxe @felbinger @SuperSandro2000 @natsukium