Merge ~mitchburton/ubuntu/+source/landscape-client:ubuntu/noble-devel into ubuntu/+source/landscape-client:ubuntu/noble-devel

[Mitch Burton]

release landscape-client 24.02 for noble

This change imports the latest release of landscape-client, 24.02 and releases it for noble.

A build of this release can be found in this PPA: https://launchpad.net/~mitchburton/+archive/ubuntu/landscape-client-uploads

[Andreas Hasenack (ahasenack)]

Grabbing a review slot

[Andreas Hasenack (ahasenack)]

Please use ubuntu/devel as the MP target in the future, for devel releases. Right now it won't matter, but it's customary to use ubuntu/devel in these cases, and <release-name>/devel for SRUs.

[Andreas Hasenack (ahasenack)]

I downloaded the landscape-client tarball via uscan, which uses the debian/watch file:

$ uscan --download-current-version
Newest version of landscape-client on remote site is 24.02, specified download version is 24.02
Successfully symlinked ../landscape-client-24.02.tar.gz to ../landscape-client_24.02.orig.tar.gz.

This tarball however does not match the contents of the branch here:

$ dpkg-buildpackage -S -I -i -nc -d
dpkg-buildpackage: info: source package landscape-client
dpkg-buildpackage: info: source version 24.02-0ubuntu0
dpkg-buildpackage: info: source distribution noble
dpkg-buildpackage: info: source changed by Mitch Burton <email address hidden>
 dpkg-source -I -i --before-build .
dpkg-buildpackage: warning: building a source package without cleaning up as you asked; it might contain undesired files
 dpkg-source -I -i -b .
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building landscape-client using existing ./landscape-client_24.02.orig.tar.gz
dpkg-source: error: cannot represent change to snap-http/tests/integration/test_snap/snap/hooks/default-configure:
dpkg-source: error: new version is symlink to configure
dpkg-source: error: old version is nonexistent
dpkg-source: warning: newly created empty file 'snap-http/tests/__init__.py' will not be represented in diff
dpkg-source: warning: newly created empty file 'snap-http/tests/integration/__init__.py' will not be represented in diff
dpkg-source: warning: newly created empty file 'snap-http/tests/integration/test_snap/test_snap/__init__.py' will not be represented in diff
dpkg-source: warning: newly created empty file 'snap-http/tests/unit/__init__.py' will not be represented in diff
dpkg-source: error: unrepresentable changes to source
dpkg-buildpackage: error: dpkg-source -I -i -b . subprocess returned exit status 1

Indeed, there are differences:
$ diff -uNr landscape-client-24.02/ landscape-client/ --exclude debian --exclude .git|diffstat
diff: landscape-client-24.02/landscape/client/snap_http: No such file or directory
 .github/workflows/daily.yml | 11
 .github/workflows/integration-test.yml | 34 +
 .github/workflows/test.yml | 46 ++
 .gitignore | 15
 CHANGELOG.md | 17
 LICENSE | 339 +++++++++++++++++++
 Makefile | 6
 README.md | 50 ++
 poetry.lock | 411 ++++++++++++++++++++++++
 pyproject.toml | 40 ++
 snap_http/__init__.py | 53 +++
 snap_http/api.py | 443 +++++++++++++++++++++++++
 snap_http/http.py | 111 ++++++
 snap_http/types.py | 164 +++++++++
 tests/integration/conftest.py | 61 +++
 tests/integration/test_api.py ...

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

I remember you mentioning the snap work, and that a lot of it does not "make sense" for debs. But the source tarball that you, upstream, release, must match what is used by the deb to build the package. So you either make separate releases (snap-only, and everything else), or include the snap bits in the tarball used by the deb source package, or something else.

[Andreas Hasenack (ahasenack)]

Ah, disregard the test errors from above. That was another version I was building by mistake.

[Mitch Burton (mitchburton)]

The uscan difference is because the watch file is pointing at the tags page in Github and not the releases page. We've moved to using the latter for release artifacts. I will correct shortly.

58a9f27... by Mitch Burton on 2024-02-28

d/watch: use github releases tarball instead of tag tarball

[Mitch Burton (mitchburton)]

$ uscan --download-current-version
Newest version of landscape-client on remote site is 24.02, specified download version is 24.02
Leaving ../landscape-client_24.02.orig.tar.gz where it is.

$ diff -uNr landscape-client-24.02/ landscape-client/ --exclude debian --exclude .git|diffstat
 0 files changed

[Mitch Burton (mitchburton)]

changed version to -0ubuntu1 and fixed changelog indentation

[Andreas Hasenack (ahasenack)]

Inline question about expandvars().

review: Needs Information

[Andreas Hasenack (ahasenack)]

--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,98 +1,116 @@
 name: landscape-client
 base: core22
-version: '0.1'
+version: '23.08'

Does this version need to be 24.02?

[Mitch Burton (mitchburton)]

> --- a/snap/snapcraft.yaml
> +++ b/snap/snapcraft.yaml
> @@ -1,98 +1,116 @@
> name: landscape-client
> base: core22
> -version: '0.1'
> +version: '23.08'
>
> Does this version need to be 24.02?
Yes, this should be updated. It only affects the snap so I don't think it's impactful for the deb upload. Should I patch it here, anyways?

[Andreas Hasenack (ahasenack)]

> > --- a/snap/snapcraft.yaml
> > +++ b/snap/snapcraft.yaml
> > @@ -1,98 +1,116 @@
> > name: landscape-client
> > base: core22
> > -version: '0.1'
> > +version: '23.08'
> >
> > Does this version need to be 24.02?
> Yes, this should be updated. It only affects the snap so I don't think it's
> impactful for the deb upload. Should I patch it here, anyways?

If it's a no-op for the deb, then no need.

[Mitch Burton (mitchburton)]

inline response for expandvars

[Andreas Hasenack (ahasenack)]

d/changelog:

This new upstream version is adding snap-http/, which has its own LICENSE file. It is the same license as landscape-client itself (debian/copyright), so that's ok. SRU reviewers might want an explicit update to d/copyright about it, though. I'm unsure.

The new snap-http code should be called out in d/changelog, together with other debian/* changes:
- the build-dependency changes (python3-dbus)
- the runtime dependency changes (lsb-base dropped, python3-setuptools added, python3-dbus added)
- dropped patches
- d/watch update

The amount of detail you want in d/changelog about the *upstream* changes is up to you. You should definitely highlight important changes in upstream code. But packaging changes, in general, we like to have described. This will receive much more scrutiny in an SRU. In fact, it's grounds for a rejection if a packaging change (anything in debian/*) is not described in the changelog.

[Mitch Burton (mitchburton)]

I've updated the changelog to call out the specific changes to d/control, d/watch, and the addition of snap-http. Hopefully I've added enough detail in there.

Thanks for the additional feedback on how this might look for SRU review.

[Andreas Hasenack (ahasenack)]

+1. And let's get #2055348 closed soon.

review: Approve

[Andreas Hasenack (ahasenack)]

Sponsored:
Uploading landscape-client_24.02-0ubuntu1.dsc
Uploading landscape-client_24.02.orig.tar.gz
Uploading landscape-client_24.02-0ubuntu1.debian.tar.xz
Uploading landscape-client_24.02-0ubuntu1_source.buildinfo
Uploading landscape-client_24.02-0ubuntu1_source.changes

[Andreas Hasenack (ahasenack)]

This migrated already, closing MP.

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54fd142..38efb55 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,34 +1,26 @@
 name: ci
 on: [pull_request, workflow_dispatch]
 jobs:
-  check3:
+  check:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: ["ubuntu-22.04", "ubuntu-20.04"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
       - run: |
           make depends
           # -common seems a catch-22, but this is just a shortcut to
           # initialize user and dirs, some used through tests.
           sudo apt-get -y install landscape-common
-      - run: make check3 TRIAL=/usr/bin/trial3
+      - run: make check TRIAL=/usr/bin/trial3
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
       - run: make depends
       - run: make lint
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: |
-          make depends
-          # -common seems a catch-22, but this is just a shortcut to
-          # initialize user and dirs, some used through tests.
-          sudo apt-get -y install landscape-common
-      - run: make coverage TRIAL=/usr/bin/trial3
-      - name: upload
-        uses: codecov/codecov-action@v1
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
new file mode 100644
index 0000000..74ec228
--- /dev/null
+++ b/.github/workflows/codecov.yml
@@ -0,0 +1,19 @@
+name: Codecov upload
+
+on: [push, pull_request]
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - run: |
+          make depends
+          # -common seems a catch-22, but this is just a shortcut to
+          # initialize user and dirs, some used through tests.
+          sudo apt-get -y install landscape-common
+      - run: make coverage TRIAL=/usr/bin/trial3
+      - name: upload
+        uses: codecov/codecov-action@v3
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ab50d1c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "snap-http"]
+	path = snap-http
+	url = https://github.com/Perfect5th/snap-http
diff --git a/Makefile b/Makefile
index 09ade0e..9626920 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 PYDOCTOR ?= pydoctor
 TXT2MAN ?= txt2man
-PYTHON2 ?= python2
-PYTHON3 ?= python3
+PYTHON ?= python3
 SNAPCRAFT = SNAPCRAFT_BUILD_INFO=1 snapcraft
 TRIAL ?= -m twisted.trial
 TRIAL_ARGS ?=
+PRE_COMMIT ?= $(HOME)/.local/bin/pre-commit
 
 # PEP8 rules ignored:
 # W503 https://www.flake8rules.com/rules/W503.html
@@ -16,57 +16,35 @@ help:  ## Print help about available targets
 	@grep -h -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: depends
-depends: depends3  ## py2 is deprecated
-	sudo apt-get -y install python3-flake8 python3-coverage
-
-.PHONY: depends2
-depends2:
-	sudo apt-get -y install python-twisted-core python-distutils-extra python-mock python-configobj python-netifaces python-pycurl python-pip
+depends:
+	sudo apt-get -y install python3-configobj python3-coverage python3-distutils-extra\
+		python3-flake8 python3-mock python3-netifaces python3-pip python3-pycurl python3-twisted\
+		net-tools
 	pip install pre-commit
-	pre-commit install
-
-.PHONY: depends3
-depends3:
-	sudo apt-get -y install python3-twisted python3-distutils-extra python3-mock python3-configobj python3-netifaces python3-pycurl python3-pip
-	pip3 install pre-commit
-	pre-commit install
+	$(PRE_COMMIT) install
 
 all: build
 
 .PHONY: build
-build: build2 build3   ## Build.
-
-.PHONY: build2
-build2:
-	$(PYTHON2) setup.py build_ext -i
-
-.PHONY: build3
-build3:
-	$(PYTHON3) setup.py build_ext -i
-
-.PHONY: check
-check: check2 check3  ## Run all the tests.
-
-.PHONY: check2
-check2: build2
-	PYTHONPATH=$(PYTHONPATH):$(CURDIR) LC_ALL=C $(PYTHON2) $(TRIAL) --unclean-warnings $(TRIAL_ARGS) landscape
+build:
+	$(PYTHON) setup.py build_ext -i
 
 # trial3 does not support threading via `-j` at the moment
 # so we ignore TRIAL_ARGS.
 # TODO: Respect $TRIAL_ARGS once trial3 is fixed.
-.PHONY: check3
-check3: TRIAL_ARGS=
-check3: build3
-	PYTHONPATH=$(PYTHONPATH):$(CURDIR) LC_ALL=C $(PYTHON3) $(TRIAL) --unclean-warnings $(TRIAL_ARGS) landscape
+.PHONY: check
+check: TRIAL_ARGS=
+check: build
+	PYTHONPATH=$(PYTHONPATH):$(CURDIR) LC_ALL=C $(PYTHON) $(TRIAL) --unclean-warnings $(TRIAL_ARGS) landscape
 
 .PHONY: coverage
 coverage:
-	PYTHONPATH=$(PYTHONPATH):$(CURDIR) LC_ALL=C $(PYTHON3) -m coverage run $(TRIAL) --unclean-warnings landscape
-	PYTHONPATH=$(PYTHONPATH):$(CURDIR) LC_ALL=C $(PYTHON3) -m coverage xml
+	PYTHONPATH=$(PYTHONPATH):$(CURDIR) LC_ALL=C $(PYTHON) -m coverage run $(TRIAL) --unclean-warnings landscape
+	PYTHONPATH=$(PYTHONPATH):$(CURDIR) LC_ALL=C $(PYTHON) -m coverage xml
 
 .PHONY: lint
 lint:
-	$(PYTHON3) -m flake8 --ignore $(PEP8_IGNORED) `find landscape -name \*.py`
+	$(PYTHON) -m flake8 --ignore $(PEP8_IGNORED) `find landscape -name \*.py`
 
 .PHONY: pyflakes
 pyflakes:
diff --git a/Makefile.packaging b/Makefile.packaging
index 5a43ce7..d3c90ad 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -60,8 +60,8 @@ releasetarball:
 
 .PHONY: sdist
 sdist: clean
-	mkdir -p sdist
-	git archive --prefix landscape-client-$(TARBALL_VERSION)/ HEAD | tar -x -C sdist
+	mkdir -p sdist/landscape-client-$(TARBALL_VERSION)
+	git ls-files --recurse-submodules | xargs -I {} cp -r --parents {} sdist/landscape-client-$(TARBALL_VERSION)
 	rm -rf sdist/landscape-client-$(TARBALL_VERSION)/debian
 	sed -i -e "s/^UPSTREAM_VERSION.*/UPSTREAM_VERSION = \"$(TARBALL_VERSION)\"/g" \
 		sdist/landscape-client-$(TARBALL_VERSION)/landscape/__init__.py
diff --git a/README b/README
index 8751ef3..c8a4737 100644
--- a/README
+++ b/README
@@ -58,6 +58,12 @@ Landscape service. There are two ways to do this:
 
 ## Developing
 
+After cloning the repository, make sure you run the following command to pull the `snap-http` submodule:
+
+```shell
+git submodule update --init
+```
+
 To run the full test suite, run the following command:
 
 ```
@@ -81,12 +87,17 @@ system bus.
 $ sudo ./scripts/landscape-client -c root-client.conf
 ```
 
-Before opening a PR, make sure to run the full testsuite and lint
+Before opening a PR, make sure to run the full test suite and lint:
 ```
-make check3
+make check
 make lint
 ```
 
+You can run a specific test by running the following (for example):
+```
+python3 -m twisted.trial landscape.client.broker.tests.test_client.BrokerClientTest.test_ping
+```
+
 ### Building the Landscape Client snap
 
 First, you need to ensure that you have the appropriate tools installed:
@@ -158,7 +169,7 @@ $ gnome-keyring-daemon --unlock
 The gnome-keyring-daemon will prompt you (without a prompt) to type in
 the initial unlock password (typically the same password for the account
 you are using - if you are using the default multipass or lxc "ubuntu"
-login, use sudo passwd ubuntu to set it to a known value before doing 
+login, use sudo passwd ubuntu to set it to a known value before doing
 the above step).
 
 Type the login password and hit <ENTER> followed by <CTRL>+D to end
diff --git a/debian/changelog b/debian/changelog
index 5643e19..6aa9e2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+landscape-client (24.02-0ubuntu1) noble; urgency=medium
+
+  * New upstream release 24.02
+    - d/control: added python3-dbus to Build-Depends
+    - d/control: added python3-dbus to landscape-client Depends. Added
+      python3-setuptools to landscape-common Depends. Removed lsb-base from
+      landscape-common Depends.
+    - d/control: use dephelper-compat 12, removed d/compat
+    - d/patches: removed patches that have been applied upstream
+    - d/watch: watch Github releases page instead of tags
+    - snap-http: included new submodule under identical license
+    - use dbus in shutdown manager instead of subprocess
+    - improve messages about manager plugin configuration
+    - add getting and settings snap configurations
+    - read temperature from hwmon devices
+    - add snapd device information to ComputerInfo message
+    - add snap services management
+    - d/landscape-common.postinst d/landscape-common.prerm: do not call
+      update-motd when installing/removing landscape-sysinfo.wrapper
+      (LP: #1855544)
+    - Livepatch status reporting bug
+    - bpickle: guard against negative string/bytestring lengths
+    - Makefile: remove check2, depends2, and references to python2
+    - add path for os-release inside a snap
+    - computer title generation for zero-touch deployment on Core
+    - user management on Core
+    - deploy system user assertion to device
+    - remote script execution for snaps
+
+ -- Mitch Burton <[e-mail]>  Thu, 27 Feb 2024 16:46:56 -0800
+
 landscape-client (23.08-0ubuntu4) noble; urgency=medium
 
   * d/p/0003-fix-cpuinfo-and-tests.patch: fix ARM and RISCV cpuinfo parsing;
diff --git a/debian/control b/debian/control
index c70ceae..3a859a6 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper-compat (= 12), po-debconf, libdistro-info-perl,
                lsb-release, gawk, net-tools,
                python3-apt, python3-twisted, python3-configobj,
                python3-pycurl, python3-netifaces, python3-yaml,
-               ubuntu-advantage-tools, locales-all
+               ubuntu-advantage-tools, locales-all, python3-dbus
 Standards-Version: 4.4.0
 Homepage: https://github.com/CanonicalLtd/landscape-client
 
@@ -22,11 +22,11 @@ Depends: ${python3:Depends}, ${misc:Depends}, ${extra:Depends},
          python3-gdbm,
          python3-netifaces,
          lsb-release,
-         lsb-base,
          adduser,
          bc,
          lshw,
-         libpam-modules
+         libpam-modules,
+         python3-setuptools
 Description: Landscape administration system client - Common files
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
@@ -42,6 +42,7 @@ Depends: ${python3:Depends}, ${misc:Depends}, ${extra:Depends},
          ${shlibs:Depends},
          landscape-common (= ${binary:Version}),
          python3-pycurl,
+	 python3-dbus
 Description: Landscape administration system client
  Landscape is a web-based tool for managing Ubuntu systems. This
  package is necessary if you want your machine to be managed in a
diff --git a/debian/landscape-common.postinst b/debian/landscape-common.postinst
index e78c193..09826f5 100755
--- a/debian/landscape-common.postinst
+++ b/debian/landscape-common.postinst
@@ -90,18 +90,16 @@ case "$1" in
         WRAPPER=/usr/share/landscape/landscape-sysinfo.wrapper
         PROFILE_LOCATION=/etc/profile.d/50-landscape-sysinfo.sh
         UPDATE_MOTD_LOCATION=/etc/update-motd.d/50-landscape-sysinfo
-
         if [ "$RET" = "Cache sysinfo in /etc/motd" ]; then
             rm -f $PROFILE_LOCATION 2>/dev/null || true
             ln -sf $WRAPPER $UPDATE_MOTD_LOCATION
-            update-motd 2>/dev/null || true
+            $WRAPPER >/dev/null 2>&1 || true
         elif [ "$RET" = "Run sysinfo on every login" ]; then
             rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
-            update-motd 2>/dev/null || true
             ln -sf $WRAPPER $PROFILE_LOCATION
+            $WRAPPER >/dev/null 2>&1 || true
         else
             rm -f $UPDATE_MOTD_LOCATION 2>/dev/null || true
-            update-motd 2>/dev/null || true
             rm -f $PROFILE_LOCATION || true
         fi
 
diff --git a/debian/landscape-common.prerm b/debian/landscape-common.prerm
index 049aa63..14e35dc 100644
--- a/debian/landscape-common.prerm
+++ b/debian/landscape-common.prerm
@@ -20,7 +20,6 @@ set -e
 case "$1" in
     remove|upgrade|deconfigure)
        rm -f /etc/update-motd.d/50-landscape-sysinfo 2>/dev/null || true
-       update-motd 2>/dev/null || true
        rm -f /etc/profile.d/landscape-sysinfo.sh 2>/dev/null || true
     ;;
 
