Add operating system details to instance state #1234

gibmat · 2024-09-20T18:11:47Z

This adds operating system details to an instance's state. incus-agent has been extended to populate this information when running within a VM.

$ incus info debian
Name: debian
Status: RUNNING
Type: virtual-machine
Architecture: x86_64
PID: 658181
Created: 2024/09/13 16:13 MDT
Last Used: 2024/09/20 11:59 MDT
Started: 2024/09/20 11:59 MDT

Operating System:
  OS: Debian GNU/Linux
  OS Version: 12 (bookworm)
  Kernel Version: 6.1.0-25-amd64
  Hostname: debian
  FQDN: debian.testing.local

Resources:
  Processes: 16
[snip]

stgraber · 2024-09-21T09:31:07Z

Looks like this will need a rebase to fix the i18n conflicts.

The first commit should be split up a bit into:

api: instances_state_os_info
shared/api: Add OSInfo to InstanceState
doc/rest-api: Refresh swagger YAML

I also think it may be cleaner to make OSInfo a pointer rather than an attached struct.
With it being a pointer, the CLI can then just do a OSInfo != nil and then print all the fields (showing them empty if we don't have them). This will save the per-field checks and will provide more consistent output when the agent is running.

shared/api/instance_state.go

stgraber · 2024-09-24T03:24:02Z

Looks good, just one little bit of code to move between commits and we'll be good to go!

Signed-off-by: Mathias Gibbens <mathias.gibbens@futurfusion.io>

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [lxc/incus](https://github.com/lxc/incus) | minor | `v6.5.0` -> `v6.6.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>lxc/incus (lxc/incus)</summary> ### [`v6.6.0`](https://github.com/lxc/incus/releases/tag/v6.6.0): Incus 6.6 [Compare Source](lxc/incus@v6.5.0...v6.6.0) ### Announcement https://discuss.linuxcontainers.org/t/incus-6-6-has-been-released/21762 #### What's Changed - Fix capitalization in `incus network list` by [@stgraber](https://github.com/stgraber) in lxc/incus#1191 - incusd/storage/drivers/lvm: Cache VG extent size by [@stgraber](https://github.com/stgraber) in lxc/incus#1192 - incusd/network/ovn: LSP dynamic allocation can't be done per protocol by [@stgraber](https://github.com/stgraber) in lxc/incus#1195 - incusd/instance/qemu: Always re-generate the nvram symlink by [@stgraber](https://github.com/stgraber) in lxc/incus#1193 - incusd/instance/qemu: Set O_DIRECT when passing in FDs by [@stgraber](https://github.com/stgraber) in lxc/incus#1196 - Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in lxc/incus#1194 - incusd/apparmor: Only initialize with the daemon by [@stgraber](https://github.com/stgraber) in lxc/incus#1197 - Various fixes by [@stgraber](https://github.com/stgraber) in lxc/incus#1198 - doc: Fix limits.memory default value unit by [@kznrluk](https://github.com/kznrluk) in lxc/incus#1199 - incusd/storage/zfs: Make sure the zvol is a block device by [@stgraber](https://github.com/stgraber) in lxc/incus#1204 - incusd/apparmor: Don't attempt unloading profiles when apparmor is di… by [@stgraber](https://github.com/stgraber) in lxc/incus#1206 - Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in lxc/incus#1208 - Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in lxc/incus#1212 - doc/installing: Add Rocky Linux 9 by [@sspencerwire](https://github.com/sspencerwire) in lxc/incus#1213 - Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in lxc/incus#1219 - Fix storage volume snapshot listings by [@stgraber](https://github.com/stgraber) in lxc/incus#1218 - internal/server/instance/drivers: Disable 9p and vsock for Windows VMs by [@gibmat](https://github.com/gibmat) in lxc/incus#1217 - Add qcow2 and vmdk support to incus-migrate by [@gibmat](https://github.com/gibmat) in lxc/incus#1214 - scripts: fix empty-incus.sh instances delete by [@itviewer](https://github.com/itviewer) in lxc/incus#1222 - doc/installing: Add link to Arch Wiki for Incus by [@simos](https://github.com/simos) in lxc/incus#1227 - Properly handle `--project` in CLI error messages by [@bensmrs](https://github.com/bensmrs) in lxc/incus#1230 - Allow VMs to pull console history similar to containers by [@gibmat](https://github.com/gibmat) in lxc/incus#1228 - incus/console: Add completion by [@stgraber](https://github.com/stgraber) in lxc/incus#1231 - Various bugfixes by [@stgraber](https://github.com/stgraber) in lxc/incus#1236 - Don't return an error if console log file doesn't exist by [@gibmat](https://github.com/gibmat) in lxc/incus#1241 - incusd/instance/qemu: Properly plumb I/O limits by [@stgraber](https://github.com/stgraber) in lxc/incus#1242 - cleanup: Replace use of os.IsNotExist(err) with errors.Is(err, fs.ErrNotExist) by [@gibmat](https://github.com/gibmat) in lxc/incus#1245 - Allow to use `dns.search` when only IPv4 is enabled by [@pmoranga](https://github.com/pmoranga) in lxc/incus#1244 - apparmor: Allow all mounts in unprivileged containers by [@stgraber](https://github.com/stgraber) in lxc/incus#1243 - doc: add note for Nvidia usage when building from source in OpenSUSE by [@javiertoledos](https://github.com/javiertoledos) in lxc/incus#1232 - Add operating system details to instance state by [@gibmat](https://github.com/gibmat) in lxc/incus#1234 - Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in lxc/incus#1247 - tests: Don't over-provision test volumes by [@stgraber](https://github.com/stgraber) in lxc/incus#1246 - cmd/incus-migrate: Don't copy converted VM image by [@gibmat](https://github.com/gibmat) in lxc/incus#1248 - doc: add prerequisites section for building documentation by [@javiertoledos](https://github.com/javiertoledos) in lxc/incus#1233 - Fix cross-cluster image transfer by [@stgraber](https://github.com/stgraber) in lxc/incus#1249 - Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in lxc/incus#1250 - Add OVN load balancer state API by [@stgraber](https://github.com/stgraber) in lxc/incus#1251 - Add missing placement scriptlet calls by [@stgraber](https://github.com/stgraber) in lxc/incus#1254 - VM console log fixes by [@gibmat](https://github.com/gibmat) in lxc/incus#1255 - Fix alias handling by [@stgraber](https://github.com/stgraber) in lxc/incus#1256 - incusd/instance/qemu: Fix issues with old NVRAM by [@stgraber](https://github.com/stgraber) in lxc/incus#1257 - Added ability for user to specify the macvlan mode using the mode key… by [@farsonic](https://github.com/farsonic) in lxc/incus#1258 - Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in lxc/incus#1269 - Allows the VM's limits.memory configuration to be set to a percentage value by [@itviewer](https://github.com/itviewer) in lxc/incus#1270 - incusd/network/ovn: Fix CIDR size check by [@stgraber](https://github.com/stgraber) in lxc/incus#1271 - incusd/instance/lxc: Mount /run if the path exists by [@stgraber](https://github.com/stgraber) in lxc/incus#1275 - Run cluster evacuate and restore in parallel by [@gibmat](https://github.com/gibmat) in lxc/incus#1262 - Documentation fixes by [@stgraber](https://github.com/stgraber) in lxc/incus#1276 - client: Capture original OCI image identifier by [@stgraber](https://github.com/stgraber) in lxc/incus#1277 - docs: mention alpine edge repository in alpine installation by [@thebigbone](https://github.com/thebigbone) in lxc/incus#1260 - Change incus file delete operation to sftp by [@HassanAlsamahi](https://github.com/HassanAlsamahi) in lxc/incus#1266 - Translations update from Hosted Weblate by [@weblate](https://github.com/weblate) in lxc/incus#1279 - Allow fully creating LVM cluster pools through the API by [@gibmat](https://github.com/gibmat) in lxc/incus#1278 - Allow adding external interfaces to an OVN network by [@SpiffyEight77](https://github.com/SpiffyEight77) in lxc/incus#1263 - Fix VM race conditions by [@stgraber](https://github.com/stgraber) in lxc/incus#1280 - Various bugfixes by [@stgraber](https://github.com/stgraber) in lxc/incus#1283 #### New Contributors - [@kznrluk](https://github.com/kznrluk) made their first contribution in lxc/incus#1199 - [@sspencerwire](https://github.com/sspencerwire) made their first contribution in lxc/incus#1213 - [@gibmat](https://github.com/gibmat) made their first contribution in lxc/incus#1217 - [@itviewer](https://github.com/itviewer) made their first contribution in lxc/incus#1222 - [@pmoranga](https://github.com/pmoranga) made their first contribution in lxc/incus#1244 - [@javiertoledos](https://github.com/javiertoledos) made their first contribution in lxc/incus#1232 - [@farsonic](https://github.com/farsonic) made their first contribution in lxc/incus#1258 - [@thebigbone](https://github.com/thebigbone) made their first contribution in lxc/incus#1260 **Full Changelog**: lxc/incus@v6.5.0...v6.6.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

gibmat requested a review from stgraber as a code owner September 20, 2024 18:11

github-actions bot added Documentation Documentation needs updating API Changes to the REST API labels Sep 20, 2024

gibmat force-pushed the add-os-info-to-instance-state branch 2 times, most recently from 6223d2a to a988fbf Compare September 23, 2024 15:51

stgraber reviewed Sep 24, 2024

View reviewed changes

shared/api/instance_state.go Show resolved Hide resolved

gibmat added 6 commits September 24, 2024 08:05

api: instances_state_os_info

145ed6d

Signed-off-by: Mathias Gibbens <mathias.gibbens@futurfusion.io>

shared/api: Add OSInfo to InstanceState

8ef3cbc

Signed-off-by: Mathias Gibbens <mathias.gibbens@futurfusion.io>

doc/rest-api: Refresh swagger YAML

3cf769c

Signed-off-by: Mathias Gibbens <mathias.gibbens@futurfusion.io>

cmd/incus-agent: Populate OS information when returning instance state

f6b5daf

Signed-off-by: Mathias Gibbens <mathias.gibbens@futurfusion.io>

cmd/incus: Print OS info from state, if available

4edfc35

Signed-off-by: Mathias Gibbens <mathias.gibbens@futurfusion.io>

i18n: Update translation templates

977fd74

Signed-off-by: Mathias Gibbens <mathias.gibbens@futurfusion.io>

gibmat force-pushed the add-os-info-to-instance-state branch from a988fbf to 977fd74 Compare September 24, 2024 14:11

stgraber merged commit e066350 into lxc:main Sep 24, 2024
26 of 30 checks passed

gibmat deleted the add-os-info-to-instance-state branch September 24, 2024 17:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add operating system details to instance state #1234

Add operating system details to instance state #1234

gibmat commented Sep 20, 2024

stgraber commented Sep 21, 2024

stgraber commented Sep 24, 2024

Add operating system details to instance state #1234

Add operating system details to instance state #1234

Conversation

gibmat commented Sep 20, 2024

stgraber commented Sep 21, 2024

stgraber commented Sep 24, 2024