diff --git a/debian/patches/0001-start-service-during-config.patch b/debian/patches/0001-start-service-during-config.patch
deleted file mode 100644
index d3fb5f9..0000000
--- a/debian/patches/0001-start-service-during-config.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-Description: Allow landscape-config to start landscape-client systemd service
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/landscape-client/+bug/2040189
-Author: Mitch Burton <[e-mail]>
-Origin: upstream, https://github.com/canonical/landscape-client/commit/0da6b4b64c7ca50c109279bd42633c537458fcf4
-Reviewed-by: Kevin Nasto <[e-mail]>
-Applied-Upstream: 23.10
-Last-Update: 2023-11-07
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/landscape/client/configuration.py
-+++ b/landscape/client/configuration.py
-@@ -624,8 +624,10 @@
-     decode_base64_ssl_public_certificate(config)
-     config.write()
-     # Restart the client to ensure that it's using the new configuration.
-+
-     if not config.no_start:
-         try:
-+            set_secure_id(config, "registering")
-             ServiceConfig.restart_landscape()
-         except ServiceConfigException as exc:
-             print_text(str(exc), error=True)
-@@ -796,13 +798,14 @@
-     # Results will be things like "success" or "ssl-error".
-     result = results[0]
- 
--    if isinstance(result, SystemExit):
--        raise result
--
-     # If there was an error and the caller requested that errors be reported
-     # to the on_error callable, then do so.
-     if result != "success" and on_error is not None:
-         on_error(1)
-+
-+    if isinstance(result, SystemExit):
-+        raise result
-+
-     return result
- 
- 
-@@ -883,6 +886,21 @@
-     return text
- 
- 
-+def set_secure_id(config, new_id):
-+    """Persists a secure id in the identity data file. This is used to indicate
-+    whether we are currently in the process of registering.
-+    """
-+    persist = Persist(
-+        filename=os.path.join(
-+            config.data_path,
-+            f"{BrokerService.service_name}.bpickle",
-+        ),
-+    )
-+    identity = Identity(config, persist)
-+    identity.secure_id = new_id
-+    persist.save()
-+
-+
- def main(args, print=print):
-     """Interact with the user and the server to set up client configuration."""
- 
-@@ -927,7 +945,11 @@
-     # Attempt to register the client.
-     reactor = LandscapeReactor()
-     if config.silent:
--        result = register(config, reactor)
-+        result = register(
-+            config,
-+            reactor,
-+            on_error=lambda _: set_secure_id(config, None),
-+        )
-         report_registration_outcome(result, print=print)
-         sys.exit(determine_exit_code(result))
-     else:
-@@ -937,6 +959,10 @@
-             default=default_answer,
-         )
-         if answer:
--            result = register(config, reactor)
-+            result = register(
-+                config,
-+                reactor,
-+                on_error=lambda _: set_secure_id(config, None),
-+            )
-             report_registration_outcome(result, print=print)
-             sys.exit(determine_exit_code(result))
---- a/landscape/client/tests/test_configuration.py
-+++ b/landscape/client/tests/test_configuration.py
-@@ -34,6 +34,7 @@
- from landscape.client.configuration import register
- from landscape.client.configuration import registration_info_text
- from landscape.client.configuration import report_registration_outcome
-+from landscape.client.configuration import set_secure_id
- from landscape.client.configuration import setup
- from landscape.client.configuration import show_help
- from landscape.client.configuration import store_public_key_data
-@@ -738,12 +739,17 @@
-         bootstrap_tree_patcher = mock.patch(
-             "landscape.client.configuration.bootstrap_tree",
-         )
-+        set_secure_id_patch = mock.patch(
-+            "landscape.client.configuration.set_secure_id",
-+        )
-         self.mock_getuid = getuid_patcher.start()
-         self.mock_bootstrap_tree = bootstrap_tree_patcher.start()
-+        set_secure_id_patch.start()
- 
-         def cleanup():
-             getuid_patcher.stop()
-             bootstrap_tree_patcher.stop()
-+            set_secure_id_patch.stop()
- 
-         self.addCleanup(cleanup)
- 
-@@ -1191,7 +1197,11 @@
-         )
-         self.assertEqual(0, exception.code)
-         mock_setup.assert_called_once_with(mock.ANY)
--        mock_register.assert_called_once_with(mock.ANY, mock.ANY)
-+        mock_register.assert_called_once_with(
-+            mock.ANY,
-+            mock.ANY,
-+            on_error=mock.ANY,
-+        )
- 
-     @mock.patch("landscape.client.configuration.input", return_value="y")
-     @mock.patch(
-@@ -1219,7 +1229,11 @@
-         )
-         self.assertEqual(0, exception.code)
-         mock_setup.assert_called_once_with(mock.ANY)
--        mock_register.assert_called_once_with(mock.ANY, mock.ANY)
-+        mock_register.assert_called_once_with(
-+            mock.ANY,
-+            mock.ANY,
-+            on_error=mock.ANY,
-+        )
-         mock_input.assert_called_once_with(
-             "\nRequest a new registration for this computer now? [Y/n]: ",
-         )
-@@ -1256,7 +1270,11 @@
-         )
-         self.assertEqual(2, exception.code)
-         mock_setup.assert_called_once_with(mock.ANY)
--        mock_register.assert_called_once_with(mock.ANY, mock.ANY)
-+        mock_register.assert_called_once_with(
-+            mock.ANY,
-+            mock.ANY,
-+            on_error=mock.ANY,
-+        )
-         mock_input.assert_called_once_with(
-             "\nRequest a new registration for this computer now? [Y/n]: ",
-         )
-@@ -1295,7 +1313,11 @@
-         )
-         self.assertEqual(0, exception.code)
-         mock_setup.assert_called_once_with(mock.ANY)
--        mock_register.assert_called_once_with(mock.ANY, mock.ANY)
-+        mock_register.assert_called_once_with(
-+            mock.ANY,
-+            mock.ANY,
-+            on_error=mock.ANY,
-+        )
-         mock_input.assert_not_called()
- 
-         self.assertEqual(
-@@ -1333,7 +1355,11 @@
-         )
-         self.assertEqual(2, exception.code)
-         mock_setup.assert_called_once_with(mock.ANY)
--        mock_register.assert_called_once_with(mock.ANY, mock.ANY)
-+        mock_register.assert_called_once_with(
-+            mock.ANY,
-+            mock.ANY,
-+            on_error=mock.ANY,
-+        )
-         mock_input.assert_not_called()
-         # Note that the error is output via sys.stderr.
-         self.assertEqual(
-@@ -1378,7 +1404,11 @@
-         mock_serviceconfig.set_start_on_boot.assert_called_once_with(True)
-         mock_serviceconfig.restart_landscape.assert_called_once_with()
-         mock_setup_script().run.assert_called_once_with()
--        mock_register.assert_called_once_with(mock.ANY, mock.ANY)
-+        mock_register.assert_called_once_with(
-+            mock.ANY,
-+            mock.ANY,
-+            on_error=mock.ANY,
-+        )
-         mock_input.assert_called_with(
-             "\nRequest a new registration for this computer now? [Y/n]: ",
-         )
-@@ -1457,7 +1487,11 @@
-             print=noop_print,
-         )
-         mock_setup.assert_called_once_with(mock.ANY)
--        mock_register.assert_called_once_with(mock.ANY, mock.ANY)
-+        mock_register.assert_called_once_with(
-+            mock.ANY,
-+            mock.ANY,
-+            on_error=mock.ANY,
-+        )
-         mock_input.assert_called_once_with(
-             "\nRequest a new registration for this computer now? [Y/n]: ",
-         )
-@@ -1477,7 +1511,11 @@
-             print=noop_print,
-         )
-         mock_setup.assert_called_once_with(mock.ANY)
--        mock_register.assert_called_once_with(mock.ANY, mock.ANY)
-+        mock_register.assert_called_once_with(
-+            mock.ANY,
-+            mock.ANY,
-+            on_error=mock.ANY,
-+        )
-         mock_input.assert_not_called()
- 
-     @mock.patch("landscape.client.configuration.input")
-@@ -2290,6 +2328,27 @@
-         # We ask for retries because networks aren't reliable.
-         self.assertEqual(99, connector.max_retries)
- 
-+    def test_register_got_error(self):
-+        """If there is an error from the connection, raises `SystemExit`."""
-+        reactor = mock.Mock()
-+        connector_factory = mock.Mock()
-+        results = []
-+
-+        def add_error():
-+            results.append(SystemExit())
-+
-+        reactor.run.side_effect = add_error
-+
-+        self.assertRaises(
-+            SystemExit,
-+            register,
-+            self.config,
-+            reactor,
-+            connector_factory,
-+            max_retries=2,
-+            results=results,
-+        )
-+
-     @mock.patch("landscape.client.configuration.LandscapeReactor")
-     def test_register_without_reactor(self, mock_reactor):
-         """If no reactor is passed, a LandscapeReactor will be instantiated.
-@@ -2683,3 +2742,21 @@
-             print=noop_print,
-         )
-         self.assertEqual(EXIT_NOT_REGISTERED, exception.code)
-+
-+
-+class SetSecureIdTest(LandscapeTest):
-+    """Tests for the `set_secure_id` function."""
-+
-+    @mock.patch("landscape.client.configuration.Persist")
-+    @mock.patch("landscape.client.configuration.Identity")
-+    def test_function(self, Identity, Persist):
-+        config = mock.Mock(data_path="/tmp/landscape")
-+
-+        set_secure_id(config, "fancysecureid")
-+
-+        Persist.assert_called_once_with(
-+            filename="/tmp/landscape/broker.bpickle",
-+        )
-+        Persist().save.assert_called_once_with()
-+        Identity.assert_called_once_with(config, Persist())
-+        self.assertEqual(Identity().secure_id, "fancysecureid")
diff --git a/debian/patches/0002-fix-broken-build-tests.patch b/debian/patches/0002-fix-broken-build-tests.patch
deleted file mode 100644
index 8a118b3..0000000
--- a/debian/patches/0002-fix-broken-build-tests.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Fix tests that do not pass in debian build environment
- In environments where the run-as user's home directory does not exist, such
- as sbuild, fall back to expecting the script path to be the root directory.
- Mock snapd, as it does not run in an accessible way in some environments.
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/landscape-client/+bug/2044181
-Author: Mitch Burton <[e-mail]>
-Last-Update: 2023-11-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/landscape/client/manager/tests/test_scriptexecution.py
-+++ b/landscape/client/manager/tests/test_scriptexecution.py
-@@ -463,6 +463,9 @@
-         gid = info.pw_gid
-         path = info.pw_dir
- 
-+        if not os.path.exists(path):
-+            path = "/"
-+
-         return self._run_script(username, uid, gid, path)
- 
-     def test_user_no_home(self):
---- a/landscape/client/monitor/tests/test_snapmonitor.py
-+++ b/landscape/client/monitor/tests/test_snapmonitor.py
-@@ -16,7 +16,12 @@
- 
-     def test_get_data(self):
-         """Tests getting installed snap data."""
-+        snap_http_mock = Mock(
-+            spec=SnapHttp,
-+            get_snaps=Mock(return_value={"result": []}),
-+        )
-         plugin = SnapMonitor()
-+        plugin._snap_http = snap_http_mock
-         self.monitor.add(plugin)
- 
-         plugin.exchange()
---- a/landscape/client/snap/tests/test_http.py
-+++ b/landscape/client/snap/tests/test_http.py
-@@ -19,6 +19,15 @@
-     def test_get_snaps(self):
-         """get_snaps() returns a dict with a list of installed snaps."""
-         http = SnapHttp()
-+
-+        def fill_buff(curl, buff, **kwargs):
-+            buff.write(
-+                b'{"result": [{"id": "foo", "name": "bar", '
-+                b'"publisher": "baz"}]}'
-+            )
-+
-+        http._perform = Mock(side_effect=fill_buff)
-+
-         result = http.get_snaps()["result"]
- 
-         self.assertTrue(isinstance(result, list))
diff --git a/debian/patches/0003-fix-cpuinfo-and-tests.patch b/debian/patches/0003-fix-cpuinfo-and-tests.patch
deleted file mode 100644
index 341a89e..0000000
--- a/debian/patches/0003-fix-cpuinfo-and-tests.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Description: Fix parsing processor IDs on ARM64 systems.
-Author: Mitch Burton <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/landscape-client/+bug/2046620
-Last-Update: 2024-01-02
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/landscape/client/monitor/processorinfo.py
-+++ b/landscape/client/monitor/processorinfo.py
-@@ -181,30 +181,43 @@
-     def create_message(self):
-         """Returns a list containing information about each processor."""
-         processors = []
--        file = open(self._source_filename)
-+        regexp = re.compile(r"(?P<key>.*?)\s*:\s*(?P<value>.*)")
-+        current = {}
- 
--        try:
--            regexp = re.compile(r"(?P<key>.*?)\s*:\s*(?P<value>.*)")
--            current = {}
-+        with open(self._source_filename) as fp:
-+            for line in fp:
-+                line = line.strip()
-+
-+                if not line:
-+                    if current:
-+                        processors.append(current.copy())
-+                        current = {}
-+
-+                    continue
- 
--            for line in file:
-                 match = regexp.match(line.strip())
-+
-                 if match:
-                     key = match.group("key")
-                     value = match.group("value")
- 
--                    if key == "Processor":
--                        # ARM doesn't support SMP, thus no processor-id in
--                        # the cpuinfo
--                        current["processor-id"] = 0
-+                    if key == "processor":
-+                        current["processor-id"] = int(value)
-+                        if "model" not in current:
-+                            current["model"] = "arm"
-+                    elif key == "Processor":
-                         current["model"] = value
-                     elif key == "Cache size":
-                         current["cache-size"] = int(value)
- 
--            if current:
--                processors.append(current)
--        finally:
--            file.close()
-+        if current:
-+            processors.append(current)
-+
-+        # Older ARM machines may not have processor-ids, but we need them, so
-+        # we set missing ones to 0.
-+        for processor in processors:
-+            if "processor-id" not in processor:
-+                processor["processor-id"] = 0
- 
-         return processors
- 
-@@ -357,6 +370,8 @@
- 
-                 if key == "processor":
-                     current = {"processor-id": int(parts[1].strip())}
-+                    # A placeholder in case there is no model provided.
-+                    current["model"] = "riscv"
-                     processors.append(current)
-                 elif key == "isa":
-                     current["vendor"] = parts[1].strip()
---- a/landscape/client/monitor/tests/test_processorinfo.py
-+++ b/landscape/client/monitor/tests/test_processorinfo.py
-@@ -30,8 +30,7 @@
-         self.assertTrue(len(message["processors"]) > 0)
- 
-         for processor in message["processors"]:
--            self.assertTrue("processor-id" in processor)
--            self.assertTrue("model" in processor)
-+            self.assertIn("processor-id", processor)
- 
-     def test_call_on_accepted(self):
-         """
---- a/landscape/client/package/reporter.py
-+++ b/landscape/client/package/reporter.py
-@@ -381,7 +381,11 @@
-             env["http_proxy"] = self._config.http_proxy
-         if self._config.https_proxy:
-             env["https_proxy"] = self._config.https_proxy
--        result = spawn_process(self.apt_update_filename, env=env)
-+
-+        try:
-+            result = spawn_process(self.apt_update_filename, env=env)
-+        except Exception as e:
-+            return deferred.callback((b"", str(e).encode(), e.errno))
- 
-         def callback(args, deferred):
-             return deferred.callback(args)
---- a/landscape/client/package/tests/test_releaseupgrader.py
-+++ b/landscape/client/package/tests/test_releaseupgrader.py
-@@ -391,7 +391,8 @@
-         reactor.callWhenRunning(do_test)
- 
-         def cleanup(ignored):
--            os.environ = env_backup
-+            os.environ.clear()
-+            os.environ.update(env_backup)
-             return ignored
- 
-         return deferred.addBoth(cleanup)
-@@ -451,7 +452,8 @@
-         reactor.callWhenRunning(do_test)
- 
-         def cleanup(ignored):
--            os.environ = env_backup
-+            os.environ.clear()
-+            os.environ.update(env_backup)
-             return ignored
- 
-         return deferred.addBoth(cleanup)
---- a/landscape/client/tests/test_watchdog.py
-+++ b/landscape/client/tests/test_watchdog.py
-@@ -792,7 +792,7 @@
-             "GRACEFUL_WAIT_PERIOD",
-             landscape.client.watchdog.GRACEFUL_WAIT_PERIOD,
-         )
--        landscape.client.watchdog.GRACEFUL_WAIT_PERIOD = 0.2
-+        landscape.client.watchdog.GRACEFUL_WAIT_PERIOD = 1
-         self.daemon.start()
- 
-         def got_result(result):
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e28a21f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-start-service-during-config.patch
-0002-fix-broken-build-tests.patch
-0003-fix-cpuinfo-and-tests.patch
diff --git a/debian/rules b/debian/rules
index cc680cd..3be827c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,4 +26,4 @@ override_dh_installsystemd:
 	dh_installsystemd
 
 override_dh_auto_test:
-	HOME=$(shell mktemp -d) && make check3
+	HOME=$(shell mktemp -d) && make check
diff --git a/debian/watch b/debian/watch
index ba7ea91..a8377cc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/landscape-client-$1\.tar\.gz/ \
-  https://github.com/CanonicalLtd/landscape-client/tags .*/?(\d{2}\.\d{2})\.tar\.gz
+opts="searchmode=plain" \
+https://api.github.com/repos/canonical/landscape-client/releases?per_page=50 \
+https://github.com/canonical/landscape-client/releases/download/[^/]+/landscape-client_@ANY_VERSION@.orig\.tar\.gz
diff --git a/example.conf b/example.conf
index 16b710e..c7e71b8 100644
--- a/example.conf
+++ b/example.conf
@@ -96,6 +96,8 @@ ignore_sigusr1 = False
 #   UbuntuProInfo - Ubuntu Pro registration information
 #   LivePatch - Livepath status information
 #   UbuntuProRebootRequired - informs if the system needs to be rebooted
+#   SnapMonitor - manage installed snaps
+#   SnapServicesMonitor - manage snap services
 #
 # The special value "ALL" is an alias for the full list of plugins.
 monitor_plugins = ALL
@@ -166,9 +168,9 @@ cloud = True
 
 # MANAGER OPTIONS
 
-# A comma-separated list of monitor plugins to use.
+# A comma-separated list of manager plugins to use.
 #
-# Currently available monitor plugins are:
+# Currently available manager plugins are:
 #
 #   ProcessKiller
 #   PackageManager
@@ -176,14 +178,23 @@ cloud = True
 #   ShutdownManager
 #   AptSources
 #   HardwareInfo
+#   KeystoneToken
+#   SnapManager
+#   SnapServicesManager
 #
-# The special vale "ALL" is an alias for the full list of plugins.
+# The special value "ALL" is an alias for the entire list of plugins above and is the default.
 manager_plugins = ALL
 
+# A comma-separated list of manager plugins to use in addition to the default ones.
+#
+# The ScriptExecution manager plugin is not enabled by default.
+# The following example would enable it.
+#include_manager_plugins = ScriptExecution
+
 # A comma-separated list of usernames that scripts can run as.
 #
 # By default, all usernames are allowed.
-script_users = ALL
+#script_users = ALL
 
 
 # The maximum script output length transmitted to landscape
@@ -198,3 +209,8 @@ script_users = ALL
 #
 # The default is True
 #manage_sources_list_d = True
+
+# Set this for WSL instances managed by Landscape. The value
+# should match the uid assigned to the host machine.
+# For all other computers, do not set this parameter.
+#hostagent_uid = the-uid-of-the-host-machine
diff --git a/landscape/__init__.py b/landscape/__init__.py
index 1077067..6e296ac 100644
--- a/landscape/__init__.py
+++ b/landscape/__init__.py
@@ -1,5 +1,5 @@
 DEBIAN_REVISION = ""
-UPSTREAM_VERSION = "23.08"
+UPSTREAM_VERSION = "24.02"
 VERSION = f"{UPSTREAM_VERSION}{DEBIAN_REVISION}"
 
 # The minimum server API version that all Landscape servers are known to speak
diff --git a/landscape/client/__init__.py b/landscape/client/__init__.py
index e69de29..ccb5857 100644
--- a/landscape/client/__init__.py
+++ b/landscape/client/__init__.py
@@ -0,0 +1,11 @@
+import os
+
+IS_SNAP = os.getenv("LANDSCAPE_CLIENT_SNAP")
+IS_CORE = os.getenv("SNAP_SAVE_DATA") is not None
+
+USER = "root" if IS_SNAP else "landscape"
+GROUP = "root" if IS_SNAP else "landscape"
+
+DEFAULT_CONFIG = (
+    "/etc/landscape-client.conf" if IS_SNAP else "/etc/landscape/client.conf"
+)
diff --git a/landscape/client/broker/client.py b/landscape/client/broker/client.py
index edbc2c2..5d3dd4a 100644
--- a/landscape/client/broker/client.py
+++ b/landscape/client/broker/client.py
@@ -1,5 +1,6 @@
 import random
 import sys
+import traceback
 from logging import debug
 from logging import error
 from logging import exception
@@ -142,11 +143,14 @@ class BrokerClientPlugin:
 
     def _error_log(self, failure):
         """Errback to log and reraise uncaught run errors."""
-        msg = "{} raised an uncaught exception".format(type(self).__name__)
+        cls = type(self).__name__
+        msg = f"{cls} raised an uncaught exception"
         if sys.exc_info() == (None, None, None):
             error(msg)
         else:
             exception(msg)
+            debug(traceback.format_exc(limit=15))
+
         return failure
 
 
diff --git a/landscape/client/broker/config.py b/landscape/client/broker/config.py
index 6b222fb..c050c22 100644
--- a/landscape/client/broker/config.py
+++ b/landscape/client/broker/config.py
@@ -31,6 +31,7 @@ class BrokerConfiguration(Configuration):
               - C{urgent_exchange_interval} (C{1*60})
               - C{http_proxy}
               - C{https_proxy}
+              - C{hostagent_uid}
         """
         parser = super().make_parser()
 
@@ -44,7 +45,7 @@ class BrokerConfiguration(Configuration):
             "-p",
             "--registration-key",
             metavar="KEY",
-            help="The account-wide key used for " "registering clients.",
+            help="The account-wide key used for registering clients.",
         )
         parser.add_option(
             "-t",
@@ -57,14 +58,14 @@ class BrokerConfiguration(Configuration):
             default=15 * 60,
             type="int",
             metavar="INTERVAL",
-            help="The number of seconds between server " "exchanges.",
+            help="The number of seconds between server exchanges.",
         )
         parser.add_option(
             "--urgent-exchange-interval",
             default=1 * 60,
             type="int",
             metavar="INTERVAL",
-            help="The number of seconds between urgent server " "exchanges.",
+            help="The number of seconds between urgent server exchanges.",
         )
         parser.add_option(
             "--ping-interval",
@@ -93,6 +94,12 @@ class BrokerConfiguration(Configuration):
             help="Comma separated list of tag names to be sent "
             "to the server.",
         )
+        parser.add_option(
+            "--hostagent-uid",
+            help="Only set this value if this computer is a WSL instance "
+            "managed by Landscape, in which case set it to be the uid that "
+            "Landscape assigned to the host machine.",
+        )
 
         return parser
 
diff --git a/landscape/client/broker/ping.py b/landscape/client/broker/ping.py
index 153be3c..e96ab7d 100644
--- a/landscape/client/broker/ping.py
+++ b/landscape/client/broker/ping.py
@@ -51,11 +51,12 @@ from landscape.lib.log import log_failure
 class PingClient:
     """An HTTP client which knows how to talk to the ping server."""
 
-    def __init__(self, reactor, get_page=None):
+    def __init__(self, reactor, get_page=None, cainfo=None):
         if get_page is None:
             get_page = fetch
         self._reactor = reactor
         self.get_page = get_page
+        self._cainfo = cainfo
 
     def ping(self, url, insecure_id):
         """Ask the question: are there messages for this computer ID?
@@ -83,6 +84,7 @@ class PingClient:
                 post=True,
                 data=data,
                 headers=headers,
+                cainfo=self._cainfo,
             )
             page_deferred.addCallback(self._got_result)
             return page_deferred
@@ -94,8 +96,7 @@ class PingClient:
         the response indicates that their are messages waiting for
         this computer, False otherwise.
         """
-        if bpickle.loads(webtext) == {"messages": True}:
-            return True
+        return bpickle.loads(webtext) == {"messages": True}
 
 
 class Pinger:
@@ -138,7 +139,10 @@ class Pinger:
 
     def start(self):
         """Start pinging."""
-        self._ping_client = self.ping_client_factory(self._reactor)
+        self._ping_client = self.ping_client_factory(
+            self._reactor,
+            cainfo=self._config.ssl_public_key,
+        )
         self._schedule()
 
     def ping(self):
diff --git a/landscape/client/broker/registration.py b/landscape/client/broker/registration.py
index c21186e..060a16b 100644
--- a/landscape/client/broker/registration.py
+++ b/landscape/client/broker/registration.py
@@ -8,13 +8,11 @@ the machinery in this module will notice that we have no identification
 credentials yet and that the server accepts registration messages, so it
 will craft an appropriate one and send it out.
 """
-import json
 import logging
 
 from twisted.internet.defer import Deferred
 
 from landscape.client.broker.exchange import maybe_bytes
-from landscape.client.monitor.ubuntuproinfo import get_ubuntu_pro_info
 from landscape.lib.juju import get_juju_info
 from landscape.lib.network import get_fqdn
 from landscape.lib.tag import is_valid_tag_list
@@ -76,6 +74,7 @@ class Identity:
     registration_key = config_property("registration_key")
     tags = config_property("tags")
     access_group = config_property("access_group")
+    hostagent_uid = config_property("hostagent_uid")
 
     def __init__(self, config, persist):
         self._config = config
@@ -190,6 +189,7 @@ class RegistrationHandler:
         tags = identity.tags
         group = identity.access_group
         registration_key = identity.registration_key
+        hostagent_uid = identity.hostagent_uid
 
         self._message_store.delete_all_messages()
 
@@ -217,6 +217,8 @@ class RegistrationHandler:
 
         if group:
             message["access_group"] = group
+        if hostagent_uid:
+            message["hostagent_uid"] = hostagent_uid
 
         server_api = self._message_store.get_server_api()
         # If we have juju data to send and if the server is recent enough to
@@ -237,8 +239,6 @@ class RegistrationHandler:
         with_tags = f"and tags {tags} " if tags else ""
         with_group = f"in access group '{group}' " if group else ""
 
-        message["ubuntu_pro_info"] = json.dumps(get_ubuntu_pro_info())
-
         logging.info(
             f"Queueing message to register with account {account_name!r} "
             f"{with_group}{with_tags}{with_word} a password.",
diff --git a/landscape/client/broker/store.py b/landscape/client/broker/store.py
index 7557d45..ede2514 100644
--- a/landscape/client/broker/store.py
+++ b/landscape/client/broker/store.py
@@ -137,8 +137,14 @@ class MessageStore:
     # in case the server supports it.
     _api = DEFAULT_SERVER_API
 
-    def __init__(self, persist, directory, directory_size=1000, max_dirs=4,
-                 max_size_mb=400):
+    def __init__(
+        self,
+        persist,
+        directory,
+        directory_size=1000,
+        max_dirs=4,
+        max_size_mb=400,
+    ):
         self._directory = directory
         self._directory_size = directory_size
         self._max_dirs = max_dirs  # Maximum number of directories in store
@@ -407,7 +413,7 @@ class MessageStore:
             self.add({"type": "resynchronize"})
             self._persist.set("blackhole-messages", True)
             logging.warning(
-                "Unable to succesfully communicate with Landscape server "
+                "Unable to successfully communicate with Landscape server "
                 "for more than a week. Waiting for resync.",
             )
 
diff --git a/landscape/client/broker/tests/test_config.py b/landscape/client/broker/tests/test_config.py
index b5236ae..db03701 100644
--- a/landscape/client/broker/tests/test_config.py
+++ b/landscape/client/broker/tests/test_config.py
@@ -12,7 +12,7 @@ class ConfigurationTests(LandscapeTest):
     def test_loading_sets_http_proxies(self):
         """
         The L{BrokerConfiguration.load} method sets the 'http_proxy' and
-        'https_proxy' enviroment variables to the provided values.
+        'https_proxy' environment variables to the provided values.
         """
         if "http_proxy" in os.environ:
             del os.environ["http_proxy"]
@@ -36,7 +36,7 @@ class ConfigurationTests(LandscapeTest):
     def test_loading_without_http_proxies_does_not_touch_environment(self):
         """
         The L{BrokerConfiguration.load} method doesn't override the
-        'http_proxy' and 'https_proxy' enviroment variables if they
+        'http_proxy' and 'https_proxy' environment variables if they
         are already set and no new value was specified.
         """
         os.environ["http_proxy"] = "heyo"
@@ -71,7 +71,7 @@ class ConfigurationTests(LandscapeTest):
         self.assertEqual(os.environ["https_proxy"], "originals")
 
     def test_default_exchange_intervals(self):
-        """Exchange intervales are set to sane defaults."""
+        """Exchange intervals are set to sane defaults."""
         configuration = BrokerConfiguration()
         self.assertEqual(60, configuration.urgent_exchange_interval)
         self.assertEqual(900, configuration.exchange_interval)
@@ -135,3 +135,27 @@ class ConfigurationTests(LandscapeTest):
             configuration.url,
             "https://landscape.canonical.com/message-system",
         )
+
+    def test_hostagent_uid_handling(self):
+        """
+        The 'hostagent_uid' value specified in the configuration file is
+        passed through.
+        """
+        filename = self.makeFile("[client]\nhostagent_uid = AWESOME COMPUTER")
+
+        configuration = BrokerConfiguration()
+        configuration.load(["--config", filename, "--url", "whatever"])
+
+        self.assertEqual(configuration.hostagent_uid, "AWESOME COMPUTER")
+
+    def test_missing_hostagent_uid_is_none(self):
+        """
+        Test that if we don't explicitly pass a hostagent_uid, then this value
+        is None.
+        """
+        filename = self.makeFile("[client]\n")
+
+        configuration = BrokerConfiguration()
+        configuration.load(["--config", filename, "--url", "whatever"])
+
+        self.assertIsNone(configuration.hostagent_uid)
diff --git a/landscape/client/broker/tests/test_exchange.py b/landscape/client/broker/tests/test_exchange.py
index bc7fb5f..dd396c3 100644
--- a/landscape/client/broker/tests/test_exchange.py
+++ b/landscape/client/broker/tests/test_exchange.py
@@ -565,7 +565,7 @@ class MessageExchangeTest(LandscapeTest):
         """
         If the server asks for messages that we no longer have, the message
         exchange plugin should send a message to the server indicating that a
-        resynchronization is occuring and then fire a "resynchronize-clients"
+        resynchronization is occurring and then fire a "resynchronize-clients"
         reactor message, so that plugins can generate new data -- if the server
         got out of synch with the client, then we're best off synchronizing
         everything back to it.
@@ -859,7 +859,7 @@ class MessageExchangeTest(LandscapeTest):
         self.reactor.advance(1)
         self.assertEqual(events, [True])
 
-    def test_impending_exchange_gets_reschudeled_with_urgent_reschedule(self):
+    def test_impending_exchange_gets_rescheduled_with_urgent_reschedule(self):
         """
         When an urgent exchange is scheduled after a regular exchange was
         scheduled but before it executed, the old C{impending-exchange} event
@@ -955,7 +955,7 @@ class MessageExchangeTest(LandscapeTest):
         self.wait_for_exchange()
         self.assertFalse(self.transport.payloads)
 
-    def test_stop_twice_doesnt_break(self):
+    def test_stop_twice_does_not_break(self):
         self.exchanger.schedule_exchange()
         self.exchanger.stop()
         self.exchanger.stop()
@@ -1014,7 +1014,7 @@ class MessageExchangeTest(LandscapeTest):
 
     def test_register_message(self):
         """
-        The exchanger expsoses a mechanism for subscribing to messages
+        The exchanger exposes a mechanism for subscribing to messages
         of a particular type.
         """
         messages = []
diff --git a/landscape/client/broker/tests/test_ping.py b/landscape/client/broker/tests/test_ping.py
index 843b984..fe08dee 100644
--- a/landscape/client/broker/tests/test_ping.py
+++ b/landscape/client/broker/tests/test_ping.py
@@ -16,7 +16,7 @@ class FakePageGetter:
         self.response = response
         self.fetches = []
 
-    def get_page(self, url, post, headers, data):
+    def get_page(self, url, post, headers, data, cainfo=None):
         """
         A method which is supposed to act like a limited version of
         L{landscape.lib.fetch.fetch}.
@@ -27,7 +27,7 @@ class FakePageGetter:
         self.fetches.append((url, post, headers, data))
         return bpickle.dumps(self.response)
 
-    def failing_get_page(self, url, post, headers, data):
+    def failing_get_page(self, url, post, headers, data, cainfo=None):
         """
         A method which is supposed to act like a limited version of
         L{landscape.lib.fetch.fetch}.
@@ -126,8 +126,12 @@ class PingerTest(LandscapeTest):
         super().setUp()
         self.page_getter = FakePageGetter(None)
 
-        def factory(reactor):
-            return PingClient(reactor, get_page=self.page_getter.get_page)
+        def factory(reactor, **kwargs):
+            return PingClient(
+                reactor,
+                get_page=self.page_getter.get_page,
+                **kwargs,
+            )
 
         self.config.ping_url = "http://localhost:8081/whatever"
         self.config.ping_interval = 10
diff --git a/landscape/client/broker/tests/test_registration.py b/landscape/client/broker/tests/test_registration.py
index fe1d256..1e236fe 100644
--- a/landscape/client/broker/tests/test_registration.py
+++ b/landscape/client/broker/tests/test_registration.py
@@ -78,6 +78,9 @@ class IdentityTest(LandscapeTest):
     def test_access_group(self):
         self.check_config_property("access_group")
 
+    def test_hostagent_uid(self):
+        self.check_config_property("hostagent_uid")
+
 
 class RegistrationHandlerTestBase(LandscapeTest):
 
@@ -383,6 +386,47 @@ class RegistrationHandlerTest(RegistrationHandlerTestBase):
         # Make sure the key does not appear in the outgoing message.
         self.assertNotIn("access_group", messages[0])
 
+    def test_queue_message_on_exchange_with_hostagent_uid(self):
+        """
+        If the admin has defined a hostagent_uid for this computer, we send
+        it to the server.
+        """
+        self.mstore.set_accepted_types(["register"])
+        # hostagent_uid is introduced in the 3.3 message schema
+        self.mstore.set_server_api(b"3.3")
+        self.config.account_name = "account_name"
+        self.config.hostagent_uid = "dinosaur computer"
+        self.config.tags = "server,london"
+        self.reactor.fire("pre-exchange")
+        messages = self.mstore.get_pending_messages()
+        self.assertEqual("dinosaur computer", messages[0]["hostagent_uid"])
+
+    def test_queue_message_on_exchange_with_empty_hostagent_uid(self):
+        """
+        If the hostagent_uid is "", then the outgoing message does not define
+        a "hostagent_uid" key.
+        """
+        self.mstore.set_accepted_types(["register"])
+        # hostagent_uid is introduced in the 3.3 message schema
+        self.mstore.set_server_api(b"3.3")
+        self.config.hostagent_uid = ""
+        self.reactor.fire("pre-exchange")
+        messages = self.mstore.get_pending_messages()
+        self.assertNotIn("hostagent_uid", messages[0])
+
+    def test_queue_message_on_exchange_with_none_hostagent_uid(self):
+        """
+        If the hostagent_uid is None, then the outgoing message does not define
+        a "hostagent_uid" key.
+        """
+        self.mstore.set_accepted_types(["register"])
+        # hostagent_uid is introduced in the 3.3 message schema
+        self.mstore.set_server_api(b"3.3")
+        self.config.hostagent_uid = None
+        self.reactor.fire("pre-exchange")
+        messages = self.mstore.get_pending_messages()
+        self.assertNotIn("hostagent_uid", messages[0])
+
     def test_queueing_registration_message_resets_message_store(self):
         """
         When a registration message is queued, the store is reset
@@ -457,7 +501,7 @@ class RegistrationHandlerTest(RegistrationHandlerTestBase):
             {"type": b"registration", "info": b"blah-blah"},
         )
         for name, args, kwargs in reactor_fire_mock.mock_calls:
-            self.assertNotEquals("registration-failed", args[0])
+            self.assertNotEqual("registration-failed", args[0])
 
     def test_register_resets_ids(self):
         self.identity.secure_id = "foo"
diff --git a/landscape/client/broker/tests/test_store.py b/landscape/client/broker/tests/test_store.py
index b61edf3..5dd2fbb 100644
--- a/landscape/client/broker/tests/test_store.py
+++ b/landscape/client/broker/tests/test_store.py
@@ -700,11 +700,11 @@ class MessageStoreTest(LandscapeTest):
         """Messages stop accumulating after one week of not being sent."""
         self.store.record_failure(0)
         self.store.record_failure(7 * 24 * 60 * 60)
-        self.assertIsNot(None, self.store.add({"type": "empty"}))
+        self.assertIsNotNone(self.store.add({"type": "empty"}))
         self.store.record_failure((7 * 24 * 60 * 60) + 1)
-        self.assertIs(None, self.store.add({"type": "empty"}))
+        self.assertIsNone(self.store.add({"type": "empty"}))
         self.assertIn(
-            "WARNING: Unable to succesfully communicate with "
+            "WARNING: Unable to successfully communicate with "
             "Landscape server for more than a week. Waiting for "
             "resync.",
             self.logfile.getvalue(),
diff --git a/landscape/client/configuration.py b/landscape/client/configuration.py
index 621e797..759b45f 100644
--- a/landscape/client/configuration.py
+++ b/landscape/client/configuration.py
@@ -13,6 +13,8 @@ import textwrap
 from functools import partial
 from urllib.parse import urlparse
 
+from landscape.client import GROUP
+from landscape.client import USER
 from landscape.client.broker.amp import RemoteBrokerConnector
 from landscape.client.broker.config import BrokerConfiguration
 from landscape.client.broker.registration import Identity
@@ -197,14 +199,15 @@ class LandscapeSetupConfiguration(BrokerConfiguration):
             "--script-users",
             metavar="USERS",
             help="A comma-separated list of users to allow "
-            "scripts to run.  To allow scripts to be run "
+            "scripts to run. To allow scripts to be run "
             "by any user, enter: ALL",
         )
         parser.add_option(
             "--include-manager-plugins",
             metavar="PLUGINS",
             default="",
-            help="A comma-separated list of manager plugins to " "load.",
+            help="A comma-separated list of manager plugins "
+            "to enable in addition to the defaults.",
         )
         parser.add_option(
             "-n",
@@ -228,13 +231,13 @@ class LandscapeSetupConfiguration(BrokerConfiguration):
             "--disable",
             action="store_true",
             default=False,
-            help="Stop running clients and disable start at " "boot.",
+            help="Stop running clients and disable start at boot.",
         )
         parser.add_option(
             "--init",
             action="store_true",
             default=False,
-            help="Set up the client directories structure " "and exit.",
+            help="Set up the client directories structure and exit.",
         )
         parser.add_option(
             "--is-registered",
@@ -565,7 +568,7 @@ def check_account_name_and_password(config):
     if config.silent and not config.no_start:
         if not (config.get("account_name") and config.get("computer_title")):
             raise ConfigurationError(
-                "An account name and computer title are " "required.",
+                "An account name and computer title are required.",
             )
 
 
@@ -624,8 +627,10 @@ def setup(config):
     decode_base64_ssl_public_certificate(config)
     config.write()
     # Restart the client to ensure that it's using the new configuration.
+
     if not config.no_start:
         try:
+            set_secure_id(config, "registering")
             ServiceConfig.restart_landscape()
         except ServiceConfigException as exc:
             print_text(str(exc), error=True)
@@ -643,13 +648,8 @@ def setup(config):
 def bootstrap_tree(config):
     """Create the client directories tree."""
     bootstrap_list = [
-        BootstrapDirectory("$data_path", "landscape", "root", 0o755),
-        BootstrapDirectory(
-            "$annotations_path",
-            "landscape",
-            "landscape",
-            0o755,
-        ),
+        BootstrapDirectory("$data_path", USER, "root", 0o755),
+        BootstrapDirectory("$annotations_path", USER, GROUP, 0o755),
     ]
     BootstrapList(bootstrap_list).bootstrap(
         data_path=config.data_path,
@@ -796,13 +796,14 @@ def register(
     # Results will be things like "success" or "ssl-error".
     result = results[0]
 
-    if isinstance(result, SystemExit):
-        raise result
-
     # If there was an error and the caller requested that errors be reported
     # to the on_error callable, then do so.
     if result != "success" and on_error is not None:
         on_error(1)
+
+    if isinstance(result, SystemExit):
+        raise result
+
     return result
 
 
@@ -883,6 +884,21 @@ def registration_info_text(config, registration_status):
     return text
 
 
+def set_secure_id(config, new_id):
+    """Persists a secure id in the identity data file. This is used to indicate
+    whether we are currently in the process of registering.
+    """
+    persist = Persist(
+        filename=os.path.join(
+            config.data_path,
+            f"{BrokerService.service_name}.bpickle",
+        ),
+    )
+    identity = Identity(config, persist)
+    identity.secure_id = new_id
+    persist.save()
+
+
 def main(args, print=print):
     """Interact with the user and the server to set up client configuration."""
 
@@ -927,7 +943,11 @@ def main(args, print=print):
     # Attempt to register the client.
     reactor = LandscapeReactor()
     if config.silent:
-        result = register(config, reactor)
+        result = register(
+            config,
+            reactor,
+            on_error=lambda _: set_secure_id(config, None),
+        )
         report_registration_outcome(result, print=print)
         sys.exit(determine_exit_code(result))
     else:
@@ -937,6 +957,10 @@ def main(args, print=print):
             default=default_answer,
         )
         if answer:
-            result = register(config, reactor)
+            result = register(
+                config,
+                reactor,
+                on_error=lambda _: set_secure_id(config, None),
+            )
             report_registration_outcome(result, print=print)
             sys.exit(determine_exit_code(result))
diff --git a/landscape/client/deployment.py b/landscape/client/deployment.py
index db1f110..28bc830 100644
--- a/landscape/client/deployment.py
+++ b/landscape/client/deployment.py
@@ -1,13 +1,23 @@
+import json
 import os.path
+import subprocess
 import sys
+from datetime import datetime
+from datetime import timezone
 from optparse import SUPPRESS_HELP
 
 from twisted.logger import globalLogBeginner
 
 from landscape import VERSION
+from landscape.client import DEFAULT_CONFIG
+from landscape.client import snap_http
+from landscape.client.snap_utils import get_snap_info
 from landscape.client.upgraders import UPGRADE_MANAGERS
 from landscape.lib import logging
 from landscape.lib.config import BaseConfiguration as _BaseConfiguration
+from landscape.lib.format import expandvars
+from landscape.lib.network import get_active_device_info
+from landscape.lib.network import get_fqdn
 from landscape.lib.persist import Persist
 
 
@@ -37,7 +47,7 @@ class BaseConfiguration(_BaseConfiguration):
 
     version = VERSION
 
-    default_config_filename = "/etc/landscape/client.conf"
+    default_config_filename = DEFAULT_CONFIG
     if _is_script():
         default_config_filenames = (
             "landscape-client.conf",
@@ -188,6 +198,25 @@ class Configuration(BaseConfiguration):
         backwards-compatibility."""
         return os.path.join(self.data_path, "juju-info.json")
 
+    def auto_configure(self):
+        """Automatically configure the client snap."""
+        client_conf = snap_http.get_conf("landscape-client").result
+        auto_enroll_conf = client_conf.get("auto-register", {})
+
+        enabled = auto_enroll_conf.get("enabled", False)
+        configured = auto_enroll_conf.get("configured", False)
+        if not enabled or configured:
+            return
+
+        title = generate_computer_title(auto_enroll_conf)
+        if title:
+            self.computer_title = title
+            self.write()
+
+            auto_enroll_conf["configured"] = True
+            client_conf["auto-register"] = auto_enroll_conf
+            snap_http.set_conf("landscape-client", client_conf)
+
 
 def get_versioned_persist(service):
     """Get a L{Persist} database with upgrade rules applied.
@@ -203,3 +232,52 @@ def get_versioned_persist(service):
         upgrade_manager.initialize(persist)
     persist.save(service.persist_filename)
     return persist
+
+
+def generate_computer_title(auto_enroll_config):
+    """Generate the computer title.
+
+    This follows the LA017 specification and falls back to `hostname`
+    if generating the title fails due to missing data.
+    """
+    snap_info = get_snap_info()
+    wait_for_serial = auto_enroll_config.get("wait-for-serial-as", True)
+    if "serial" not in snap_info and wait_for_serial:
+        return
+
+    hostname = get_fqdn()
+    wait_for_hostname = auto_enroll_config.get("wait-for-hostname", False)
+    if hostname == "localhost" and wait_for_hostname:
+        return
+
+    nics = get_active_device_info(default_only=True)
+    nic = nics[0] if nics else {}
+
+    lshw = subprocess.run(
+        ["lshw", "-json", "-quiet", "-c", "system"],
+        capture_output=True,
+        text=True,
+    )
+    hardware = json.loads(lshw.stdout)[0]
+
+    computer_title_pattern = auto_enroll_config.get(
+        "computer-title-pattern",
+        "${hostname}",
+    )
+    title = expandvars(
+        computer_title_pattern,
+        serial=snap_info.get("serial", ""),
+        model=snap_info.get("model", ""),
+        brand=snap_info.get("brand", ""),
+        hostname=hostname,
+        ip=nic.get("ip_address", ""),
+        mac=nic.get("mac_address", ""),
+        prodiden=hardware.get("product", ""),
+        serialno=hardware.get("serial", ""),
+        datetime=datetime.now(timezone.utc),
+    )
+
+    if title == "":  # on the off-chance substitute values are missing
+        title = hostname
+
+    return title
diff --git a/landscape/client/manager/aptsources.py b/landscape/client/manager/aptsources.py
index baa641f..179fa72 100644
--- a/landscape/client/manager/aptsources.py
+++ b/landscape/client/manager/aptsources.py
@@ -8,6 +8,8 @@ import uuid
 
 from twisted.internet.defer import succeed
 
+from landscape.client import GROUP
+from landscape.client import USER
 from landscape.client.manager.plugin import ManagerPlugin
 from landscape.client.package.reporter import find_reporter_command
 from landscape.constants import FALSE_VALUES
@@ -167,8 +169,8 @@ class AptSources(ManagerPlugin):
             args.append(f"--config={self.registry.config.config}")
 
         if os.getuid() == 0:
-            uid = pwd.getpwnam("landscape").pw_uid
-            gid = grp.getgrnam("landscape").gr_gid
+            uid = pwd.getpwnam(USER).pw_uid
+            gid = grp.getgrnam(GROUP).gr_gid
         else:
             uid = None
             gid = None
diff --git a/landscape/client/manager/config.py b/landscape/client/manager/config.py
index 2f8df8b..f89ebbc 100644
--- a/landscape/client/manager/config.py
+++ b/landscape/client/manager/config.py
@@ -13,6 +13,8 @@ ALL_PLUGINS = [
     "HardwareInfo",
     "KeystoneToken",
     "SnapManager",
+    "SnapServicesManager",
+    "UbuntuProInfo",
 ]
 
 
diff --git a/landscape/client/manager/hardwareinfo.py b/landscape/client/manager/hardwareinfo.py
index b475ee5..35b504d 100644
--- a/landscape/client/manager/hardwareinfo.py
+++ b/landscape/client/manager/hardwareinfo.py
@@ -12,7 +12,7 @@ class HardwareInfo(ManagerPlugin):
     message_type = "hardware-info"
     run_interval = 60 * 60 * 24
     run_immediately = True
-    command = "/usr/bin/lshw"
+    command = "lshw"
 
     def register(self, registry):
         super().register(registry)
diff --git a/landscape/client/manager/scriptexecution.py b/landscape/client/manager/scriptexecution.py
index ac591d7..6856185 100644
--- a/landscape/client/manager/scriptexecution.py
+++ b/landscape/client/manager/scriptexecution.py
@@ -18,6 +18,7 @@ from twisted.internet.protocol import ProcessProtocol
 from twisted.python.compat import unicode
 
 from landscape import VERSION
+from landscape.client import IS_SNAP
 from landscape.client.manager.plugin import FAILED
 from landscape.client.manager.plugin import ManagerPlugin
 from landscape.client.manager.plugin import SUCCEEDED
@@ -85,6 +86,7 @@ class ScriptRunnerMixin:
         if process_factory is None:
             from twisted.internet import reactor as process_factory
         self.process_factory = process_factory
+        self.IS_SNAP = IS_SNAP
 
     def is_user_allowed(self, user):
         allowed_users = self.registry.config.get_allowed_script_users()
@@ -96,8 +98,9 @@ class ScriptRunnerMixin:
         # It would be nice to use fchown(2) and fchmod(2), but they're not
         # available in python and using it with ctypes is pretty tedious, not
         # to mention we can't get errno.
+        # Don't attempt to change file owner if the client is a snap
         os.chmod(filename, 0o700)
-        if uid is not None:
+        if not self.IS_SNAP and uid is not None:
             os.chown(filename, uid, gid)
 
         script = build_script(shell, code)
@@ -172,7 +175,8 @@ class ScriptExecutionPlugin(ManagerPlugin, ScriptRunnerMixin):
     def _handle_execute_script(self, message):
         opid = message["operation-id"]
         try:
-            user = message["username"]
+            user = message["username"] if not self.IS_SNAP else "root"
+
             if not self.is_user_allowed(user):
                 return self._respond(
                     FAILED,
@@ -245,11 +249,11 @@ class ScriptExecutionPlugin(ManagerPlugin, ScriptRunnerMixin):
             full_filename = os.path.join(attachment_dir, filename)
             with open(full_filename, "wb") as attachment:
                 os.chmod(full_filename, 0o600)
-                if uid is not None:
+                if not self.IS_SNAP and uid is not None:
                     os.chown(full_filename, uid, gid)
                 attachment.write(data)
         os.chmod(attachment_dir, 0o700)
-        if uid is not None:
+        if not self.IS_SNAP and uid is not None:
             os.chown(attachment_dir, uid, gid)
         returnValue(attachment_dir)
 
@@ -296,9 +300,15 @@ class ScriptExecutionPlugin(ManagerPlugin, ScriptRunnerMixin):
             "USER": user or "",
             "HOME": path or "",
         }
-        for locale_var in ("LANG", "LC_ALL", "LC_CTYPE"):
-            if locale_var in os.environ:
-                env[locale_var] = os.environ[locale_var]
+        for env_var in (
+            "LANG",
+            "LC_ALL",
+            "LC_CTYPE",
+            "LD_LIBRARY_PATH",
+            "PYTHONPATH",
+        ):
+            if env_var in os.environ:
+                env[env_var] = os.environ[env_var]
         if server_supplied_env:
             env.update(server_supplied_env)
         old_umask = os.umask(0o022)
diff --git a/landscape/client/manager/service.py b/landscape/client/manager/service.py
index 7690442..c289685 100644
--- a/landscape/client/manager/service.py
+++ b/landscape/client/manager/service.py
@@ -1,3 +1,5 @@
+import logging
+
 from twisted.python.reflect import namedClass
 
 from landscape.client.amp import ComponentPublisher
@@ -28,13 +30,26 @@ class ManagerService(LandscapeService):
 
     def get_plugins(self):
         """Return instances of all the plugins enabled in the configuration."""
-        return [
-            namedClass(
-                "landscape.client.manager."
-                f"{plugin_name.lower()}.{plugin_name}",
-            )()
-            for plugin_name in self.config.plugin_factories
-        ]
+        plugins = []
+
+        for plugin_name in self.config.plugin_factories:
+            try:
+                plugin = namedClass(
+                    "landscape.client.manager."
+                    f"{plugin_name.lower()}.{plugin_name}",
+                )
+                plugins.append(plugin())
+            except ModuleNotFoundError:
+                logging.warning(
+                    f"Invalid manager plugin specified: '{plugin_name}'"
+                    "See `example.conf` for a full list of monitor plugins.",
+                )
+            except Exception as exc:
+                logging.warning(
+                    f"Unable to load manager plugin '{plugin_name}': {exc}",
+                )
+
+        return plugins
 
     def startService(self):  # noqa: N802
         """Start the manager service.
diff --git a/landscape/client/manager/shutdownmanager.py b/landscape/client/manager/shutdownmanager.py
index eba2be7..bd38533 100644
--- a/landscape/client/manager/shutdownmanager.py
+++ b/landscape/client/manager/shutdownmanager.py
@@ -1,94 +1,106 @@
 import logging
 
-from twisted.internet.defer import Deferred
-from twisted.internet.error import ProcessDone
-from twisted.internet.protocol import ProcessProtocol
+import dbus
+from twisted.internet import reactor
+from twisted.internet import task
 
 from landscape.client.manager.plugin import FAILED
 from landscape.client.manager.plugin import ManagerPlugin
 from landscape.client.manager.plugin import SUCCEEDED
 
 
-class ShutdownFailedError(Exception):
-    """Raised when a call to C{/sbin/shutdown} fails.
-
-    @ivar data: The data that the process printed before failing.
+class ShutdownManager(ManagerPlugin):
     """
+    Plugin that either shuts down or reboots the device.
 
-    def __init__(self, data):
-        self.data = data
+    In both cases, the manager sends the success command
+    before attempting the shutdown/reboot.
+    With reboot - the call is instanteous but the success
+    message will be send as soon as the device comes back up.
 
+    For shutdown there is a 120 second delay between
+    sending the success and firing the shutdown.
+    This is usually sufficent.
+    """
 
-class ShutdownManager(ManagerPlugin):
-    def __init__(self, process_factory=None):
-        if process_factory is None:
-            from twisted.internet import reactor as process_factory
-        self._process_factory = process_factory
+    def __init__(self, dbus_provider=None, shutdown_delay=120):
+        if dbus_provider is None:
+            self.dbus_sysbus = dbus.SystemBus()
+        else:
+            self.dbus_sysbus = dbus_provider.SystemBus()
 
-    def register(self, registry):
-        """Add this plugin to C{registry}.
+        self.shutdown_delay = shutdown_delay
 
-        The shutdown manager handles C{shutdown} activity messages broadcast
-        from the server.
-        """
+    def register(self, registry):
         super().register(registry)
-        registry.register_message("shutdown", self.perform_shutdown)
+        self.config = registry.config
 
-    def perform_shutdown(self, message):
-        """Request a system restart or shutdown.
+        registry.register_message("shutdown", self._handle_shutdown)
 
-        If the call to C{/sbin/shutdown} runs without errors the activity
-        specified in the message will be responded as succeeded.  Otherwise,
-        it will be responded as failed.
+    def _handle_shutdown(self, message, DBus_System_Bus=None):
+        """
+        Choose shutdown or reboot
         """
         operation_id = message["operation-id"]
         reboot = message["reboot"]
-        protocol = ShutdownProcessProtocol()
-        protocol.set_timeout(self.registry.reactor)
-        protocol.result.addCallback(self._respond_success, operation_id)
-        protocol.result.addErrback(self._respond_failure, operation_id, reboot)
-        command, args = self._get_command_and_args(protocol, reboot)
-        self._process_factory.spawnProcess(protocol, command, args=args)
-
-    def _respond_success(self, data, operation_id):
-        logging.info("Shutdown request succeeded.")
+
+        if reboot:
+            logging.info("Reboot Requested")
+            deferred = self._respond_reboot_success(
+                "Reboot requested of the system",
+                operation_id,
+            )
+            return deferred
+        else:
+            logging.info("Shutdown Requested")
+            deferred = self._respond_shutdown_success(
+                "Shutdown requested of the system",
+                operation_id,
+            )
+            return deferred
+
+    def _Reboot(self, _, Dbus_System_bus=None):
+        logging.info("Sending Reboot Command")
+
+        bus_object = self.dbus_sysbus.get_object(
+            "org.freedesktop.login1",
+            "/org/freedesktop/login1",
+        )
+        bus_object.Reboot(
+            True,
+            dbus_interface="org.freedesktop.login1.Manager",
+        )
+
+    def _Shutdown(self):
+        logging.info("Sending Shutdown Command")
+        bus_object = self.dbus_sysbus.get_object(
+            "org.freedesktop.login1",
+            "/org/freedesktop/login1",
+        )
+        bus_object.PowerOff(
+            True,
+            dbus_interface="org.freedesktop.login1.Manager",
+        )
+
+    def _respond_reboot_success(self, data, operation_id):
         deferred = self._respond(SUCCEEDED, data, operation_id)
-        # After sending the result to the server, stop accepting messages and
-        # wait for the reboot/shutdown.
-        deferred.addCallback(lambda _: self.registry.broker.stop_exchanger())
+        deferred.addCallback(self._Reboot)
+        deferred.addErrback(self._respond_fail)
         return deferred
 
-    def _respond_failure(self, failure, operation_id, reboot):
-        logging.info("Shutdown request failed.")
-        failure_report = "\n".join(
-            [
-                failure.value.data,
-                "",
-                "Attempting to force {operation}. Please note that if this "
-                "succeeds, Landscape will have no way of knowing and will "
-                "still mark this activity as having failed. It is recommended "
-                "you check the state of the machine manually to determine "
-                "whether {operation} succeeded.".format(
-                    operation="reboot" if reboot else "shutdown",
-                ),
-            ],
-        )
-        deferred = self._respond(FAILED, failure_report, operation_id)
-        # Add another callback spawning the poweroff or reboot command (which
-        # seem more reliable in aberrant situations like a post-trusty release
-        # upgrade where upstart has been replaced with systemd). If this
-        # succeeds, we won't have any opportunity to report it and if it fails
-        # we'll already have responded indicating we're attempting to force
-        # the operation so either way there's no sense capturing output
-        protocol = ProcessProtocol()
-        command, args = self._get_command_and_args(protocol, reboot, True)
-        deferred.addCallback(
-            lambda _: self._process_factory.spawnProcess(
-                protocol,
-                command,
-                args=args,
-            ),
+    def _respond_shutdown_success(self, data, operation_id):
+        deferred = self._respond(SUCCEEDED, data, operation_id)
+        self.shutdown_deferred = task.deferLater(
+            reactor,
+            self.shutdown_delay,
+            self._Shutdown,
         )
+        deferred.addErrback(self._respond_fail)
+        return deferred
+
+    def _respond_fail(self, data, operation_id):
+        logging.info("Shutdown/Reboot request failed.")
+        deferred = self._respond(FAILED, data, operation_id)
         return deferred
 
     def _respond(self, status, data, operation_id):
@@ -103,93 +115,3 @@ class ShutdownManager(ManagerPlugin):
             self._session_id,
             True,
         )
-
-    def _get_command_and_args(self, protocol, reboot, force=False):
-        """
-        Returns a C{command, args} 2-tuple suitable for use with
-        L{IReactorProcess.spawnProcess}.
-        """
-        minutes = None if force else f"+{protocol.delay//60:d}"
-        args = {
-            (False, False): [
-                "/sbin/shutdown",
-                "-h",
-                minutes,
-                "Landscape is shutting down the system",
-            ],
-            (False, True): [
-                "/sbin/shutdown",
-                "-r",
-                minutes,
-                "Landscape is rebooting the system",
-            ],
-            (True, False): ["/sbin/poweroff"],
-            (True, True): ["/sbin/reboot"],
-        }[force, reboot]
-        return args[0], args
-
-
-class ShutdownProcessProtocol(ProcessProtocol):
-    """A ProcessProtocol for calling C{/sbin/shutdown}.
-
-    C{shutdown} doesn't return immediately when a time specification is
-    provided.  Failures are reported immediately after it starts and return a
-    non-zero exit code.  The process protocol calls C{shutdown} and waits for
-    failures for C{timeout} seconds.  If no failures are reported it fires
-    C{result}'s callback with whatever output was received from the process.
-    If failures are reported C{result}'s errback is fired.
-
-    @ivar result: A L{Deferred} fired when C{shutdown} fails or
-        succeeds.
-    @ivar reboot: A flag indicating whether a shutdown or reboot should be
-        performed.  Default is C{False}.
-    @ivar delay: The time in seconds from now to schedule the shutdown.
-        Default is 240 seconds.  The time will be converted to minutes using
-        integer division when passed to C{shutdown}.
-    """
-
-    def __init__(self, reboot=False, delay=240):
-        self.result = Deferred()
-        self.reboot = reboot
-        self.delay = delay
-        self._data = []
-        self._waiting = True
-
-    def get_data(self):
-        """Get the data printed by the subprocess."""
-        return b"".join(self._data).decode("utf-8", "replace")
-
-    def set_timeout(self, reactor, timeout=10):
-        """
-        Set the error checking timeout, after which C{result}'s callback will
-        be fired.
-        """
-        reactor.call_later(timeout, self._succeed)
-
-    def childDataReceived(self, fd, data):  # noqa: N802
-        """Some data was received from the child.
-
-        Add it to our buffer to pass to C{result} when it's fired.
-        """
-        if self._waiting:
-            self._data.append(data)
-
-    def processEnded(self, reason):  # noqa: N802
-        """Fire back the C{result} L{Deferred}.
-
-        C{result}'s callback will be fired with the string of data received
-        from the subprocess, or if the subprocess failed C{result}'s errback
-        will be fired with the string of data received from the subprocess.
-        """
-        if self._waiting:
-            if reason.check(ProcessDone):
-                self._succeed()
-            else:
-                self.result.errback(ShutdownFailedError(self.get_data()))
-                self._waiting = False
-
-    def _succeed(self):
-        """Fire C{result}'s callback with data accumulated from the process."""
-        if self._waiting:
-            self.result.callback(self.get_data())
-            self._waiting = False
diff --git a/landscape/client/manager/snapmanager.py b/landscape/client/manager/snapmanager.py
index d34bafa..b4214c4 100644
--- a/landscape/client/manager/snapmanager.py
+++ b/landscape/client/manager/snapmanager.py
@@ -3,49 +3,22 @@ from collections import deque
 
 from twisted.internet import task
 
+from landscape.client import snap_http
 from landscape.client.manager.plugin import FAILED
 from landscape.client.manager.plugin import ManagerPlugin
 from landscape.client.manager.plugin import SUCCEEDED
-from landscape.client.snap.http import INCOMPLETE_STATUSES
-from landscape.client.snap.http import SnapdHttpException
-from landscape.client.snap.http import SnapHttp
-from landscape.client.snap.http import SUCCESS_STATUSES
+from landscape.client.snap_http import INCOMPLETE_STATUSES
+from landscape.client.snap_http import SnapdHttpException
+from landscape.client.snap_http import SUCCESS_STATUSES
 
 
-class SnapManager(ManagerPlugin):
-    """
-    Plugin that updates the state of snaps on this machine, installing,
-    removing, refreshing, enabling, and disabling them in response to messages.
-
-    Changes trigger SnapMonitor to send an updated state message immediately.
-    """
+class BaseSnapManager(ManagerPlugin):
+    """Base class that provides machinery for snap manager tasks."""
 
     def __init__(self):
         super().__init__()
 
-        self._snap_http = SnapHttp()
-        self.SNAP_METHODS = {
-            "install-snaps": self._snap_http.install_snap,
-            "install-snaps-batch": self._snap_http.install_snaps,
-            "remove-snaps": self._snap_http.remove_snap,
-            "remove-snaps-batch": self._snap_http.remove_snaps,
-            "refresh-snaps": self._snap_http.refresh_snap,
-            "refresh-snaps-batch": self._snap_http.refresh_snaps,
-            "hold-snaps": self._snap_http.hold_snap,
-            "hold-snaps-batch": self._snap_http.hold_snaps,
-            "unhold-snaps": self._snap_http.unhold_snap,
-            "unhold-snaps-batch": self._snap_http.unhold_snaps,
-        }
-
-    def register(self, registry):
-        super().register(registry)
-        self.config = registry.config
-
-        registry.register_message("install-snaps", self._handle_snap_task)
-        registry.register_message("remove-snaps", self._handle_snap_task)
-        registry.register_message("refresh-snaps", self._handle_snap_task)
-        registry.register_message("hold-snaps", self._handle_snap_task)
-        registry.register_message("unhold-snaps", self._handle_snap_task)
+        self.SNAP_METHODS = {}
 
     def _handle_snap_task(self, message):
         """
@@ -84,7 +57,7 @@ class SnapManager(ManagerPlugin):
                 snaps,
                 **snap_args,
             )
-            queue.append((response["change"], "BATCH"))
+            queue.append((response.change, "BATCH"))
         except SnapdHttpException as e:
             result = e.json["result"]
             logging.error(
@@ -128,7 +101,7 @@ class SnapManager(ManagerPlugin):
                     name,
                     **snap_args,
                 )
-                queue.append((response["change"], name))
+                queue.append((response.change, name))
             except SnapdHttpException as e:
                 result = e.json["result"]
                 logging.error(
@@ -161,7 +134,7 @@ class SnapManager(ManagerPlugin):
             logging.info("Polling snapd for status of pending snap changes")
 
             try:
-                result = self._snap_http.check_changes().get("result", [])
+                result = snap_http.check_changes().result
                 result_dict = {c["id"]: c for c in result}
             except SnapdHttpException as e:
                 logging.error(f"Error checking status of snap changes: {e}")
@@ -206,7 +179,7 @@ class SnapManager(ManagerPlugin):
 
         response = snap_method(*args, **kwargs)
 
-        if "change" not in response:
+        if response.change is None:
             raise SnapdHttpException(response)
 
         return response
@@ -243,17 +216,57 @@ class SnapManager(ManagerPlugin):
 
         logging.debug("Sending snap-action-done response")
 
-        # Kick off an immediate SnapMonitor message as well.
-        self._send_installed_snap_update()
+        # Kick off an immediate monitor message as well.
+        self._send_snap_update()
         return self.registry.broker.send_message(
             message,
             self._session_id,
             True,
         )
 
-    def _send_installed_snap_update(self):
+    def _send_snap_update(self):
+        """Kick off an immediate monitor message."""
+
+
+class SnapManager(BaseSnapManager):
+    """
+    Plugin that updates the state of snaps on this machine, installing,
+    removing, refreshing, enabling, and disabling them in response to messages.
+
+    Changes trigger SnapMonitor to send an updated state message immediately.
+    """
+
+    def __init__(self):
+        super().__init__()
+
+        self.SNAP_METHODS = {
+            "install-snaps": snap_http.install,
+            "install-snaps-batch": snap_http.install_all,
+            "remove-snaps": snap_http.remove,
+            "remove-snaps-batch": snap_http.remove_all,
+            "refresh-snaps": snap_http.refresh,
+            "refresh-snaps-batch": snap_http.refresh_all,
+            "hold-snaps": snap_http.hold,
+            "hold-snaps-batch": snap_http.hold_all,
+            "unhold-snaps": snap_http.unhold,
+            "unhold-snaps-batch": snap_http.unhold_all,
+            "set-snap-config": snap_http.set_conf,
+        }
+
+    def register(self, registry):
+        super().register(registry)
+        self.config = registry.config
+
+        registry.register_message("install-snaps", self._handle_snap_task)
+        registry.register_message("remove-snaps", self._handle_snap_task)
+        registry.register_message("refresh-snaps", self._handle_snap_task)
+        registry.register_message("hold-snaps", self._handle_snap_task)
+        registry.register_message("unhold-snaps", self._handle_snap_task)
+        registry.register_message("set-snap-config", self._handle_snap_task)
+
+    def _send_snap_update(self):
         try:
-            installed_snaps = self._snap_http.get_snaps()
+            installed_snaps = snap_http.list().result
         except SnapdHttpException as e:
             logging.error(
                 f"Unable to list installed snaps after snap change: {e}",
@@ -264,7 +277,7 @@ class SnapManager(ManagerPlugin):
             return self.registry.broker.send_message(
                 {
                     "type": "snaps",
-                    "snaps": installed_snaps,
+                    "snaps": {"installed": installed_snaps},
                 },
                 self._session_id,
                 True,
diff --git a/landscape/client/manager/snapservicesmanager.py b/landscape/client/manager/snapservicesmanager.py
new file mode 100644
index 0000000..149e171
--- /dev/null
+++ b/landscape/client/manager/snapservicesmanager.py
@@ -0,0 +1,60 @@
+import logging
+
+from landscape.client import snap_http
+from landscape.client.manager.snapmanager import BaseSnapManager
+from landscape.client.snap_http import SnapdHttpException
+
+
+class SnapServicesManager(BaseSnapManager):
+    """
+    Plugin that updates the state of snap services on this machine, starting,
+    stopping, restarting, enabling, disabling, and reloading them in response
+    to messages.
+
+    Changes trigger SnapServicesMonitor to send an updated state message
+    immediately.
+    """
+
+    def __init__(self):
+        super().__init__()
+
+        self.SNAP_METHODS = {
+            "start-snap-service": snap_http.start,
+            "start-snap-service-batch": snap_http.start_all,
+            "stop-snap-service": snap_http.stop,
+            "stop-snap-service-batch": snap_http.stop_all,
+            "restart-snap-service": snap_http.restart,
+            "restart-snap-service-batch": snap_http.restart_all,
+        }
+
+    def register(self, registry):
+        super().register(registry)
+        self.config = registry.config
+
+        message_types = [
+            "start-snap-service",
+            "start-snap-service-batch",
+            "stop-snap-service",
+            "stop-snap-service-batch",
+            "restart-snap-service",
+            "restart-snap-service-batch",
+        ]
+        for msg_type in message_types:
+            registry.register_message(msg_type, self._handle_snap_task)
+
+    def _send_snap_update(self):
+        try:
+            services = snap_http.get_apps(services_only=True).result
+        except SnapdHttpException as e:
+            logging.error(f"Unable to list services: {e}")
+            return
+
+        if services:
+            return self.registry.broker.send_message(
+                {
+                    "type": "snap-services",
+                    "services": {"running": services},
+                },
+                self._session_id,
+                True,
+            )
diff --git a/landscape/client/manager/tests/test_aptsources.py b/landscape/client/manager/tests/test_aptsources.py
index 4903594..aa648be 100644
--- a/landscape/client/manager/tests/test_aptsources.py
+++ b/landscape/client/manager/tests/test_aptsources.py
@@ -456,3 +456,46 @@ class AptSourcesTests(LandscapeTest):
         )
 
         return deferred
+
+    def test_run_reporter_snap(self):
+        """After receiving a message, `AptSources` in a snap triggers a
+        reporter run as root to have the new packages reported to the server.
+        """
+        deferred = Deferred()
+
+        def _run_process(command, args, env={}, path=None, uid=None, gid=None):
+            self.assertEqual(
+                find_reporter_command(self.manager.config),
+                command,
+            )
+            self.assertEqual(
+                [
+                    "--force-apt-update",
+                    f"--config={self.manager.config.config}",
+                ],
+                args,
+            )
+            self.assertEqual(uid, 0)
+            self.assertEqual(gid, 0)
+            deferred.callback(("ok", "", 0))
+            return deferred
+
+        self.sourceslist._run_process = _run_process
+
+        with mock.patch.multiple(
+            "landscape.client.manager.aptsources",
+            USER="root",
+            GROUP="root",
+        ):
+            with mock.patch("os.getuid") as getuid:
+                getuid.return_value = 0
+                self.manager.dispatch_message(
+                    {
+                        "type": "apt-sources-replace",
+                        "sources": [],
+                        "gpg-keys": [],
+                        "operation-id": 1,
+                    },
+                )
+
+        return deferred
diff --git a/landscape/client/manager/tests/test_config.py b/landscape/client/manager/tests/test_config.py
index da0c052..085bd09 100644
--- a/landscape/client/manager/tests/test_config.py
+++ b/landscape/client/manager/tests/test_config.py
@@ -21,6 +21,8 @@ class ManagerConfigurationTest(LandscapeTest):
                 "HardwareInfo",
                 "KeystoneToken",
                 "SnapManager",
+                "SnapServicesManager",
+                "UbuntuProInfo",
             ],
             ALL_PLUGINS,
         )
diff --git a/landscape/client/manager/tests/test_processkiller.py b/landscape/client/manager/tests/test_processkiller.py
index ff906cd..f8408f8 100644
--- a/landscape/client/manager/tests/test_processkiller.py
+++ b/landscape/client/manager/tests/test_processkiller.py
@@ -99,7 +99,7 @@ class ProcessKillerTests(LandscapeTest):
         signaller.register(self.manager)
         popen = get_active_process()
         process_info = process_info_factory.get_process_info(popen.pid)
-        self.assertNotEquals(process_info, None)
+        self.assertNotEqual(process_info, None)
         start_time = process_info["start-time"]
 
         self.manager.dispatch_message(
diff --git a/landscape/client/manager/tests/test_scriptexecution.py b/landscape/client/manager/tests/test_scriptexecution.py
index e560f49..043c80d 100644
--- a/landscape/client/manager/tests/test_scriptexecution.py
+++ b/landscape/client/manager/tests/test_scriptexecution.py
@@ -42,7 +42,13 @@ def get_default_environment():
         "USER": username,
         "HOME": home,
     }
-    for var in {"LANG", "LC_ALL", "LC_CTYPE"}:
+    for var in {
+        "LANG",
+        "LC_ALL",
+        "LC_CTYPE",
+        "LD_LIBRARY_PATH",
+        "PYTHONPATH",
+    }:
         if var in os.environ:
             env[var] = os.environ[var]
     return env
@@ -415,9 +421,14 @@ class RunScriptTests(LandscapeTest):
         result.addCallback(check)
         return result
 
-    def _run_script(self, username, uid, gid, path):
-        expected_uid = uid if uid != os.getuid() else None
-        expected_gid = gid if gid != os.getgid() else None
+    def _run_script(self, username, uid, gid, path, from_snap=None):
+
+        if from_snap:
+            expected_gid = None
+            expected_uid = None
+        else:
+            expected_uid = uid if uid != os.getuid() else None
+            expected_gid = gid if gid != os.getgid() else None
 
         factory = StubProcessFactory()
         self.plugin.process_factory = factory
@@ -426,6 +437,7 @@ class RunScriptTests(LandscapeTest):
         patch_chown = mock.patch("os.chown")
         mock_chown = patch_chown.start()
 
+        self.plugin.IS_SNAP = from_snap
         result = self.plugin.run_script("/bin/sh", "echo hi", user=username)
 
         self.assertEqual(len(factory.spawns), 1)
@@ -441,14 +453,18 @@ class RunScriptTests(LandscapeTest):
         protocol.processEnded(Failure(ProcessDone(0)))
 
         def check(result):
-            mock_chown.assert_called_with()
+            if from_snap:
+                mock_chown.assert_not_called()
+            else:
+                mock_chown.assert_called()
+
             self.assertEqual(result, "foobar")
 
         def cleanup(result):
             patch_chown.stop()
             return result
 
-        return result.addErrback(check).addBoth(cleanup)
+        return result.addCallback(check).addBoth(cleanup)
 
     def test_user(self):
         """
@@ -463,7 +479,28 @@ class RunScriptTests(LandscapeTest):
         gid = info.pw_gid
         path = info.pw_dir
 
-        return self._run_script(username, uid, gid, path)
+        if not os.path.exists(path):
+            path = "/"
+
+        return self._run_script(username, uid, gid, path, from_snap=None)
+
+    def test_user_from_snap(self):
+        """
+        Running a script as a particular user calls
+        C{IReactorProcess.spawnProcess} with an appropriate C{uid} argument,
+        with the user's primary group as the C{gid} argument and with the user
+        home as C{path} argument.
+        """
+        uid = os.getuid()
+        info = pwd.getpwuid(uid)
+        username = info.pw_name
+        gid = info.pw_gid
+        path = info.pw_dir
+
+        if not os.path.exists(path):
+            path = "/"
+
+        return self._run_script(username, uid, gid, path, from_snap=True)
 
     def test_user_no_home(self):
         """
diff --git a/landscape/client/manager/tests/test_service.py b/landscape/client/manager/tests/test_service.py
index 91b0211..44b2a32 100644
--- a/landscape/client/manager/tests/test_service.py
+++ b/landscape/client/manager/tests/test_service.py
@@ -1,3 +1,5 @@
+from unittest import mock
+
 from landscape.client.manager.config import ALL_PLUGINS
 from landscape.client.manager.config import ManagerConfiguration
 from landscape.client.manager.processkiller import ProcessKiller
@@ -11,22 +13,31 @@ class ManagerServiceTest(LandscapeTest):
 
     helpers = [FakeBrokerServiceHelper]
 
+    class FakeManagerService(ManagerService):
+        reactor_factory = FakeReactor
+
     def setUp(self):
         super().setUp()
         config = ManagerConfiguration()
         config.load(["-c", self.config_filename])
 
-        class FakeManagerService(ManagerService):
-            reactor_factory = FakeReactor
+        self.service = self.FakeManagerService(config)
 
-        self.service = FakeManagerService(config)
-
-    def test_plugins(self):
+    @mock.patch("dbus.SystemBus")
+    def test_plugins(self, system_bus_mock):
         """
         By default the L{ManagerService.plugins} list holds an instance of
         every enabled manager plugin.
+
+        We mock `dbus` because in some build environments that run these tests,
+        such as buildd, SystemBus is not available.
         """
-        self.assertEqual(len(self.service.plugins), len(ALL_PLUGINS))
+        config = ManagerConfiguration()
+        config.load(["-c", self.config_filename])
+        service = self.FakeManagerService(config)
+
+        self.assertEqual(len(service.plugins), len(ALL_PLUGINS))
+        system_bus_mock.assert_called_once_with()
 
     def test_get_plugins(self):
         """
@@ -37,6 +48,34 @@ class ManagerServiceTest(LandscapeTest):
         [plugin] = self.service.get_plugins()
         self.assertTrue(isinstance(plugin, ProcessKiller))
 
+    def test_get_plugins_module_not_found(self):
+        """If a module is not found, a warning is logged."""
+        self.service.config.load(["--manager-plugins", "TotallyDoesNotExist"])
+
+        with self.assertLogs(level="WARN") as cm:
+            plugins = self.service.get_plugins()
+
+        self.assertEqual(len(plugins), 0)
+        self.assertIn("Invalid manager plugin", cm.output[0])
+        self.assertIn("TotallyDoesNotExist", cm.output[0])
+
+    def test_get_plugins_other_exception(self):
+        """If loading a plugin fails for another reason, a warning is logged,
+        with the exception.
+        """
+        self.service.config.load(["--manager-plugins", "ProcessKiller"])
+
+        with self.assertLogs(level="WARN") as cm:
+            with mock.patch(
+                "landscape.client.manager.service.namedClass",
+            ) as namedClass:
+                namedClass.side_effect = Exception("Is there life on Mars?")
+                plugins = self.service.get_plugins()
+
+        self.assertEqual(len(plugins), 0)
+        self.assertIn("Unable to load", cm.output[0])
+        self.assertIn("Mars?", cm.output[0])
+
     def test_start_service(self):
         """
         The L{ManagerService.startService} method connects to the broker,
diff --git a/landscape/client/manager/tests/test_shutdownmanager.py b/landscape/client/manager/tests/test_shutdownmanager.py
index 4d2a28e..005b0cc 100644
--- a/landscape/client/manager/tests/test_shutdownmanager.py
+++ b/landscape/client/manager/tests/test_shutdownmanager.py
@@ -1,15 +1,10 @@
-from twisted.internet.error import ProcessDone
-from twisted.internet.error import ProcessTerminated
-from twisted.internet.protocol import ProcessProtocol
-from twisted.python.failure import Failure
+from unittest.mock import Mock
+
+import twisted.internet.defer
 
-from landscape.client.manager.plugin import FAILED
-from landscape.client.manager.plugin import SUCCEEDED
 from landscape.client.manager.shutdownmanager import ShutdownManager
-from landscape.client.manager.shutdownmanager import ShutdownProcessProtocol
 from landscape.client.tests.helpers import LandscapeTest
 from landscape.client.tests.helpers import ManagerHelper
-from landscape.lib.testing import StubProcessFactory
 
 
 class ShutdownManagerTest(LandscapeTest):
@@ -18,179 +13,40 @@ class ShutdownManagerTest(LandscapeTest):
 
     def setUp(self):
         super().setUp()
+
         self.broker_service.message_store.set_accepted_types(
             ["shutdown", "operation-result"],
         )
         self.broker_service.pinger.start()
-        self.process_factory = StubProcessFactory()
-        self.plugin = ShutdownManager(process_factory=self.process_factory)
+
+        self.dbus_mock = Mock()
+        self.dbus_sysbus_mock = Mock()
+        self.dbus_mock.get_object.return_value = self.dbus_sysbus_mock
+        self.plugin = ShutdownManager(self.dbus_mock, shutdown_delay=0)
         self.manager.add(self.plugin)
 
-    def test_restart(self):
-        """
-        C{shutdown} processes run until the shutdown is to be performed.  The
-        L{ShutdownProcessProtocol} watches a process for errors, for 10
-        seconds by default, and if none occur the activity is marked as
-        L{SUCCEEDED}.  Data printed by the process is included in the
-        activity's result text.
-        """
+    def test_reboot(self):
         message = {"type": "shutdown", "reboot": True, "operation-id": 100}
-        self.plugin.perform_shutdown(message)
-        [arguments] = self.process_factory.spawns
-        protocol = arguments[0]
-        self.assertTrue(isinstance(protocol, ShutdownProcessProtocol))
-        self.assertEqual(
-            arguments[1:3],
-            (
-                "/sbin/shutdown",
-                [
-                    "/sbin/shutdown",
-                    "-r",
-                    "+4",
-                    "Landscape is rebooting the system",
-                ],
-            ),
-        )
+        deferred = self.plugin._handle_shutdown(message)
 
-        def restart_performed(ignore):
-            self.assertTrue(self.broker_service.exchanger.is_urgent())
-            self.assertEqual(
-                self.broker_service.message_store.get_pending_messages(),
-                [
-                    {
-                        "type": "operation-result",
-                        "api": b"3.2",
-                        "operation-id": 100,
-                        "timestamp": 10,
-                        "status": SUCCEEDED,
-                        "result-text": "Data may arrive in batches.",
-                    },
-                ],
-            )
+        def check(_):
+            self.plugin.dbus_sysbus.get_object.assert_called_once()
+            self.plugin.dbus_sysbus.get_object().Reboot.assert_called_once()
 
-        protocol.result.addCallback(restart_performed)
-        protocol.childDataReceived(0, b"Data may arrive ")
-        protocol.childDataReceived(0, b"in batches.")
-        # We need to advance both reactors to simulate that fact they
-        # are loosely in sync with each other
-        self.broker_service.reactor.advance(10)
-        self.manager.reactor.advance(10)
-        return protocol.result
+        deferred.addCallback(check)
+        return deferred
 
     def test_shutdown(self):
-        """
-        C{shutdown} messages have a flag that indicates whether a reboot or
-        shutdown has been requested.  The C{shutdown} command is called
-        appropriately.
-        """
         message = {"type": "shutdown", "reboot": False, "operation-id": 100}
-        self.plugin.perform_shutdown(message)
-        [arguments] = self.process_factory.spawns
-        self.assertEqual(
-            arguments[1:3],
-            (
-                "/sbin/shutdown",
-                [
-                    "/sbin/shutdown",
-                    "-h",
-                    "+4",
-                    "Landscape is shutting down the system",
-                ],
-            ),
-        )
-
-    def test_restart_fails(self):
-        """
-        If an error occurs before the error checking timeout the activity will
-        be failed.  Data printed by the process prior to the failure is
-        included in the activity's result text.
-        """
-        message = {"type": "shutdown", "reboot": True, "operation-id": 100}
-        self.plugin.perform_shutdown(message)
-
-        def restart_failed(message_id):
-            self.assertTrue(self.broker_service.exchanger.is_urgent())
-            messages = self.broker_service.message_store.get_pending_messages()
-            self.assertEqual(len(messages), 1)
-            message = messages[0]
-            self.assertEqual(message["type"], "operation-result")
-            self.assertEqual(message["api"], b"3.2")
-            self.assertEqual(message["operation-id"], 100)
-            self.assertEqual(message["timestamp"], 0)
-            self.assertEqual(message["status"], FAILED)
-            self.assertIn("Failure text is reported.", message["result-text"])
-
-            # Check that after failing, we attempt to force the shutdown by
-            # switching the binary called
-            [spawn1_args, spawn2_args] = self.process_factory.spawns
-            protocol = spawn2_args[0]
-            self.assertIsInstance(protocol, ProcessProtocol)
-            self.assertEqual(
-                spawn2_args[1:3],
-                ("/sbin/reboot", ["/sbin/reboot"]),
-            )
-
-        [arguments] = self.process_factory.spawns
-        protocol = arguments[0]
-        protocol.result.addCallback(restart_failed)
-        protocol.childDataReceived(0, b"Failure text is reported.")
-        protocol.processEnded(Failure(ProcessTerminated(exitCode=1)))
-        return protocol.result
+        deferred = self.plugin._handle_shutdown(message)
 
-    def test_process_ends_after_timeout(self):
-        """
-        If the process ends after the error checking timeout has passed
-        C{result} will not be re-fired.
-        """
-        message = {"type": "shutdown", "reboot": False, "operation-id": 100}
-        self.plugin.perform_shutdown(message)
-
-        stash = []
-
-        def restart_performed(ignore):
-            self.assertEqual(stash, [])
-            stash.append(True)
-
-        [arguments] = self.process_factory.spawns
-        protocol = arguments[0]
-        protocol.result.addCallback(restart_performed)
-        self.manager.reactor.advance(10)
-        protocol.processEnded(Failure(ProcessTerminated(exitCode=1)))
-        return protocol.result
-
-    def test_process_data_is_not_collected_after_firing_result(self):
-        """
-        Data printed in the sub-process is not collected after C{result} has
-        been fired.
-        """
-        message = {"type": "shutdown", "reboot": False, "operation-id": 100}
-        self.plugin.perform_shutdown(message)
-
-        [arguments] = self.process_factory.spawns
-        protocol = arguments[0]
-        protocol.childDataReceived(0, b"Data may arrive ")
-        protocol.childDataReceived(0, b"in batches.")
-        self.manager.reactor.advance(10)
-        self.assertEqual(protocol.get_data(), "Data may arrive in batches.")
-        protocol.childDataReceived(0, b"Even when you least expect it.")
-        self.assertEqual(protocol.get_data(), "Data may arrive in batches.")
-
-    def test_restart_stops_exchanger(self):
-        """
-        After a successful shutdown, the broker stops processing new messages.
-        """
-        message = {"type": "shutdown", "reboot": False, "operation-id": 100}
-        self.plugin.perform_shutdown(message)
+        def check(_):
+            self.plugin.dbus_sysbus.get_object.assert_called_once()
+            self.plugin.dbus_sysbus.get_object().PowerOff.assert_called_once()
 
-        [arguments] = self.process_factory.spawns
-        protocol = arguments[0]
-        protocol.processEnded(Failure(ProcessDone(status=0)))
-        self.broker_service.reactor.advance(100)
-        self.manager.reactor.advance(100)
+        self.plugin.shutdown_deferred.addCallback(check)
+        return deferred
 
-        # New messages will not be exchanged after a reboot process is in
-        # process.
-        self.manager.broker.exchanger.schedule_exchange()
-        payloads = self.manager.broker.exchanger._transport.payloads
-        self.assertEqual(0, len(payloads))
-        return protocol.result
+    def test_shutdown_failed(self):
+        deferred = self.plugin._respond_fail("", 100)
+        self.assertIsInstance(deferred, twisted.internet.defer.Deferred)
diff --git a/landscape/client/manager/tests/test_snapmanager.py b/landscape/client/manager/tests/test_snapmanager.py
index 1ce52f1..70cd6c3 100644
--- a/landscape/client/manager/tests/test_snapmanager.py
+++ b/landscape/client/manager/tests/test_snapmanager.py
@@ -3,8 +3,8 @@ from unittest import mock
 from landscape.client.manager.manager import FAILED
 from landscape.client.manager.manager import SUCCEEDED
 from landscape.client.manager.snapmanager import SnapManager
-from landscape.client.snap.http import SnapdHttpException
-from landscape.client.snap.http import SnapHttp as OrigSnapHttp
+from landscape.client.snap_http import SnapdHttpException
+from landscape.client.snap_http import SnapdResponse
 from landscape.client.tests.helpers import LandscapeTest
 from landscape.client.tests.helpers import ManagerHelper
 
@@ -15,13 +15,10 @@ class SnapManagerTest(LandscapeTest):
     def setUp(self):
         super().setUp()
 
-        self.snap_http = mock.Mock(spec_set=OrigSnapHttp)
-        self.SnapHttp = mock.patch(
-            "landscape.client.manager.snapmanager.SnapHttp",
+        self.snap_http = mock.patch(
+            "landscape.client.manager.snapmanager.snap_http",
         ).start()
 
-        self.SnapHttp.return_value = self.snap_http
-
         self.broker_service.message_store.set_accepted_types(
             ["operation-result"],
         )
@@ -42,34 +39,37 @@ class SnapManagerTest(LandscapeTest):
 
         def install_snap(name, revision=None, channel=None, classic=False):
             if name == "hello":
-                return {"change": "1"}
+                return SnapdResponse("async", 200, "OK", None, change="1")
 
             if name == "goodbye":
-                return {"change": "2"}
+                return SnapdResponse("async", 200, "OK", None, change="2")
 
             return mock.DEFAULT
 
-        self.snap_http.install_snap.side_effect = install_snap
-        self.snap_http.check_changes.return_value = {
-            "result": [
+        self.snap_http.install.side_effect = install_snap
+        self.snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            "200",
+            "OK",
+            [
                 {"id": "1", "status": "Done"},
                 {"id": "2", "status": "Done"},
             ],
-        }
-        self.snap_http.get_snaps.return_value = {"installed": []}
+        )
+        self.snap_http.list.return_value = SnapdResponse("sync", 200, "OK", [])
 
         result = self.manager.dispatch_message(
             {
                 "type": "install-snaps",
                 "operation-id": 123,
                 "snaps": [
-                    {"name": "hello", "revision": 9001},
+                    {"name": "hello", "args": {"revision": 9001}},
                     {"name": "goodbye"},
                 ],
             },
         )
 
-        def got_result(r):
+        def got_result(_):
             self.assertMessages(
                 self.broker_service.message_store.get_pending_messages(),
                 [
@@ -90,12 +90,24 @@ class SnapManagerTest(LandscapeTest):
         When no channels or revisions are specified, snaps are installed
         via a single call to snapd.
         """
-        self.snap_http.install_snaps.return_value = {"change": "1"}
-        self.snap_http.check_changes.return_value = {
-            "result": [{"id": "1", "status": "Done"}],
-        }
-        self.snap_http.get_snaps.return_value = {
-            "installed": [
+        self.snap_http.install_all.return_value = SnapdResponse(
+            "async",
+            202,
+            "Accepted",
+            None,
+            change="1",
+        )
+        self.snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [{"id": "1", "status": "Done"}],
+        )
+        self.snap_http.list.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [
                 {
                     "name": "hello",
                     "id": "test",
@@ -106,7 +118,7 @@ class SnapManagerTest(LandscapeTest):
                     "version": "1.2.3",
                 },
             ],
-        }
+        )
 
         result = self.manager.dispatch_message(
             {
@@ -119,7 +131,7 @@ class SnapManagerTest(LandscapeTest):
             },
         )
 
-        def got_result(r):
+        def got_result(_):
             self.assertMessages(
                 self.broker_service.message_store.get_pending_messages(),
                 [
@@ -136,10 +148,10 @@ class SnapManagerTest(LandscapeTest):
         return result.addCallback(got_result)
 
     def test_install_snap_immediate_error(self):
-        self.snap_http.install_snaps.side_effect = SnapdHttpException(
+        self.snap_http.install_all.side_effect = SnapdHttpException(
             b'{"result": "whoops"}',
         )
-        self.snap_http.get_snaps.return_value = {"installed": []}
+        self.snap_http.list.return_value = SnapdResponse("sync", 200, "OK", [])
 
         result = self.manager.dispatch_message(
             {
@@ -151,7 +163,7 @@ class SnapManagerTest(LandscapeTest):
 
         self.log_helper.ignore_errors(r".+whoops$")
 
-        def got_result(r):
+        def got_result(_):
             self.assertMessages(
                 self.broker_service.message_store.get_pending_messages(),
                 [
@@ -168,9 +180,20 @@ class SnapManagerTest(LandscapeTest):
         return result.addCallback(got_result)
 
     def test_install_snap_no_status(self):
-        self.snap_http.install_snaps.return_value = {"change": "1"}
-        self.snap_http.check_changes.return_value = {"result": []}
-        self.snap_http.get_snaps.return_value = {"installed": []}
+        self.snap_http.install_all.return_value = SnapdResponse(
+            "async",
+            202,
+            "Accepted",
+            None,
+            change="1",
+        )
+        self.snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [],
+        )
+        self.snap_http.list.return_value = SnapdResponse("sync", 200, "OK", [])
 
         result = self.manager.dispatch_message(
             {
@@ -180,7 +203,7 @@ class SnapManagerTest(LandscapeTest):
             },
         )
 
-        def got_result(r):
+        def got_result(_):
             self.assertMessages(
                 self.broker_service.message_store.get_pending_messages(),
                 [
@@ -197,9 +220,15 @@ class SnapManagerTest(LandscapeTest):
         return result.addCallback(got_result)
 
     def test_install_snap_check_error(self):
-        self.snap_http.install_snaps.return_value = {"change": "1"}
+        self.snap_http.install_all.return_value = SnapdResponse(
+            "async",
+            200,
+            "Accepted",
+            None,
+            change="1",
+        )
         self.snap_http.check_changes.side_effect = SnapdHttpException("whoops")
-        self.snap_http.get_snaps.return_value = {"installed": []}
+        self.snap_http.list.return_value = SnapdResponse("sync", 200, "OK", [])
 
         result = self.manager.dispatch_message(
             {
@@ -211,7 +240,7 @@ class SnapManagerTest(LandscapeTest):
 
         self.log_helper.ignore_errors(r".+whoops$")
 
-        def got_result(r):
+        def got_result(_):
             self.assertMessages(
                 self.broker_service.message_store.get_pending_messages(),
                 [
@@ -228,11 +257,20 @@ class SnapManagerTest(LandscapeTest):
         return result.addCallback(got_result)
 
     def test_remove_snap(self):
-        self.snap_http.remove_snaps.return_value = {"change": "1"}
-        self.snap_http.check_changes.return_value = {
-            "result": [{"id": "1", "status": "Done"}],
-        }
-        self.snap_http.get_snaps.return_value = {"installed": []}
+        self.snap_http.remove_all.return_value = SnapdResponse(
+            "async",
+            202,
+            "Accepted",
+            None,
+            change="1",
+        )
+        self.snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [{"id": "1", "status": "Done"}],
+        )
+        self.snap_http.list.return_value = SnapdResponse("sync", 200, "OK", [])
 
         result = self.manager.dispatch_message(
             {
@@ -242,7 +280,7 @@ class SnapManagerTest(LandscapeTest):
             },
         )
 
-        def got_result(r):
+        def got_result(_):
             self.assertMessages(
                 self.broker_service.message_store.get_pending_messages(),
                 [
@@ -257,3 +295,89 @@ class SnapManagerTest(LandscapeTest):
             )
 
         return result.addCallback(got_result)
+
+    def test_set_config(self):
+        self.snap_http.set_conf.return_value = SnapdResponse(
+            "async",
+            202,
+            "Accepted",
+            None,
+            change="1",
+        )
+        self.snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            "200",
+            "OK",
+            [{"id": "1", "status": "Done"}],
+        )
+        self.snap_http.list.return_value = SnapdResponse("sync", 200, "OK", [])
+
+        result = self.manager.dispatch_message(
+            {
+                "type": "set-snap-config",
+                "operation-id": 123,
+                "snaps": [
+                    {
+                        "name": "hello",
+                        "args": {
+                            "config": {"foo": {"bar": "qux", "baz": "quux"}},
+                        },
+                    },
+                ],
+            },
+        )
+
+        def got_result(_):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [
+                    {
+                        "type": "operation-result",
+                        "status": SUCCEEDED,
+                        "result-text": "{'completed': ['hello'], "
+                        "'errored': [], 'errors': {}}",
+                        "operation-id": 123,
+                    },
+                ],
+            )
+
+        return result.addCallback(got_result)
+
+    def test_set_config_sync_error(self):
+        self.snap_http.set_conf.side_effect = SnapdHttpException(
+            b'{"result": "whoops"}',
+        )
+        self.snap_http.list.return_value = SnapdResponse("sync", 200, "OK", [])
+
+        result = self.manager.dispatch_message(
+            {
+                "type": "set-snap-config",
+                "operation-id": 123,
+                "snaps": [
+                    {
+                        "name": "hello",
+                        "args": {
+                            "config": {"foo": {"bar": "qux", "baz": "quux"}},
+                        },
+                    },
+                ],
+            },
+        )
+
+        def got_result(_):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [
+                    {
+                        "type": "operation-result",
+                        "status": FAILED,
+                        "result-text": (
+                            "{'completed': [], 'errored': [], "
+                            "'errors': {'hello': 'whoops'}}"
+                        ),
+                        "operation-id": 123,
+                    },
+                ],
+            )
+
+        return result.addCallback(got_result)
diff --git a/landscape/client/manager/tests/test_snapservicesmanager.py b/landscape/client/manager/tests/test_snapservicesmanager.py
new file mode 100644
index 0000000..6198f6c
--- /dev/null
+++ b/landscape/client/manager/tests/test_snapservicesmanager.py
@@ -0,0 +1,333 @@
+import sys
+from unittest import mock
+
+from landscape.client.manager.manager import FAILED
+from landscape.client.manager.manager import SUCCEEDED
+from landscape.client.manager.snapservicesmanager import SnapServicesManager
+from landscape.client.snap_http import SnapdHttpException
+from landscape.client.snap_http import SnapdResponse
+from landscape.client.tests.helpers import LandscapeTest
+from landscape.client.tests.helpers import ManagerHelper
+
+
+class SnapServicesManagerTest(LandscapeTest):
+    helpers = [ManagerHelper]
+
+    def setUp(self):
+        super().setUp()
+
+        self.snap_http = mock.patch(
+            "landscape.client.manager.snapservicesmanager.snap_http",
+        ).start()
+
+        self.broker_service.message_store.set_accepted_types(
+            ["operation-result"],
+        )
+        self.plugin = SnapServicesManager()
+        self.manager.add(self.plugin)
+
+        self.manager.config.snapd_poll_attempts = 2
+        self.manager.config.snapd_poll_interval = 0.1
+
+    def tearDown(self):
+        mock.patch.stopall()
+
+    @mock.patch("landscape.client.manager.snapmanager.snap_http")
+    def test_start_service(self, mock_base_snap_http):
+        self.snap_http.start.return_value = SnapdResponse(
+            "async",
+            202,
+            "Accepted",
+            None,
+            change="1",
+        )
+        mock_base_snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [{"id": "1", "status": "Done"}],
+        )
+        self.snap_http.get_apps.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [
+                {
+                    "snap": "test-snap",
+                    "name": "bye-svc",
+                    "daemon": "simple",
+                    "daemon-scope": "system",
+                    "enabled": True,
+                },
+            ],
+        )
+
+        result = self.manager.dispatch_message(
+            {
+                "type": "start-snap-service",
+                "operation-id": 123,
+                "snaps": [
+                    {"name": "test-snap.hello-svc", "args": {"enable": True}},
+                ],
+            },
+        )
+
+        def got_result(_):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [
+                    {
+                        "type": "operation-result",
+                        "status": SUCCEEDED,
+                        "result-text": "{'completed': ['test-snap.hello-svc'],"
+                        " 'errored': [], 'errors': {}}",
+                        "operation-id": 123,
+                    },
+                ],
+            )
+
+        self.snap_http.start.assert_called_once_with(
+            "test-snap.hello-svc",
+            enable=True,
+        )
+
+        return result.addCallback(got_result)
+
+    def test_start_service_error(self):
+        self.snap_http.start.side_effect = SnapdHttpException(
+            b'{"result": "snap idonotexist not found"}',
+        )
+        self.snap_http.get_apps.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [],
+        )
+
+        result = self.manager.dispatch_message(
+            {
+                "type": "start-snap-service",
+                "operation-id": 123,
+                "snaps": [{"name": "idonotexist", "args": {"enable": True}}],
+            },
+        )
+
+        self.log_helper.ignore_errors(r".+idonotexist$")
+
+        def got_result(_):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [
+                    {
+                        "type": "operation-result",
+                        "status": FAILED,
+                        "result-text": "{'completed': [], "
+                        "'errored': [], 'errors': {'idonotexist': "
+                        "'snap idonotexist not found'}}",
+                        "operation-id": 123,
+                    },
+                ],
+            )
+
+        self.snap_http.start.assert_called_once_with(
+            "idonotexist",
+            enable=True,
+        )
+
+        return result.addCallback(got_result)
+
+    @mock.patch("landscape.client.manager.snapmanager.snap_http")
+    def test_stop_service_batch(self, mock_base_snap_http):
+        self.snap_http.stop_all.return_value = SnapdResponse(
+            "async",
+            202,
+            "Accepted",
+            None,
+            change="1",
+        )
+        mock_base_snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [{"id": "1", "status": "Done"}],
+        )
+        self.snap_http.get_apps.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [
+                {
+                    "snap": "lxd",
+                    "name": "lxd",
+                    "daemon": "simple",
+                    "daemon-scope": "system",
+                },
+                {
+                    "snap": "landscape-client",
+                    "name": "landscape-client",
+                    "daemon": "simple",
+                    "daemon-scope": "system",
+                },
+            ],
+        )
+
+        result = self.manager.dispatch_message(
+            {
+                "type": "stop-snap-service",
+                "operation-id": 123,
+                "snaps": [
+                    {"name": "lxd"},
+                    {"name": "landscape-client"},
+                ],
+                "args": {"disable": False},
+            },
+        )
+
+        def got_result(_):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [
+                    {
+                        "type": "operation-result",
+                        "status": SUCCEEDED,
+                        "result-text": "{'completed': ['BATCH'], "
+                        "'errored': [], 'errors': {}}",
+                        "operation-id": 123,
+                    },
+                ],
+            )
+
+        self.snap_http.stop_all.assert_called_once_with(
+            ["lxd", "landscape-client"],
+            disable=False,
+        )
+
+        return result.addCallback(got_result)
+
+    @mock.patch("landscape.client.manager.snapmanager.snap_http")
+    def test_restart_service(self, mock_base_snap_http):
+        self.snap_http.restart_all.return_value = SnapdResponse(
+            "async",
+            202,
+            "Accepted",
+            None,
+            change="1",
+        )
+        mock_base_snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [{"id": "1", "status": "Done"}],
+        )
+        self.snap_http.get_apps.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [
+                {
+                    "snap": "lxd",
+                    "name": "lxd",
+                    "daemon": "simple",
+                    "daemon-scope": "system",
+                },
+                {
+                    "snap": "test-snap",
+                    "name": "bye-svc",
+                    "daemon": "simple",
+                    "daemon-scope": "system",
+                },
+            ],
+        )
+
+        result = self.manager.dispatch_message(
+            {
+                "type": "restart-snap-service",
+                "operation-id": 123,
+                "snaps": [
+                    {"name": "test-snap"},
+                    {"name": "lxd"},
+                ],
+            },
+        )
+
+        def got_result(_):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [
+                    {
+                        "type": "operation-result",
+                        "status": SUCCEEDED,
+                        "result-text": "{'completed': ['BATCH'], "
+                        "'errored': [], 'errors': {}}",
+                        "operation-id": 123,
+                    },
+                ],
+            )
+
+        self.snap_http.restart_all.assert_called_once_with(
+            ["test-snap", "lxd"],
+        )
+
+        return result.addCallback(got_result)
+
+    @mock.patch("landscape.client.manager.snapmanager.snap_http")
+    def test_restart_service_update_failure(self, mock_base_snap_http):
+        """
+        Test when the client runs the operation successfully but
+         `_send_snap_update` fails.
+        """
+        self.snap_http.restart_all.return_value = SnapdResponse(
+            "async",
+            202,
+            "Accepted",
+            None,
+            change="1",
+        )
+        mock_base_snap_http.check_changes.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [{"id": "1", "status": "Done"}],
+        )
+        self.snap_http.get_apps.side_effect = SnapdHttpException(
+            "An error occurred.",
+        )
+        mock_logger = mock.Mock()
+        self.patch(sys.modules["logging"], "error", mock_logger)
+
+        result = self.manager.dispatch_message(
+            {
+                "type": "restart-snap-service",
+                "operation-id": 123,
+                "snaps": [
+                    {"name": "test-snap"},
+                    {"name": "lxd"},
+                ],
+            },
+        )
+
+        self.log_helper.ignore_errors(r".+error$")
+
+        def got_result(_):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [
+                    {
+                        "type": "operation-result",
+                        "status": SUCCEEDED,
+                        "result-text": "{'completed': ['BATCH'], "
+                        "'errored': [], 'errors': {}}",
+                        "operation-id": 123,
+                    },
+                ],
+            )
+
+            mock_logger.assert_called_once_with(
+                "Unable to list services: An error occurred.",
+            )
+
+        self.snap_http.restart_all.assert_called_once_with(
+            ["test-snap", "lxd"],
+        )
+
+        return result.addCallback(got_result)
diff --git a/landscape/client/manager/tests/test_ubuntuproinfo.py b/landscape/client/manager/tests/test_ubuntuproinfo.py
new file mode 100644
index 0000000..10c60eb
--- /dev/null
+++ b/landscape/client/manager/tests/test_ubuntuproinfo.py
@@ -0,0 +1,151 @@
+from unittest import mock
+
+from landscape.client.manager.ubuntuproinfo import get_ubuntu_pro_info
+from landscape.client.manager.ubuntuproinfo import UbuntuProInfo
+from landscape.client.tests.helpers import LandscapeTest
+from landscape.client.tests.helpers import MonitorHelper
+
+
+class UbuntuProInfoTest(LandscapeTest):
+    """Ubuntu Pro info plugin tests."""
+
+    helpers = [MonitorHelper]
+
+    def setUp(self):
+        super().setUp()
+        self.mstore.set_accepted_types(["ubuntu-pro-info"])
+
+    def test_ubuntu_pro_info(self):
+        """Tests calling `ua status`."""
+        plugin = UbuntuProInfo()
+
+        with mock.patch("subprocess.run") as run_mock:
+            run_mock.return_value = mock.Mock(
+                stdout='"This is a test"',
+            )
+            self.monitor.add(plugin)
+            plugin.run()
+
+        run_mock.assert_called()
+        messages = self.mstore.get_pending_messages()
+        self.assertTrue(len(messages) > 0)
+        self.assertTrue("ubuntu-pro-info" in messages[0])
+        self.assertEqual(messages[0]["ubuntu-pro-info"], '"This is a test"')
+
+    def test_ubuntu_pro_info_no_pro(self):
+        """Tests calling `pro status` when it is not installed."""
+        plugin = UbuntuProInfo()
+        self.monitor.add(plugin)
+
+        with mock.patch("subprocess.run") as run_mock:
+            run_mock.side_effect = FileNotFoundError()
+            plugin.run()
+
+        messages = self.mstore.get_pending_messages()
+        run_mock.assert_called_once()
+        self.assertTrue(len(messages) > 0)
+        self.assertTrue("ubuntu-pro-info" in messages[0])
+        self.assertIn("errors", messages[0]["ubuntu-pro-info"])
+
+    def test_get_ubuntu_pro_info_core(self):
+        """In Ubuntu Core, there is no pro info, so return a reasonable erro
+        message.
+        """
+        with mock.patch(
+            "landscape.client.manager.ubuntuproinfo.IS_CORE",
+            new="1",
+        ):
+            result = get_ubuntu_pro_info()
+
+        self.assertIn("errors", result)
+        self.assertIn("not available", result["errors"][0]["message"])
+        self.assertEqual(result["result"], "failure")
+
+    def test_persistence_unchanged_data(self):
+        """If data hasn't changed, a new message is not sent"""
+        plugin = UbuntuProInfo()
+        self.monitor.add(plugin)
+        data = '"Initial data!"'
+
+        with mock.patch("subprocess.run") as run_mock:
+            run_mock.return_value = mock.Mock(
+                stdout=data,
+            )
+            plugin.run()
+
+        messages = self.mstore.get_pending_messages()
+        run_mock.assert_called_once()
+        self.assertEqual(1, len(messages))
+        self.assertTrue("ubuntu-pro-info" in messages[0])
+        self.assertEqual(messages[0]["ubuntu-pro-info"], data)
+
+        with mock.patch("subprocess.run") as run_mock:
+            run_mock.return_value = mock.Mock(
+                stdout=data,
+            )
+            plugin.run()
+
+        run_mock.assert_called_once()
+        messages = self.mstore.get_pending_messages()
+        self.assertEqual(1, len(messages))
+
+    def test_persistence_changed_data(self):
+        """New data will be sent in a new message in the queue"""
+        plugin = UbuntuProInfo()
+        self.monitor.add(plugin)
+
+        with mock.patch("subprocess.run") as run_mock:
+            run_mock.return_value = mock.Mock(
+                stdout='"Initial data!"',
+            )
+            plugin.run()
+
+        messages = self.mstore.get_pending_messages()
+        run_mock.assert_called_once()
+        self.assertEqual(1, len(messages))
+        self.assertTrue("ubuntu-pro-info" in messages[0])
+        self.assertEqual(messages[0]["ubuntu-pro-info"], '"Initial data!"')
+
+        with mock.patch("subprocess.run") as run_mock:
+            run_mock.return_value = mock.Mock(
+                stdout='"New data!"',
+            )
+            plugin.run()
+
+        run_mock.assert_called_once()
+        messages = self.mstore.get_pending_messages()
+        self.assertEqual(2, len(messages))
+        self.assertEqual(messages[1]["ubuntu-pro-info"], '"New data!"')
+
+    def test_persistence_reset(self):
+        """Resetting the plugin will allow a message with identical data to
+        be sent"""
+        plugin = UbuntuProInfo()
+        self.monitor.add(plugin)
+        data = '"Initial data!"'
+
+        with mock.patch("subprocess.run") as run_mock:
+            run_mock.return_value = mock.Mock(
+                stdout=data,
+            )
+            plugin.run()
+
+        messages = self.mstore.get_pending_messages()
+        run_mock.assert_called_once()
+        self.assertEqual(1, len(messages))
+        self.assertTrue("ubuntu-pro-info" in messages[0])
+        self.assertEqual(messages[0]["ubuntu-pro-info"], data)
+
+        plugin._reset()
+
+        with mock.patch("subprocess.run") as run_mock:
+            run_mock.return_value = mock.Mock(
+                stdout=data,
+            )
+            plugin.run()
+
+        run_mock.assert_called_once()
+        messages = self.mstore.get_pending_messages()
+        self.assertEqual(2, len(messages))
+        self.assertTrue("ubuntu-pro-info" in messages[1])
+        self.assertEqual(messages[1]["ubuntu-pro-info"], data)
diff --git a/landscape/client/manager/tests/test_usermanager.py b/landscape/client/manager/tests/test_usermanager.py
index fe02d03..d4742c5 100644
--- a/landscape/client/manager/tests/test_usermanager.py
+++ b/landscape/client/manager/tests/test_usermanager.py
@@ -1,5 +1,6 @@
 import os
 from unittest.mock import Mock
+from unittest.mock import patch
 
 from landscape.client.manager.plugin import FAILED
 from landscape.client.manager.plugin import SUCCEEDED
@@ -9,6 +10,7 @@ from landscape.client.monitor.usermonitor import UserMonitor
 from landscape.client.tests.helpers import LandscapeTest
 from landscape.client.tests.helpers import ManagerHelper
 from landscape.client.user.provider import UserManagementError
+from landscape.client.user.tests.helpers import FakeSnapdUserManagement
 from landscape.client.user.tests.helpers import FakeUserManagement
 from landscape.client.user.tests.helpers import FakeUserProvider
 from landscape.lib.persist import Persist
@@ -30,20 +32,25 @@ sbarnes:$1$q7sz09uw$q.A3526M/SHu8vUb.Jo1A/:13349:0:99999:7:::
         )
         accepted_types = ["operation-result", "users"]
         self.broker_service.message_store.set_accepted_types(accepted_types)
+        self.plugins = []
 
     def tearDown(self):
         super().tearDown()
         for plugin in self.plugins:
             plugin.stop()
 
-    def setup_environment(self, users, groups, shadow_file):
+    def setup_environment(self, users, groups, shadow_file, is_core=False):
         provider = FakeUserProvider(
             users=users,
             groups=groups,
             shadow_file=shadow_file,
         )
         user_monitor = UserMonitor(provider=provider)
-        management = FakeUserManagement(provider=provider)
+
+        if is_core:
+            management = FakeSnapdUserManagement(provider=provider)
+        else:
+            management = FakeUserManagement(provider=provider)
         user_manager = UserManager(
             management=management,
             shadow_file=shadow_file,
@@ -378,6 +385,64 @@ class UserOperationsMessagingTest(UserGroupTestBase):
         result.addCallback(handle_callback)
         return result
 
+    @patch("landscape.client.manager.usermanager.IS_CORE", "1")
+    def test_add_user_event_on_core(self):
+        """
+        When an C{add-user} event is received the user should be
+        added. Two messages should be generated: a C{users} message
+        with details about the change and an C{operation-result} with
+        details of the outcome of the operation.
+        """
+
+        def handle_callback(result):
+            messages = self.broker_service.message_store.get_pending_messages()
+            self.assertMessages(
+                messages,
+                [
+                    {
+                        "type": "operation-result",
+                        "status": SUCCEEDED,
+                        "operation-id": 123,
+                        "timestamp": 0,
+                        "result-text": "add_user succeeded",
+                    },
+                    {
+                        "timestamp": 0,
+                        "type": "users",
+                        "operation-id": 123,
+                        "create-users": [
+                            {
+                                "home-phone": None,
+                                "username": "john-doe",
+                                "uid": 1000,
+                                "enabled": True,
+                                "location": None,
+                                "work-phone": None,
+                                "name": "[e-mail]",
+                                "primary-gid": 1000,
+                            },
+                        ],
+                    },
+                ],
+            )
+
+        shadow_file = self.makeFile("""st3v3nmw:*:19758:0:99999:7:::""")
+        self.setup_environment([], [], shadow_file, is_core=True)
+
+        result = self.manager.dispatch_message(
+            {
+                "type": "add-user",
+                "username": "john-doe",
+                "email": "[e-mail]",
+                "sudoer": False,
+                "force-managed": True,
+                "operation-id": 123,
+            },
+        )
+
+        result.addCallback(handle_callback)
+        return result
+
     def test_edit_user_event(self):
         """
         When a C{edit-user} message is received the user should be
@@ -834,6 +899,71 @@ class UserOperationsMessagingTest(UserGroupTestBase):
         result.addCallback(handle_callback)
         return result
 
+    @patch("landscape.client.manager.usermanager.IS_CORE", "1")
+    def test_remove_user_event_on_core(self):
+        """
+        When a C{remove-user} event is received, the user should be removed.
+        Two messages should be generated: a C{users} message with details
+        about the change and an C{operation-result} with details of the
+        outcome of the operation.
+        """
+
+        def handle_callback(result):
+            messages = self.broker_service.message_store.get_pending_messages()
+            self.assertEqual(len(messages), 3)
+            # Ignore the message created by plugin.run.
+            self.assertMessages(
+                [messages[2], messages[1]],
+                [
+                    {
+                        "timestamp": 0,
+                        "delete-users": ["john-doe"],
+                        "type": "users",
+                        "operation-id": 39,
+                    },
+                    {
+                        "type": "operation-result",
+                        "status": SUCCEEDED,
+                        "operation-id": 39,
+                        "timestamp": 0,
+                        "result-text": "remove_user succeeded",
+                    },
+                ],
+            )
+
+        users = [
+            (
+                "john-doe",
+                "x",
+                1000,
+                1000,
+                "[e-mail],BtrGAhK,,",
+                "/home/user",
+                "/bin/zsh",
+            ),
+            (
+                "jane-doe",
+                "x",
+                1001,
+                1001,
+                "[e-mail],BtrGAhK,,",
+                "/home/user",
+                "/bin/zsh",
+            ),
+        ]
+        shadow_file = self.makeFile("""st3v3nmw:*:19758:0:99999:7:::""")
+        self.setup_environment(users, [], shadow_file, is_core=True)
+        result = self.manager.dispatch_message(
+            {
+                "username": "john-doe",
+                "delete-home": True,
+                "type": "remove-user",
+                "operation-id": 39,
+            },
+        )
+        result.addCallback(handle_callback)
+        return result
+
     def test_lock_user_event(self):
         """
         When a C{lock-user} event is received the user should be
diff --git a/landscape/client/manager/ubuntuproinfo.py b/landscape/client/manager/ubuntuproinfo.py
new file mode 100644
index 0000000..1881c34
--- /dev/null
+++ b/landscape/client/manager/ubuntuproinfo.py
@@ -0,0 +1,102 @@
+import json
+import subprocess
+from pathlib import Path
+
+from landscape.client import IS_CORE
+from landscape.client.manager.plugin import ManagerPlugin
+from landscape.lib.persist import Persist
+
+
+class UbuntuProInfo(ManagerPlugin):
+    """
+    Plugin that captures and reports Ubuntu Pro registration
+    information.
+
+    We use the `pro` CLI with output formatted as JSON. This is sent
+    as-is and parsed by Landscape Server because the JSON content is
+    considered "Experimental" and we don't want to have to change in
+    both Client and Server in the event that the format changes.
+    """
+
+    message_type = "ubuntu-pro-info"
+    run_interval = 900  # 15 minutes
+
+    def register(self, registry):
+        super().register(registry)
+        self._persist_filename = Path(
+            self.registry.config.data_path,
+            "ubuntu-pro-info.bpickle",
+        )
+        self._persist = Persist(filename=self._persist_filename)
+        self.call_on_accepted(self.message_type, self.send_message)
+
+    def run(self):
+        return self.registry.broker.call_if_accepted(
+            self.message_type,
+            self.send_message,
+        )
+
+    def send_message(self):
+        """Send a message to the broker if the data has changed since the last
+        call"""
+        result = self.get_data()
+        if not result:
+            return
+        message = {"type": self.message_type, "ubuntu-pro-info": result}
+        return self.registry.broker.send_message(message, self._session_id)
+
+    def get_data(self):
+        """Persist data to avoid sending messages if result hasn't changed"""
+        ubuntu_pro_info = get_ubuntu_pro_info()
+
+        if self._persist.get("data") != ubuntu_pro_info:
+            self._persist.set("data", ubuntu_pro_info)
+            return json.dumps(ubuntu_pro_info, separators=(",", ":"))
+
+    def _reset(self):
+        """Reset the persist."""
+        self._persist.remove("data")
+
+
+def get_ubuntu_pro_info() -> dict:
+    """Query ua tools for Ubuntu Pro status as JSON, parsing it to a dict.
+
+    If we are running on Ubuntu Core, Pro does not exist - returns a message
+    indicating this.
+    """
+    if IS_CORE:
+        return _ubuntu_pro_error_message(
+            "Ubuntu Pro is not available on Ubuntu Core.",
+            "core-unsupported",
+        )
+
+    try:
+        completed_process = subprocess.run(
+            ["pro", "status", "--format", "json"],
+            encoding="utf8",
+            stdout=subprocess.PIPE,
+        )
+    except FileNotFoundError:
+        return _ubuntu_pro_error_message(
+            "ubuntu pro tools not found.",
+            "tools-error",
+        )
+    else:
+        return json.loads(completed_process.stdout)
+
+
+def _ubuntu_pro_error_message(message: str, code: str) -> dict:
+    """Marshall `message` and `code` into a format matching that expected from
+    an error from ua tools.
+    """
+    return {
+        "errors": [
+            {
+                "message": message,
+                "message_code": code,
+                "service": None,
+                "type": "system",
+            },
+        ],
+        "result": "failure",
+    }
diff --git a/landscape/client/manager/usermanager.py b/landscape/client/manager/usermanager.py
index 8984ccf..5e0608d 100644
--- a/landscape/client/manager/usermanager.py
+++ b/landscape/client/manager/usermanager.py
@@ -1,10 +1,12 @@
 import logging
 
+from landscape.client import IS_CORE
 from landscape.client.amp import ComponentConnector
 from landscape.client.amp import ComponentPublisher
 from landscape.client.amp import remote
 from landscape.client.manager.plugin import ManagerPlugin
 from landscape.client.monitor.usermonitor import RemoteUserMonitorConnector
+from landscape.client.user.management import SnapdUserManagement
 from landscape.client.user.management import UserManagement
 
 
@@ -13,7 +15,14 @@ class UserManager(ManagerPlugin):
     name = "usermanager"
 
     def __init__(self, management=None, shadow_file="/etc/shadow"):
-        self._management = management or UserManagement()
+        if IS_CORE:
+            management = management or SnapdUserManagement()
+            shadow_file = shadow_file or "/var/lib/extrausers/shadow"
+        else:
+            management = management or UserManagement()
+            shadow_file = shadow_file
+
+        self._management = management
         self._shadow_file = shadow_file
         self._message_types = {
             "add-user": self._add_user,
@@ -107,16 +116,7 @@ class UserManager(ManagerPlugin):
 
     def _add_user(self, message):
         """Run an C{add-user} operation."""
-        return self._management.add_user(
-            message["username"],
-            message["name"],
-            message["password"],
-            message["require-password-reset"],
-            message["primary-group-name"],
-            message["location"],
-            message["work-number"],
-            message["home-number"],
-        )
+        return self._management.add_user(message)
 
     def _edit_user(self, message):
         """Run an C{edit-user} operation."""
@@ -140,10 +140,7 @@ class UserManager(ManagerPlugin):
 
     def _remove_user(self, message):
         """Run a C{remove-user} operation."""
-        return self._management.remove_user(
-            message["username"],
-            message["delete-home"],
-        )
+        return self._management.remove_user(message)
 
     def _add_group(self, message):
         """Run an C{add-group} operation."""
diff --git a/landscape/client/monitor/computerinfo.py b/landscape/client/monitor/computerinfo.py
index dfda40b..c1b353e 100644
--- a/landscape/client/monitor/computerinfo.py
+++ b/landscape/client/monitor/computerinfo.py
@@ -5,12 +5,13 @@ from twisted.internet.defer import inlineCallbacks
 from twisted.internet.defer import returnValue
 
 from landscape.client.monitor.plugin import MonitorPlugin
+from landscape.client.snap_utils import get_snap_info
 from landscape.lib.cloud import fetch_ec2_meta_data
 from landscape.lib.fetch import fetch_async
 from landscape.lib.fs import read_text_file
-from landscape.lib.lsb_release import LSB_RELEASE_FILENAME
-from landscape.lib.lsb_release import parse_lsb_release
 from landscape.lib.network import get_fqdn
+from landscape.lib.os_release import get_os_filename
+from landscape.lib.os_release import parse_os_release
 
 METADATA_RETRY_MAX = 3  # Number of retries to get EC2 meta-data
 
@@ -29,13 +30,13 @@ class ComputerInfo(MonitorPlugin):
         self,
         get_fqdn=get_fqdn,
         meminfo_filename="/proc/meminfo",
-        lsb_release_filename=LSB_RELEASE_FILENAME,
+        os_release_filename=get_os_filename(),
         root_path="/",
         fetch_async=fetch_async,
     ):
         self._get_fqdn = get_fqdn
         self._meminfo_filename = meminfo_filename
-        self._lsb_release_filename = lsb_release_filename
+        self._os_release_filename = os_release_filename
         self._root_path = root_path
         self._cloud_instance_metadata = None
         self._cloud_retries = 0
@@ -59,6 +60,11 @@ class ComputerInfo(MonitorPlugin):
             self.send_cloud_instance_metadata_message,
             True,
         )
+        self.call_on_accepted(
+            "snap-info",
+            self.send_snap_message,
+            True,
+        )
 
     def send_computer_message(self, urgent=False):
         message = self._create_computer_info_message()
@@ -96,6 +102,17 @@ class ComputerInfo(MonitorPlugin):
                 urgent=urgent,
             )
 
+    def send_snap_message(self, urgent=False):
+        message = self._create_snap_info_message()
+        if message:
+            message["type"] = "snap-info"
+            logging.info("Queueing message with updated snap info.")
+            self.registry.broker.send_message(
+                message,
+                self._session_id,
+                urgent=urgent,
+            )
+
     def exchange(self, urgent=False):
         broker = self.registry.broker
         broker.call_if_accepted(
@@ -113,6 +130,11 @@ class ComputerInfo(MonitorPlugin):
             self.send_cloud_instance_metadata_message,
             urgent,
         )
+        broker.call_if_accepted(
+            "snap-info",
+            self.send_snap_message,
+            urgent,
+        )
 
     def _create_computer_info_message(self):
         message = {}
@@ -160,7 +182,7 @@ class ComputerInfo(MonitorPlugin):
     def _get_distribution_info(self):
         """Get details about the distribution."""
         message = {}
-        message.update(parse_lsb_release(self._lsb_release_filename))
+        message.update(parse_os_release(self._os_release_filename))
         return message
 
     @inlineCallbacks
@@ -171,7 +193,6 @@ class ComputerInfo(MonitorPlugin):
             self._cloud_instance_metadata is None
             and self._cloud_retries < METADATA_RETRY_MAX
         ):
-
             self._cloud_instance_metadata = yield self._fetch_ec2_meta_data()
             message = self._cloud_instance_metadata
         returnValue(message)
@@ -196,3 +217,13 @@ class ComputerInfo(MonitorPlugin):
         deferred.addCallback(log_success)
         deferred.addErrback(log_no_meta_data_found)
         return deferred
+
+    def _create_snap_info_message(self):
+        """Create message with the snapd serial metadata."""
+        message = {}
+        snap_info = get_snap_info()
+        if snap_info:
+            self._add_if_new(message, "brand", snap_info["brand"])
+            self._add_if_new(message, "model", snap_info["model"])
+            self._add_if_new(message, "serial", snap_info["serial"])
+        return message
diff --git a/landscape/client/monitor/config.py b/landscape/client/monitor/config.py
index e6c347a..ebf54eb 100644
--- a/landscape/client/monitor/config.py
+++ b/landscape/client/monitor/config.py
@@ -20,10 +20,10 @@ ALL_PLUGINS = [
     "SwiftUsage",
     "CephUsage",
     "ComputerTags",
-    "UbuntuProInfo",
     "LivePatch",
     "UbuntuProRebootRequired",
     "SnapMonitor",
+    "SnapServicesMonitor",
 ]
 
 
diff --git a/landscape/client/monitor/processorinfo.py b/landscape/client/monitor/processorinfo.py
index 2fdacc8..1081ced 100644
--- a/landscape/client/monitor/processorinfo.py
+++ b/landscape/client/monitor/processorinfo.py
@@ -181,30 +181,43 @@ class ARMMessageFactory:
     def create_message(self):
         """Returns a list containing information about each processor."""
         processors = []
-        file = open(self._source_filename)
+        regexp = re.compile(r"(?P<key>.*?)\s*:\s*(?P<value>.*)")
+        current = {}
 
-        try:
-            regexp = re.compile(r"(?P<key>.*?)\s*:\s*(?P<value>.*)")
-            current = {}
+        with open(self._source_filename) as fp:
+            for line in fp:
+                line = line.strip()
+
+                if not line:
+                    if current:
+                        processors.append(current.copy())
+                        current = {}
+
+                    continue
 
-            for line in file:
                 match = regexp.match(line.strip())
+
                 if match:
                     key = match.group("key")
                     value = match.group("value")
 
-                    if key == "Processor":
-                        # ARM doesn't support SMP, thus no processor-id in
-                        # the cpuinfo
-                        current["processor-id"] = 0
+                    if key == "processor":
+                        current["processor-id"] = int(value)
+                        if "model" not in current:
+                            current["model"] = "arm"
+                    elif key == "Processor":
                         current["model"] = value
                     elif key == "Cache size":
                         current["cache-size"] = int(value)
 
-            if current:
-                processors.append(current)
-        finally:
-            file.close()
+        if current:
+            processors.append(current)
+
+        # Older ARM machines may not have processor-ids, but we need them, so
+        # we set missing ones to 0.
+        for processor in processors:
+            if "processor-id" not in processor:
+                processor["processor-id"] = 0
 
         return processors
 
@@ -357,6 +370,8 @@ class RISCVMessageFactory:
 
                 if key == "processor":
                     current = {"processor-id": int(parts[1].strip())}
+                    # A placeholder in case there is no model provided.
+                    current["model"] = "riscv"
                     processors.append(current)
                 elif key == "isa":
                     current["vendor"] = parts[1].strip()
diff --git a/landscape/client/monitor/service.py b/landscape/client/monitor/service.py
index 1822360..c0971f3 100644
--- a/landscape/client/monitor/service.py
+++ b/landscape/client/monitor/service.py
@@ -46,14 +46,17 @@ class MonitorService(LandscapeService):
             try:
                 plugin = namedClass(
                     "landscape.client.monitor."
-                    f"{plugin_name.lower()}.{plugin_name}"
+                    f"{plugin_name.lower()}.{plugin_name}",
                 )
                 plugins.append(plugin())
             except ModuleNotFoundError:
                 logging.warning(
-                    "Invalid monitor plugin specified: '{}'. "
+                    f"Invalid monitor plugin specified: '{plugin_name}'. "
                     "See `example.conf` for a full list of monitor plugins.",
-                    plugin_name,
+                )
+            except Exception as exc:
+                logging.warning(
+                    f"Unable to load monitor plugin '{plugin_name}': {exc}",
                 )
 
         return plugins
diff --git a/landscape/client/monitor/snapmonitor.py b/landscape/client/monitor/snapmonitor.py
index 6a55a68..ef5c94e 100644
--- a/landscape/client/monitor/snapmonitor.py
+++ b/landscape/client/monitor/snapmonitor.py
@@ -1,8 +1,9 @@
+import json
 import logging
 
+from landscape.client import snap_http
 from landscape.client.monitor.plugin import DataWatcher
-from landscape.client.snap.http import SnapdHttpException
-from landscape.client.snap.http import SnapHttp
+from landscape.client.snap_http import SnapdHttpException
 from landscape.message_schemas.server_bound import SNAPS
 
 
@@ -13,31 +14,41 @@ class SnapMonitor(DataWatcher):
     persist_name = message_type
     scope = "snaps"
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self._snap_http = SnapHttp()
-
     def register(self, registry):
         self.config = registry.config
         # The default interval is 30 minutes.
         self.run_interval = self.config.snap_monitor_interval
 
-        super(SnapMonitor, self).register(registry)
+        super().register(registry)
 
     def get_data(self):
         try:
-            snaps = self._snap_http.get_snaps()
+            snaps = snap_http.list().result
         except SnapdHttpException as e:
             logging.error(f"Unable to list installed snaps: {e}")
             return
 
+        for i in range(len(snaps)):
+            snap_name = snaps[i]["name"]
+            try:
+                config = snap_http.get_conf(snap_name).result
+            except SnapdHttpException as e:
+                logging.warning(
+                    f"Unable to get config for snap {snap_name}: {e}",
+                )
+                config = {}
+
+            snaps[i]["config"] = json.dumps(config)
+
         # We get a lot of extra info from snapd. To avoid caching it all
         # or invalidating the cache on timestamp changes, we use Message
         # coercion to strip out the unnecessaries, then sort on the snap
         # IDs to order the list.
         data = SNAPS.coerce(
-            {"type": "snaps", "snaps": {"installed": snaps["result"]}},
+            {
+                "type": "snaps",
+                "snaps": {"installed": snaps},
+            },
         )
         data["snaps"]["installed"].sort(key=lambda x: x["id"])
 
diff --git a/landscape/client/monitor/snapservicesmonitor.py b/landscape/client/monitor/snapservicesmonitor.py
new file mode 100644
index 0000000..66d5655
--- /dev/null
+++ b/landscape/client/monitor/snapservicesmonitor.py
@@ -0,0 +1,28 @@
+import logging
+
+from landscape.client import snap_http
+from landscape.client.monitor.plugin import DataWatcher
+from landscape.client.snap_http import SnapdHttpException
+
+
+class SnapServicesMonitor(DataWatcher):
+
+    message_type = "snap-services"
+    message_key = "services"
+    persist_name = message_type
+    scope = "snaps"
+
+    def register(self, registry):
+        self.config = registry.config
+        self.run_interval = 60  # 1 minute
+        super().register(registry)
+
+    def get_data(self):
+        try:
+            services = snap_http.get_apps(services_only=True).result
+        except SnapdHttpException as e:
+            logging.warning(f"Unable to list services: {e}")
+            services = []
+        services.sort(key=lambda x: x["name"])
+
+        return {"running": services}
diff --git a/landscape/client/monitor/tests/test_computerinfo.py b/landscape/client/monitor/tests/test_computerinfo.py
index d43a9b7..0742316 100644
--- a/landscape/client/monitor/tests/test_computerinfo.py
+++ b/landscape/client/monitor/tests/test_computerinfo.py
@@ -14,12 +14,19 @@ from landscape.lib.fetch import HTTPCodeError
 from landscape.lib.fetch import PyCurlError
 from landscape.lib.fs import create_text_file
 
-SAMPLE_LSB_RELEASE = (
-    "DISTRIB_ID=Ubuntu\n"
-    "DISTRIB_RELEASE=6.06\n"
-    "DISTRIB_CODENAME=dapper\n"
-    'DISTRIB_DESCRIPTION="Ubuntu 6.06.1 LTS"\n'
-)
+SAMPLE_OS_RELEASE = """PRETTY_NAME="Ubuntu 22.04.3 LTS"
+NAME="Ubuntu"
+VERSION_ID="22.04"
+VERSION="22.04.3 LTS (Jammy Jellyfish)"
+VERSION_CODENAME=codename
+ID=ubuntu
+ID_LIKE=debian
+HOME_URL="https://www.ubuntu.com/"
+SUPPORT_URL="https://help.ubuntu.com/"
+BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
+PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
+UBUNTU_CODENAME=codename
+"""
 
 
 def get_fqdn():
@@ -27,7 +34,6 @@ def get_fqdn():
 
 
 class ComputerInfoTest(LandscapeTest):
-
     helpers = [MonitorHelper]
 
     sample_memory_info = """
@@ -58,7 +64,7 @@ VmallocChunk:   107432 kB
 
     def setUp(self):
         LandscapeTest.setUp(self)
-        self.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
+        self.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
         self.query_results = {}
 
         def fetch_stub(url, **kwargs):
@@ -100,7 +106,7 @@ VmallocChunk:   107432 kB
         messages = self.mstore.get_pending_messages()
         self.assertEqual(len(messages), 1)
         self.assertEqual(messages[0]["type"], "computer-info")
-        self.assertNotEquals(len(messages[0]["hostname"]), 0)
+        self.assertNotEqual(len(messages[0]["hostname"]), 0)
         self.assertTrue(re.search(r"\w", messages[0]["hostname"]))
 
     def test_only_report_changed_hostnames(self):
@@ -223,16 +229,16 @@ VmallocChunk:   107432 kB
         the distribution data reported by the plugin.
         """
         self.mstore.set_accepted_types(["distribution-info"])
-        plugin = ComputerInfo(lsb_release_filename=self.lsb_release_filename)
+        plugin = ComputerInfo(os_release_filename=self.os_release_filename)
         self.monitor.add(plugin)
 
         plugin.exchange()
         message = self.mstore.get_pending_messages()[0]
         self.assertEqual(message["type"], "distribution-info")
         self.assertEqual(message["distributor-id"], "Ubuntu")
-        self.assertEqual(message["description"], "Ubuntu 6.06.1 LTS")
-        self.assertEqual(message["release"], "6.06")
-        self.assertEqual(message["code-name"], "dapper")
+        self.assertEqual(message["description"], "Ubuntu 22.04.3 LTS")
+        self.assertEqual(message["release"], "22.04")
+        self.assertEqual(message["code-name"], "codename")
 
     def test_distribution_reported_only_once(self):
         """
@@ -258,23 +264,23 @@ VmallocChunk:   107432 kB
         the server.
         """
         self.mstore.set_accepted_types(["distribution-info"])
-        plugin = ComputerInfo(lsb_release_filename=self.lsb_release_filename)
+        plugin = ComputerInfo(os_release_filename=self.os_release_filename)
         self.monitor.add(plugin)
 
         plugin.exchange()
         message = self.mstore.get_pending_messages()[0]
         self.assertEqual(message["type"], "distribution-info")
         self.assertEqual(message["distributor-id"], "Ubuntu")
-        self.assertEqual(message["description"], "Ubuntu 6.06.1 LTS")
-        self.assertEqual(message["release"], "6.06")
-        self.assertEqual(message["code-name"], "dapper")
+        self.assertEqual(message["description"], "Ubuntu 22.04.3 LTS")
+        self.assertEqual(message["release"], "22.04")
+        self.assertEqual(message["code-name"], "codename")
 
-        plugin._lsb_release_filename = self.makeFile(
+        plugin._os_release_filename = self.makeFile(
             """\
-DISTRIB_ID=Ubuntu
-DISTRIB_RELEASE=6.10
-DISTRIB_CODENAME=edgy
-DISTRIB_DESCRIPTION="Ubuntu 6.10"
+NAME=Ubuntu
+VERSION_ID=6.10
+VERSION_CODENAME=edgy
+PRETTY_NAME="Ubuntu 6.10"
 """,
         )
         plugin.exchange()
@@ -287,25 +293,25 @@ DISTRIB_DESCRIPTION="Ubuntu 6.10"
 
     def test_unknown_distribution_key(self):
         self.mstore.set_accepted_types(["distribution-info"])
-        lsb_release_filename = self.makeFile(
+        os_release_filename = self.makeFile(
             """\
-DISTRIB_ID=Ubuntu
-DISTRIB_RELEASE=6.10
-DISTRIB_CODENAME=edgy
-DISTRIB_DESCRIPTION="Ubuntu 6.10"
+NAME=Ubuntu
+VERSION_ID=22.04
+VERSION_CODENAME=codename
+PRETTY_NAME="Ubuntu 22.04.3 LTS"
 DISTRIB_NEW_UNEXPECTED_KEY=ooga
 """,
         )
-        plugin = ComputerInfo(lsb_release_filename=lsb_release_filename)
+        plugin = ComputerInfo(os_release_filename=os_release_filename)
         self.monitor.add(plugin)
 
         plugin.exchange()
         message = self.mstore.get_pending_messages()[0]
         self.assertEqual(message["type"], "distribution-info")
         self.assertEqual(message["distributor-id"], "Ubuntu")
-        self.assertEqual(message["description"], "Ubuntu 6.10")
-        self.assertEqual(message["release"], "6.10")
-        self.assertEqual(message["code-name"], "edgy")
+        self.assertEqual(message["description"], "Ubuntu 22.04.3 LTS")
+        self.assertEqual(message["release"], "22.04")
+        self.assertEqual(message["code-name"], "codename")
 
     def test_resynchronize(self):
         """
@@ -317,7 +323,7 @@ DISTRIB_NEW_UNEXPECTED_KEY=ooga
         plugin = ComputerInfo(
             get_fqdn=get_fqdn,
             meminfo_filename=meminfo_filename,
-            lsb_release_filename=self.lsb_release_filename,
+            os_release_filename=self.os_release_filename,
             root_path=self.makeDir(),
             fetch_async=self.fetch_func,
         )
@@ -335,10 +341,10 @@ DISTRIB_NEW_UNEXPECTED_KEY=ooga
 
         dist_info = {
             "type": "distribution-info",
-            "code-name": "dapper",
-            "description": "Ubuntu 6.06.1 LTS",
+            "code-name": "codename",
+            "description": "Ubuntu 22.04.3 LTS",
             "distributor-id": "Ubuntu",
-            "release": "6.06",
+            "release": "22.04",
         }
         self.assertMessages(
             self.mstore.get_pending_messages(),
@@ -553,3 +559,46 @@ DISTRIB_NEW_UNEXPECTED_KEY=ooga
             },
             result,
         )
+
+    @mock.patch("landscape.client.snap_utils.get_assertions")
+    def test_snap_info(self, mock_get_assertions):
+        """Test getting the snap info message."""
+        mock_get_assertions.return_value = [
+            {
+                "authority-id": "canonical",
+                "brand-id": "canonical",
+                "model": "pc-amd64",
+                "serial": "03961d5d-26e5-443f-838d-6db046126bea",
+            },
+        ]
+
+        self.mstore.set_accepted_types(["snap-info"])
+        plugin = ComputerInfo(fetch_async=self.fetch_func)
+        self.monitor.add(plugin)
+        plugin.exchange()
+        messages = self.mstore.get_pending_messages()
+        self.assertEqual(len(messages), 1)
+        self.assertEqual(messages[0]["type"], "snap-info")
+        self.assertEqual(messages[0]["brand"], "canonical")
+        self.assertEqual(messages[0]["model"], "pc-amd64")
+        self.assertEqual(
+            messages[0]["serial"],
+            "03961d5d-26e5-443f-838d-6db046126bea",
+        )
+
+    @mock.patch("landscape.client.snap_utils.get_assertions")
+    def test_snap_info_no_results(self, mock_get_assertions):
+        """Test getting the snap info message when there are no results.
+
+        No results can happen when:
+            - A SnapdHttpException occurs
+            - No serial assertion is found
+        """
+        mock_get_assertions.return_value = None
+
+        self.mstore.set_accepted_types(["snap-info"])
+        plugin = ComputerInfo(fetch_async=self.fetch_func)
+        self.monitor.add(plugin)
+        plugin.exchange()
+        messages = self.mstore.get_pending_messages()
+        self.assertEqual(len(messages), 0)
diff --git a/landscape/client/monitor/tests/test_processorinfo.py b/landscape/client/monitor/tests/test_processorinfo.py
index 4a2bb8e..ffe47ce 100644
--- a/landscape/client/monitor/tests/test_processorinfo.py
+++ b/landscape/client/monitor/tests/test_processorinfo.py
@@ -30,8 +30,7 @@ class ProcessorInfoTest(LandscapeTest):
         self.assertTrue(len(message["processors"]) > 0)
 
         for processor in message["processors"]:
-            self.assertTrue("processor-id" in processor)
-            self.assertTrue("model" in processor)
+            self.assertIn("processor-id", processor)
 
     def test_call_on_accepted(self):
         """
@@ -326,6 +325,22 @@ Hardware        : Foundation-v8A
         )
         self.assertEqual(processor_0["processor-id"], 0)
 
+    def test_no_model_default(self):
+        """If there is no 'Processor' field, then the model defaults to
+        'arm'.
+        """
+        filename = self.makeFile("processor        : 0\n")
+        plugin = ProcessorInfo(
+            machine_name="aarch64",
+            source_filename=filename,
+        )
+        message = plugin.create_message()
+        self.assertEqual(message["type"], "processor-info")
+        self.assertTrue(len(message["processors"]) == 1)
+
+        processor_0 = message["processors"][0]
+        self.assertEqual(processor_0["model"], "arm")
+
 
 class SparcMessageTest(LandscapeTest):
     """Tests for sparc-specific message builder."""
@@ -631,3 +646,60 @@ bogomips        : 1198.25
 
         self.mstore.set_accepted_types(["processor-info"])
         self.assertMessages(list(self.mstore.get_pending_messages()), [])
+
+
+class RISCVMessageTest(LandscapeTest):
+    """Test for RISCV-specific message handling."""
+
+    helpers = [MonitorHelper]
+
+    VISION_FIVE = """
+processor      : 0
+hart           : 0
+isa            : rv64imafdc
+mmu            : sv39
+uarch          : sifive,u74-mc
+mvendorid      : 0x489
+marchid        : 0x8000000000000007
+mimpid         : 0x20190531
+
+processor      : 1
+hart           : 1
+isa            : rv64imafdc
+mmu            : sv39
+uarch          : sifive,u74-mc
+mvendorid      : 0x489
+marchid        : 0x8000000000000007
+mimpid         : 0x20190531
+
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        self.mstore.set_accepted_types(["processor-info"])
+
+    def test_read_sample_data(self):
+        """Ensure the plugin can parse a simple /proc/cpuinfo from a VisionFive
+        v1.
+        """
+        filename = self.makeFile(self.VISION_FIVE)
+        plugin = ProcessorInfo(
+            machine_name="riscv64",
+            source_filename=filename,
+        )
+        message = plugin.create_message()
+        self.assertEqual(message["type"], "processor-info")
+        self.assertEqual(len(message["processors"]), 2)
+
+        processor_0, processor_1 = message["processors"]
+
+        self.assertEqual(len(processor_0), 3)
+        self.assertEqual(processor_0["processor-id"], 0)
+        self.assertEqual(processor_0["model"], "sifive,u74-mc")
+        self.assertEqual(processor_0["vendor"], "rv64imafdc")
+
+        self.assertEqual(len(processor_1), 3)
+        self.assertEqual(processor_1["processor-id"], 1)
+        self.assertEqual(processor_1["model"], "sifive,u74-mc")
+        self.assertEqual(processor_1["vendor"], "rv64imafdc")
diff --git a/landscape/client/monitor/tests/test_service.py b/landscape/client/monitor/tests/test_service.py
index 67289b6..8104ba6 100644
--- a/landscape/client/monitor/tests/test_service.py
+++ b/landscape/client/monitor/tests/test_service.py
@@ -1,4 +1,5 @@
 from unittest.mock import Mock
+from unittest.mock import patch
 
 from landscape.client.monitor.computerinfo import ComputerInfo
 from landscape.client.monitor.config import ALL_PLUGINS
@@ -44,6 +45,34 @@ class MonitorServiceTest(LandscapeTest):
         self.assertTrue(isinstance(plugins[0], ComputerInfo))
         self.assertTrue(isinstance(plugins[1], LoadAverage))
 
+    def test_get_plugins_module_not_found(self):
+        """If a module is not found, a warning is logged."""
+        self.service.config.load(["--monitor-plugins", "TotallyDoesNotExist"])
+
+        with self.assertLogs(level="WARN") as cm:
+            plugins = self.service.get_plugins()
+
+        self.assertEqual(len(plugins), 0)
+        self.assertIn("Invalid monitor plugin", cm.output[0])
+        self.assertIn("TotallyDoesNotExist", cm.output[0])
+
+    def test_get_plugins_other_exception(self):
+        """If loading a plugin fails for another reason, a warning is logged,
+        with the exception.
+        """
+        self.service.config.load(["--monitor-plugins", "ComputerInfo"])
+
+        with self.assertLogs(level="WARN") as cm:
+            with patch(
+                "landscape.client.monitor.service.namedClass",
+            ) as namedClass:
+                namedClass.side_effect = Exception("Is there life on Mars?")
+                plugins = self.service.get_plugins()
+
+        self.assertEqual(len(plugins), 0)
+        self.assertIn("Unable to load", cm.output[0])
+        self.assertIn("Mars?", cm.output[0])
+
     def test_start_service(self):
         """
         The L{MonitorService.startService} method connects to the broker,
diff --git a/landscape/client/monitor/tests/test_snapmonitor.py b/landscape/client/monitor/tests/test_snapmonitor.py
index 086aec6..b112702 100644
--- a/landscape/client/monitor/tests/test_snapmonitor.py
+++ b/landscape/client/monitor/tests/test_snapmonitor.py
@@ -1,8 +1,10 @@
-from unittest.mock import Mock
+from unittest.mock import patch
 
 from landscape.client.monitor.snapmonitor import SnapMonitor
-from landscape.client.snap.http import SnapdHttpException, SnapHttp
-from landscape.client.tests.helpers import LandscapeTest, MonitorHelper
+from landscape.client.snap_http import SnapdHttpException
+from landscape.client.snap_http import SnapdResponse
+from landscape.client.tests.helpers import LandscapeTest
+from landscape.client.tests.helpers import MonitorHelper
 
 
 class SnapMonitorTest(LandscapeTest):
@@ -11,11 +13,19 @@ class SnapMonitorTest(LandscapeTest):
     helpers = [MonitorHelper]
 
     def setUp(self):
-        super(SnapMonitorTest, self).setUp()
+        super().setUp()
         self.mstore.set_accepted_types(["snaps"])
 
-    def test_get_data(self):
+    @patch("landscape.client.monitor.snapmonitor.snap_http")
+    def test_get_data(self, snap_http_mock):
         """Tests getting installed snap data."""
+        snap_http_mock.list.return_value = SnapdResponse("sync", 200, "OK", [])
+        snap_http_mock.get_apps.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [],
+        )
         plugin = SnapMonitor()
         self.monitor.add(plugin)
 
@@ -30,15 +40,13 @@ class SnapMonitorTest(LandscapeTest):
         """
         Tests that we return no data if there is an error getting it.
         """
-        snap_http_mock = Mock(
-            spec=SnapHttp,
-            get_snaps=Mock(side_effect=SnapdHttpException)
-        )
         plugin = SnapMonitor()
-        plugin._snap_http = snap_http_mock
         self.monitor.add(plugin)
 
-        with self.assertLogs(level="ERROR") as cm:
+        with patch(
+            "landscape.client.monitor.snapmonitor.snap_http",
+        ) as snap_http_mock, self.assertLogs(level="ERROR") as cm:
+            snap_http_mock.list.side_effect = SnapdHttpException
             plugin.exchange()
 
         messages = self.mstore.get_pending_messages()
@@ -46,5 +54,60 @@ class SnapMonitorTest(LandscapeTest):
         self.assertEqual(len(messages), 0)
         self.assertEqual(
             cm.output,
-            ["ERROR:root:Unable to list installed snaps: "]
+            ["ERROR:root:Unable to list installed snaps: "],
+        )
+
+    @patch("landscape.client.monitor.snapmonitor.snap_http")
+    def test_get_snap_config(self, snap_http_mock):
+        """Tests that we can get and coerce snap config."""
+        plugin = SnapMonitor()
+        self.monitor.add(plugin)
+
+        snap_http_mock.list.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [
+                {
+                    "name": "test-snap",
+                    "revision": "1",
+                    "confinement": "strict",
+                    "version": "v1.0",
+                    "id": "123",
+                },
+            ],
+        )
+        snap_http_mock.get_conf.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            {
+                "foo": {"baz": "default", "qux": [1, True, 2.0]},
+                "bar": "enabled",
+            },
+        )
+        snap_http_mock.get_apps.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [],
+        )
+        plugin.exchange()
+
+        messages = self.mstore.get_pending_messages()
+
+        self.assertTrue(len(messages) > 0)
+        self.assertDictEqual(
+            messages[0]["snaps"]["installed"][0],
+            {
+                "name": "test-snap",
+                "revision": "1",
+                "confinement": "strict",
+                "version": "v1.0",
+                "id": "123",
+                "config": (
+                    '{"foo": {"baz": "default", "qux": [1, true, 2.0]}, '
+                    '"bar": "enabled"}'
+                ),
+            },
         )
diff --git a/landscape/client/monitor/tests/test_snapservicesmonitor.py b/landscape/client/monitor/tests/test_snapservicesmonitor.py
new file mode 100644
index 0000000..4c86cb3
--- /dev/null
+++ b/landscape/client/monitor/tests/test_snapservicesmonitor.py
@@ -0,0 +1,127 @@
+from unittest.mock import patch
+
+from landscape.client.monitor.snapservicesmonitor import SnapServicesMonitor
+from landscape.client.snap_http import SnapdHttpException
+from landscape.client.snap_http import SnapdResponse
+from landscape.client.tests.helpers import LandscapeTest
+from landscape.client.tests.helpers import MonitorHelper
+
+
+class SnapServicesMonitorTest(LandscapeTest):
+
+    helpers = [MonitorHelper]
+
+    def setUp(self):
+        super().setUp()
+        self.mstore.set_accepted_types(["snap-services"])
+
+    @patch("landscape.client.monitor.snapservicesmonitor.snap_http")
+    def test_get_data(self, snap_http_mock):
+        """Tests getting running snap services data."""
+        snap_http_mock.get_apps.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            [
+                {
+                    "snap": "test-snap",
+                    "name": "bye-svc",
+                    "daemon": "simple",
+                    "daemon-scope": "system",
+                },
+            ],
+        )
+
+        plugin = SnapServicesMonitor()
+        self.monitor.add(plugin)
+
+        plugin.exchange()
+
+        messages = self.mstore.get_pending_messages()
+
+        self.assertTrue(len(messages) > 0)
+        self.assertIn("running", messages[0]["services"])
+
+    @patch("landscape.client.monitor.snapservicesmonitor.snap_http")
+    def test_get_snap_services(self, snap_http_mock):
+        """Tests that we can get and coerce snap services."""
+        plugin = SnapServicesMonitor()
+        self.monitor.add(plugin)
+        self.maxDiff = None
+
+        services = [
+            {
+                "snap": "test-snap",
+                "name": "bye-svc",
+                "daemon": "simple",
+                "daemon-scope": "system",
+            },
+            {
+                "snap": "test-snap",
+                "name": "hello-svc",
+                "daemon": "simple",
+                "daemon-scope": "system",
+                "active": True,
+            },
+            {
+                "activators": [
+                    {
+                        "Active": True,
+                        "Enabled": True,
+                        "Name": "unix",
+                        "Type": "socket",
+                    },
+                ],
+                "daemon": "simple",
+                "daemon-scope": "system",
+                "enabled": True,
+                "name": "user-daemon",
+                "snap": "lxd",
+            },
+        ]
+        snap_http_mock.list.return_value = SnapdResponse("sync", 200, "OK", [])
+        snap_http_mock.get_conf.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            {},
+        )
+        snap_http_mock.get_apps.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            services,
+        )
+        plugin.exchange()
+
+        messages = self.mstore.get_pending_messages()
+
+        self.assertTrue(len(messages) > 0)
+        self.assertCountEqual(messages[0]["services"]["running"], services)
+
+    @patch("landscape.client.monitor.snapservicesmonitor.snap_http")
+    def test_get_snap_services_error(self, snap_http_mock):
+        """Tests that we can get and coerce snap services."""
+        plugin = SnapServicesMonitor()
+        self.monitor.add(plugin)
+
+        snap_http_mock.list.return_value = SnapdResponse("sync", 200, "OK", [])
+        snap_http_mock.get_conf.return_value = SnapdResponse(
+            "sync",
+            200,
+            "OK",
+            {},
+        )
+
+        with self.assertLogs(level="WARNING") as cm:
+            snap_http_mock.get_apps.side_effect = SnapdHttpException
+            plugin.exchange()
+
+        messages = self.mstore.get_pending_messages()
+
+        self.assertTrue(len(messages) > 0)
+        self.assertEqual(
+            cm.output,
+            ["WARNING:root:Unable to list services: "],
+        )
+        self.assertCountEqual(messages[0]["services"]["running"], [])
diff --git a/landscape/client/monitor/tests/test_temperature.py b/landscape/client/monitor/tests/test_temperature.py
index 93e3b6f..472fa46 100644
--- a/landscape/client/monitor/tests/test_temperature.py
+++ b/landscape/client/monitor/tests/test_temperature.py
@@ -5,10 +5,10 @@ from unittest import mock
 from landscape.client.monitor.temperature import Temperature
 from landscape.client.tests.helpers import LandscapeTest
 from landscape.client.tests.helpers import MonitorHelper
-from landscape.lib.tests.test_sysstats import ThermalZoneTest
+from landscape.lib.tests.test_sysstats import SysfsThermalZoneTest
 
 
-class TemperatureTestWithSampleData(ThermalZoneTest, LandscapeTest):
+class TemperatureTestWithSampleData(SysfsThermalZoneTest, LandscapeTest):
     """Tests for the temperature plugin."""
 
     helpers = [MonitorHelper]
diff --git a/landscape/client/monitor/tests/test_ubuntuproinfo.py b/landscape/client/monitor/tests/test_ubuntuproinfo.py
deleted file mode 100644
index 1b8675f..0000000
--- a/landscape/client/monitor/tests/test_ubuntuproinfo.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from unittest import mock
-
-from landscape.client.monitor.ubuntuproinfo import UbuntuProInfo
-from landscape.client.tests.helpers import LandscapeTest
-from landscape.client.tests.helpers import MonitorHelper
-
-
-class UbuntuProInfoTest(LandscapeTest):
-    """Ubuntu Pro info plugin tests."""
-
-    helpers = [MonitorHelper]
-
-    def setUp(self):
-        super().setUp()
-        self.mstore.set_accepted_types(["ubuntu-pro-info"])
-
-    def test_ubuntu_pro_info(self):
-        """Tests calling `ua status`."""
-        plugin = UbuntuProInfo()
-        self.monitor.add(plugin)
-
-        with mock.patch("subprocess.run") as run_mock:
-            run_mock.return_value = mock.Mock(
-                stdout='"This is a test"',
-            )
-            plugin.exchange()
-
-        messages = self.mstore.get_pending_messages()
-        run_mock.assert_called_once()
-        self.assertTrue(len(messages) > 0)
-        self.assertTrue("ubuntu-pro-info" in messages[0])
-        self.assertEqual(messages[0]["ubuntu-pro-info"], '"This is a test"')
-
-    def test_ubuntu_pro_info_no_ua(self):
-        """Tests calling `ua status` when it is not installed."""
-        plugin = UbuntuProInfo()
-        self.monitor.add(plugin)
-
-        with mock.patch("subprocess.run") as run_mock:
-            run_mock.side_effect = FileNotFoundError()
-            plugin.exchange()
-
-        messages = self.mstore.get_pending_messages()
-        run_mock.assert_called_once()
-        self.assertTrue(len(messages) > 0)
-        self.assertTrue("ubuntu-pro-info" in messages[0])
-        self.assertIn("errors", messages[0]["ubuntu-pro-info"])
diff --git a/landscape/client/monitor/tests/test_usermonitor.py b/landscape/client/monitor/tests/test_usermonitor.py
index 1fddd9a..5a009d5 100644
--- a/landscape/client/monitor/tests/test_usermonitor.py
+++ b/landscape/client/monitor/tests/test_usermonitor.py
@@ -1,6 +1,7 @@
 import os
 from unittest.mock import ANY
 from unittest.mock import Mock
+from unittest.mock import patch
 
 from twisted.internet.defer import fail
 
@@ -208,6 +209,50 @@ class UserMonitorTest(LandscapeTest):
             ],
         )
 
+    @patch("landscape.client.monitor.usermonitor.IS_CORE", "1")
+    def test_new_message_after_resynchronize_event_on_core(self):
+        """
+        When a 'resynchronize' reactor event is fired, a new session is
+        created and the UserMonitor creates a new message.
+        """
+        self.provider.users = [
+            (
+                "john-doe",