Merge ~mpontillo/maas:move-network-monitoring-to-maas-common--part1 into maas:master

[Mike Pontillo]

Packaging: Move scripts to maas-common that are used by the MAAS region controller in addition to the rack.

 * Also renames the scripts to remove the redundant "maas-" prefix, and
   prevent potential conflicts with the existing package.

This branch looks large, but most of it is just renaming files.

A follow-on branch will add a dependency on python3-maas-provisioningserver in maas-common and add a Python helper script in /usr/lib/maas, so that the rack will no longer need to call `maas-rack` for commands common to the region and the rack.

[Mike Pontillo (mpontillo)]

Rejecting in favor of proposing a single branch.

diff --git a/debian/changelog b/debian/changelog
index ed9aba8..ca64683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maas (2.3.0~alpha3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Move scripts to maas-common that are used by the MAAS
+    region controller in addition to the rack.
+
+ -- Mike Pontillo <[e-mail]>  Tue, 22 Aug 2017 15:28:42 -0700
+
 maas (2.3.0~alpha2-6194-g7fb23b0-0ubuntu1) artful; urgency=medium
 
   * New upstream release, 2.3.0 alpha2:
diff --git a/debian/extras/99-maas-common-sudoers b/debian/extras/99-maas-common-sudoers
index a4e6542..da4a5af 100644
--- a/debian/extras/99-maas-common-sudoers
+++ b/debian/extras/99-maas-common-sudoers
@@ -1,6 +1,10 @@
 maas ALL= NOPASSWD: /usr/bin/lshw
 maas ALL= NOPASSWD: /sbin/blockdev
 
+# MAAS network monitoring tools.
+maas ALL= NOPASSWD: /usr/lib/maas/network-monitor
+maas ALL= NOPASSWD: /usr/lib/maas/beacon-monitor
+
 # Control of the NTP server: MAAS needs to reconfigure it after editing
 # its configuration file, and start it again if stopped manually.
 maas ALL= NOPASSWD: /bin/systemctl restart ntp
diff --git a/debian/extras/99-maas-sudoers b/debian/extras/99-maas-sudoers
index 5d0b0be..c36b644 100644
--- a/debian/extras/99-maas-sudoers
+++ b/debian/extras/99-maas-sudoers
@@ -11,6 +11,4 @@ maas ALL= NOPASSWD: /bin/systemctl start tgt
 maas ALL= NOPASSWD: /bin/systemctl disable maas-rackd
 maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
 maas ALL= NOPASSWD: /usr/sbin/maas-rack scan-network *
-maas ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor
-maas ALL= NOPASSWD: /usr/lib/maas/maas-beacon-monitor
 maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
diff --git a/debian/maas-common.install b/debian/maas-common.install
index a9a647c..aea3a3e 100644
--- a/debian/maas-common.install
+++ b/debian/maas-common.install
@@ -2,3 +2,8 @@ debian/tmp/usr/share/maas/maas-rsyslog.conf
 debian/extras/99-maas-common-sudoers etc/sudoers.d
 debian/tmp/usr/lib/maas/maas-delete-file
 debian/tmp/usr/lib/maas/maas-write-file
+
+# Install network monitoring scripts
+debian/tmp/usr/lib/maas/network-monitor
+debian/tmp/usr/lib/maas/beacon-monitor
+debian/tmp/usr/lib/maas/dhcp-monitor
diff --git a/debian/maas-rack-controller.install b/debian/maas-rack-controller.install
index a641331..d448c3a 100644
--- a/debian/maas-rack-controller.install
+++ b/debian/maas-rack-controller.install
@@ -4,11 +4,6 @@ debian/tmp/usr/bin/uec2roottar
 # Install maas-dhcp-helper
 debian/tmp/usr/sbin/maas-dhcp-helper
 
-# Install network monitoring scripts
-debian/tmp/usr/lib/maas/maas-network-monitor
-debian/tmp/usr/lib/maas/maas-beacon-monitor
-debian/tmp/usr/lib/maas/maas-dhcp-monitor
-
 # Install test scripts
 debian/tmp/usr/lib/maas/maas-test-enlistment
 
diff --git a/debian/maas-rack-controller.lintian-overrides b/debian/maas-rack-controller.lintian-overrides
index a434dac..6ae74f7 100644
--- a/debian/maas-rack-controller.lintian-overrides
+++ b/debian/maas-rack-controller.lintian-overrides
@@ -1 +1,2 @@
-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-network-monitor usr/lib/maas/maas-beacon-monitor usr/lib/maas/maas-dhcp-monitor usr/lib/maas/maas-test-enlistment
+maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper usr/lib/maas/maas-test-enlistment
+maas-common: binary-without-manpage usr/lib/maas/network-monitor usr/lib/maas/beacon-monitor usr/lib/maas/dhcp-monitor
diff --git a/scripts/beacon-monitor b/scripts/beacon-monitor
new file mode 100755
index 0000000..d06a128
--- /dev/null
+++ b/scripts/beacon-monitor
@@ -0,0 +1,24 @@
+#!/bin/sh -euf
+# Copyright 2016-2017 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# Utility script to wrap `tcpdump`, so that this script can be called with
+# `sudo` without allowing MAAS access to read arbitrary network traffic.
+# This script is designed to be as minimal as possible, to prevent arbitrary
+# code execution.
+
+if [ $# -ne 1 ]; then
+    echo "Writes beacon traffic (and beacon traffic on VLANs) to stdout" >&2
+    echo "using tcpdump's binary PCAP format." >&2
+    echo "" >&2
+    echo "Usage:" >&2
+    echo "    $0 <interface>" >&2
+    exit 32
+fi
+
+FILTER="udp dst port 5240"
+
+exec "${SNAP:-}/usr/sbin/tcpdump" --interface "$1" --direction=in \
+    --no-promiscuous-mode --packet-buffered --immediate-mode \
+    --snapshot-length=16384 -n -w - \
+    "($FILTER) or (vlan and $FILTER)"
diff --git a/scripts/dhcp-monitor b/scripts/dhcp-monitor
new file mode 100755
index 0000000..450a704
--- /dev/null
+++ b/scripts/dhcp-monitor
@@ -0,0 +1,20 @@
+#!/bin/sh -euf
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# Utility script to wrap `tcpdump`, so that this script can be called with
+# `sudo` without allowing MAAS access to read arbitrary network traffic.
+# This script is designed to be as minimal as possible, to prevent arbitrary
+# code execution.
+
+if [ $# -ne 1 ]; then
+    echo "Write DHCP traffic to stdout using tcpdump's binary PCAP format." >&2
+    echo "" >&2
+    echo "Usage:" >&2
+    echo "    $0 <interface>" >&2
+    exit 32
+fi
+
+exec /usr/sbin/tcpdump --interface "$1" --no-promiscuous-mode \
+    --packet-buffered --immediate-mode --snapshot-length=1500 -n -w - \
+    "udp and (port 67 or port 68) or (vlan and udp and (port 67 or port 68))"
diff --git a/scripts/maas-beacon-monitor b/scripts/maas-beacon-monitor
deleted file mode 100755
index d06a128..0000000
--- a/scripts/maas-beacon-monitor
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh -euf
-# Copyright 2016-2017 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Utility script to wrap `tcpdump`, so that this script can be called with
-# `sudo` without allowing MAAS access to read arbitrary network traffic.
-# This script is designed to be as minimal as possible, to prevent arbitrary
-# code execution.
-
-if [ $# -ne 1 ]; then
-    echo "Writes beacon traffic (and beacon traffic on VLANs) to stdout" >&2
-    echo "using tcpdump's binary PCAP format." >&2
-    echo "" >&2
-    echo "Usage:" >&2
-    echo "    $0 <interface>" >&2
-    exit 32
-fi
-
-FILTER="udp dst port 5240"
-
-exec "${SNAP:-}/usr/sbin/tcpdump" --interface "$1" --direction=in \
-    --no-promiscuous-mode --packet-buffered --immediate-mode \
-    --snapshot-length=16384 -n -w - \
-    "($FILTER) or (vlan and $FILTER)"
diff --git a/scripts/maas-dhcp-monitor b/scripts/maas-dhcp-monitor
deleted file mode 100755
index d044d1e..0000000
--- a/scripts/maas-dhcp-monitor
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -euf
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Utility script to wrap `tcpdump`, so that this script can be called with 
-# `sudo` without allowing MAAS access to read arbitrary network traffic.
-# This script is designed to be as minimal as possible, to prevent arbitrary
-# code execution.
-
-if [ $# -ne 1 ]; then
-    echo "Write DHCP traffic to stdout using tcpdump's binary PCAP format." >&2
-    echo "" >&2
-    echo "Usage:" >&2
-    echo "    $0 <interface>" >&2
-    exit 32
-fi 
-
-exec /usr/sbin/tcpdump --interface "$1" --no-promiscuous-mode \
-    --packet-buffered --immediate-mode --snapshot-length=1500 -n -w - \
-    "udp and (port 67 or port 68) or (vlan and udp and (port 67 or port 68))"
diff --git a/scripts/maas-multicast-helper b/scripts/maas-multicast-helper
deleted file mode 100755
index 8e2cfc2..0000000
--- a/scripts/maas-multicast-helper
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh -euf
-# Copyright 2017 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Helper script to join or leave MAAS-reserved multicast groups.
-# See the IANA registries for more information:
-# https://www.iana.org/assignments/multicast-addresses/multicast-addresses.xhtml
-# https://www.iana.org/assignments/ipv6-multicast-addresses/ipv6-multicast-addresses.xhtml
-
-IP="/sbin/ip"
-
-# Note: The 'ip maddr add <mcast-address> dev <ifname>' command only supports
-# link-layer multicast addresses. Specifying an IPv4 address will not work.
-# This is the equivalent of "224.0.0.118".
-IPV4_GROUP="01:00:5e:00:00:76"
-
-# This is the equivalent of the MAAS variable-scope multicast group, and
-# corresponds to the link-local scoped group "ff02::15a".
-IPV6_GROUP="33:33:00:00:01:5a"
-
-usage()
-{
-    echo "Usage: $0 <leave | join> [ifname...]" 1>&2
-    echo "    Attempts to join or leave the MAAS multicast groups." 1>&2
-    echo "    If no interfaces are specified, joins or leaves on all "`
-            `"interfaces." 1>&2
-}
-
-if [ $# -lt 1 ]; then
-    usage
-    exit 1
-
-fi
-
-SUCCESSES=0
-FAILURES=""
-
-success()
-{
-    SUCCESSES=$(($SUCCESSES+1))
-    echo "$*"
-}
-
-join()
-{
-    "$IP" maddr add "$IPV4_GROUP" dev "$1" 2> /dev/null && \
-        success "$1: joined $IPV4_GROUP" || true
-    "$IP" maddr add "$IPV6_GROUP" dev "$1" 2> /dev/null && \
-        success "$1: joined $IPV6_GROUP" || true
-}
-
-leave()
-{
-    "$IP" maddr del "$IPV4_GROUP" dev "$1" 2> /dev/null  && \
-        success "$1: left $IPV4_GROUP" || true
-    "$IP" maddr del "$IPV6_GROUP" dev "$1" 2> /dev/null && \
-        success "$1: left $IPV6_GROUP" || true
-}
-
-cmd="$1"
-shift
-
-if [ "$#" -eq 0 ]; then
-    interfaces="$(ip maddr show | awk '/^[0-9]*:/ { print $2 }')"
-else
-    interfaces="$*"
-fi
-
-
-if [ "$cmd" = "join" ]; then
-    for ifname in $interfaces; do
-        join "$ifname"
-    done
-elif [ "$cmd" = "leave" ]; then
-    for ifname in $interfaces; do
-        leave "$ifname"
-    done
-else
-    usage
-    exit 1
-fi
-
-if [ $SUCCESSES -eq 0 ]; then
-    echo "$0: $cmd failed. (Try re-running with 'sudo'.)" 1>&2
-    if [ "$cmd" = "leave" ]; then
-        echo "(This is normal if no groups were joined to begin with.)" 1>&2
-    fi
-    exit 2
-fi
diff --git a/scripts/maas-network-monitor b/scripts/maas-network-monitor
deleted file mode 100755
index 155f0b8..0000000
--- a/scripts/maas-network-monitor
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -euf
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Utility script to wrap `tcpdump`, so that this script can be called with
-# `sudo` without allowing MAAS access to read arbitrary network traffic.
-# This script is designed to be as minimal as possible, to prevent arbitrary
-# code execution.
-
-if [ $# -ne 1 ]; then
-    echo "Writes ARP traffic (and ARP traffic on tagged VLANs) to stdout" >&2
-    echo "using tcpdump's binary PCAP format." >&2
-    echo "" >&2
-    echo "Usage:" >&2
-    echo "    $0 <interface>" >&2
-    exit 32
-fi
-
-exec "${SNAP:-}/usr/sbin/tcpdump" --interface "$1" --no-promiscuous-mode \
-    --packet-buffered --immediate-mode --snapshot-length=64 -n -w - \
-    "arp or (vlan and arp)"
diff --git a/scripts/multicast-helper b/scripts/multicast-helper
new file mode 100755
index 0000000..8e2cfc2
--- /dev/null
+++ b/scripts/multicast-helper
@@ -0,0 +1,89 @@
+#!/bin/sh -euf
+# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# Helper script to join or leave MAAS-reserved multicast groups.
+# See the IANA registries for more information:
+# https://www.iana.org/assignments/multicast-addresses/multicast-addresses.xhtml
+# https://www.iana.org/assignments/ipv6-multicast-addresses/ipv6-multicast-addresses.xhtml
+
+IP="/sbin/ip"
+
+# Note: The 'ip maddr add <mcast-address> dev <ifname>' command only supports
+# link-layer multicast addresses. Specifying an IPv4 address will not work.
+# This is the equivalent of "224.0.0.118".
+IPV4_GROUP="01:00:5e:00:00:76"
+
+# This is the equivalent of the MAAS variable-scope multicast group, and
+# corresponds to the link-local scoped group "ff02::15a".
+IPV6_GROUP="33:33:00:00:01:5a"
+
+usage()
+{
+    echo "Usage: $0 <leave | join> [ifname...]" 1>&2
+    echo "    Attempts to join or leave the MAAS multicast groups." 1>&2
+    echo "    If no interfaces are specified, joins or leaves on all "`
+            `"interfaces." 1>&2
+}
+
+if [ $# -lt 1 ]; then
+    usage
+    exit 1
+
+fi
+
+SUCCESSES=0
+FAILURES=""
+
+success()
+{
+    SUCCESSES=$(($SUCCESSES+1))
+    echo "$*"
+}
+
+join()
+{
+    "$IP" maddr add "$IPV4_GROUP" dev "$1" 2> /dev/null && \
+        success "$1: joined $IPV4_GROUP" || true
+    "$IP" maddr add "$IPV6_GROUP" dev "$1" 2> /dev/null && \
+        success "$1: joined $IPV6_GROUP" || true
+}
+
+leave()
+{
+    "$IP" maddr del "$IPV4_GROUP" dev "$1" 2> /dev/null  && \
+        success "$1: left $IPV4_GROUP" || true
+    "$IP" maddr del "$IPV6_GROUP" dev "$1" 2> /dev/null && \
+        success "$1: left $IPV6_GROUP" || true
+}
+
+cmd="$1"
+shift
+
+if [ "$#" -eq 0 ]; then
+    interfaces="$(ip maddr show | awk '/^[0-9]*:/ { print $2 }')"
+else
+    interfaces="$*"
+fi
+
+
+if [ "$cmd" = "join" ]; then
+    for ifname in $interfaces; do
+        join "$ifname"
+    done
+elif [ "$cmd" = "leave" ]; then
+    for ifname in $interfaces; do
+        leave "$ifname"
+    done
+else
+    usage
+    exit 1
+fi
+
+if [ $SUCCESSES -eq 0 ]; then
+    echo "$0: $cmd failed. (Try re-running with 'sudo'.)" 1>&2
+    if [ "$cmd" = "leave" ]; then
+        echo "(This is normal if no groups were joined to begin with.)" 1>&2
+    fi
+    exit 2
+fi
diff --git a/scripts/network-monitor b/scripts/network-monitor
new file mode 100755
index 0000000..155f0b8
--- /dev/null
+++ b/scripts/network-monitor
@@ -0,0 +1,21 @@
+#!/bin/sh -euf
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# Utility script to wrap `tcpdump`, so that this script can be called with
+# `sudo` without allowing MAAS access to read arbitrary network traffic.
+# This script is designed to be as minimal as possible, to prevent arbitrary
+# code execution.
+
+if [ $# -ne 1 ]; then
+    echo "Writes ARP traffic (and ARP traffic on tagged VLANs) to stdout" >&2
+    echo "using tcpdump's binary PCAP format." >&2
+    echo "" >&2
+    echo "Usage:" >&2
+    echo "    $0 <interface>" >&2
+    exit 32
+fi
+
+exec "${SNAP:-}/usr/sbin/tcpdump" --interface "$1" --no-promiscuous-mode \
+    --packet-buffered --immediate-mode --snapshot-length=64 -n -w - \
+    "arp or (vlan and arp)"
diff --git a/setup.py b/setup.py
index 5182ca5..dffe046 100644
--- a/setup.py
+++ b/setup.py
@@ -117,9 +117,9 @@ setup(
         ('/usr/sbin',
             ['scripts/maas-dhcp-helper']),
         ('/usr/lib/maas',
-            ['scripts/maas-dhcp-monitor',
-             'scripts/maas-beacon-monitor',
-             'scripts/maas-network-monitor',
+            ['scripts/dhcp-monitor',
+             'scripts/beacon-monitor',
+             'scripts/network-monitor',
              'scripts/maas-delete-file',
              'scripts/maas-test-enlistment',
              'scripts/maas-write-file']),
diff --git a/src/provisioningserver/utils/arp.py b/src/provisioningserver/utils/arp.py
index 8e1f024..70528e7 100644
--- a/src/provisioningserver/utils/arp.py
+++ b/src/provisioningserver/utils/arp.py
@@ -366,7 +366,7 @@ def add_arguments(parser):
     parser.add_argument(
         '-i', '--input-file', type=str, required=False,
         help="File to read PCAP output from. Use - for stdin. Default is to "
-             "call `sudo /usr/lib/maas/maas-network-monitor` to get input.")
+             "call `sudo /usr/lib/maas/network-monitor` to get input.")
 
 
 def run(args, output=sys.stdout, stdin=sys.stdin,
@@ -381,7 +381,7 @@ def run(args, output=sys.stdout, stdin=sys.stdin,
     if args.input_file is None:
         if args.interface is None:
             raise ActionScriptError("Required argument: interface")
-        cmd = [get_path("/usr/lib/maas/maas-network-monitor"), args.interface]
+        cmd = [get_path("/usr/lib/maas/network-monitor"), args.interface]
         cmd = sudo(cmd)
         network_monitor = subprocess.Popen(
             cmd, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE)
diff --git a/src/provisioningserver/utils/beaconing.py b/src/provisioningserver/utils/beaconing.py
index c28132c..2554725 100644
--- a/src/provisioningserver/utils/beaconing.py
+++ b/src/provisioningserver/utils/beaconing.py
@@ -339,7 +339,7 @@ def add_arguments(parser):
     parser.add_argument(
         '-i', '--input-file', type=str, required=False,
         help="File to read beaconing output from. Use - for stdin. Default is "
-             "to call `sudo /usr/lib/maas/maas-beacon-monitor` to get input.")
+             "to call `sudo /usr/lib/maas/beacon-monitor` to get input.")
 
 
 def run(args, output=sys.stdout, stdin=sys.stdin,
@@ -355,7 +355,7 @@ def run(args, output=sys.stdout, stdin=sys.stdin,
         if args.interface is None:
             raise ActionScriptError("Required argument: interface")
         cmd = sudo(
-            [get_path("/usr/lib/maas/maas-beacon-monitor"), args.interface])
+            [get_path("/usr/lib/maas/beacon-monitor"), args.interface])
         network_monitor = subprocess.Popen(
             cmd, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE)
         infile = network_monitor.stdout
diff --git a/src/provisioningserver/utils/dhcp.py b/src/provisioningserver/utils/dhcp.py
index c912855..84e199a 100644
--- a/src/provisioningserver/utils/dhcp.py
+++ b/src/provisioningserver/utils/dhcp.py
@@ -244,7 +244,7 @@ def add_arguments(parser):
     parser.add_argument(
         '-i', '--input-file', type=str, required=False,
         help="File to read PCAP output from. Use - for stdin. Default is to "
-             "call `sudo /usr/lib/maas/maas-dhcp-monitor` to get input.")
+             "call `sudo /usr/lib/maas/dhcp-monitor` to get input.")
 
 
 def run(args, output=sys.stdout, stdin=sys.stdin,
@@ -255,7 +255,7 @@ def run(args, output=sys.stdout, stdin=sys.stdin,
         if args.interface is None:
             raise ActionScriptError("Required argument: interface")
         cmd = sudo(
-            [get_path("/usr/lib/maas/maas-dhcp-monitor"), args.interface])
+            [get_path("/usr/lib/maas/dhcp-monitor"), args.interface])
         network_monitor = subprocess.Popen(
             cmd, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
             stderr=subprocess.DEVNULL
diff --git a/src/provisioningserver/utils/tests/test_arp.py b/src/provisioningserver/utils/tests/test_arp.py
index e8622a5..86ee5ac 100644
--- a/src/provisioningserver/utils/tests/test_arp.py
+++ b/src/provisioningserver/utils/tests/test_arp.py
@@ -443,7 +443,7 @@ class TestObserveARPCommand(MAASTestCase):
         self.assertThat(
             popen,
             MockCalledOnceWith(
-                ['sudo', '-n', '/usr/lib/maas/maas-network-monitor', 'eth0'],
+                ['sudo', '-n', '/usr/lib/maas/network-monitor', 'eth0'],
                 stdin=subprocess.DEVNULL, stdout=subprocess.PIPE))
 
     def test__calls_subprocess_for_interface_sudo(self):
@@ -459,7 +459,7 @@ class TestObserveARPCommand(MAASTestCase):
         self.assertThat(
             popen,
             MockCalledOnceWith(
-                ['sudo', '-n', '/usr/lib/maas/maas-network-monitor', 'eth0'],
+                ['sudo', '-n', '/usr/lib/maas/network-monitor', 'eth0'],
                 stdin=subprocess.DEVNULL, stdout=subprocess.PIPE))
 
     def test__checks_for_pipe(self):
diff --git a/src/provisioningserver/utils/tests/test_beaconing.py b/src/provisioningserver/utils/tests/test_beaconing.py
index 514b209..708512a 100644
--- a/src/provisioningserver/utils/tests/test_beaconing.py
+++ b/src/provisioningserver/utils/tests/test_beaconing.py
@@ -234,7 +234,7 @@ class TestObserveBeaconsCommand(MAASTestCase):
         self.assertThat(
             popen,
             MockCalledOnceWith(
-                ['sudo', '-n', '/usr/lib/maas/maas-beacon-monitor', 'eth0'],
+                ['sudo', '-n', '/usr/lib/maas/beacon-monitor', 'eth0'],
                 stdin=subprocess.DEVNULL, stdout=subprocess.PIPE))
 
     def test__calls_subprocess_for_interface_sudo(self):
@@ -250,7 +250,7 @@ class TestObserveBeaconsCommand(MAASTestCase):
         self.assertThat(
             popen,
             MockCalledOnceWith(
-                ['sudo', '-n', '/usr/lib/maas/maas-beacon-monitor', 'eth0'],
+                ['sudo', '-n', '/usr/lib/maas/beacon-monitor', 'eth0'],
                 stdin=subprocess.DEVNULL, stdout=subprocess.PIPE))
 
     def test__checks_for_pipe(self):
diff --git a/utilities/install-sudoers b/utilities/install-sudoers
index ed498d6..9d421e0 100755
--- a/utilities/install-sudoers
+++ b/utilities/install-sudoers
@@ -2,33 +2,33 @@
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-echo "Copying /usr/lib/maas/maas-network-monitor..."
+echo "Copying /usr/lib/maas/network-monitor..."
 sudo mkdir -p /usr/lib/maas
-sudo cp "$SCRIPT_DIR/../scripts/maas-network-monitor" /usr/lib/maas/maas-network-monitor
-echo "Copying /usr/lib/maas/maas-dhcp-monitor..."
-sudo cp "$SCRIPT_DIR/../scripts/maas-dhcp-monitor" /usr/lib/maas/maas-dhcp-monitor
-echo "Copying /usr/lib/maas/maas-beacon-monitor..."
-sudo cp "$SCRIPT_DIR/../scripts/maas-beacon-monitor" /usr/lib/maas/maas-beacon-monitor
+sudo cp "$SCRIPT_DIR/../scripts/network-monitor" /usr/lib/maas/network-monitor
+echo "Copying /usr/lib/maas/dhcp-monitor..."
+sudo cp "$SCRIPT_DIR/../scripts/dhcp-monitor" /usr/lib/maas/dhcp-monitor
+echo "Copying /usr/lib/maas/beacon-monitor..."
+sudo cp "$SCRIPT_DIR/../scripts/beacon-monitor" /usr/lib/maas/beacon-monitor
 
 SUDOERS_FILE=/etc/sudoers.d/99-maas-dev-$USER
 
 echo "Installing sudoers file: $SUDOERS_FILE"
 cat << EOF | sudo tee $SUDOERS_FILE
-$USER ALL= NOPASSWD: /usr/lib/maas/maas-network-monitor
-$USER ALL= NOPASSWD: /usr/lib/maas/maas-dhcp-monitor
-$USER ALL= NOPASSWD: /usr/lib/maas/maas-beacon-monitor
+$USER ALL= NOPASSWD: /usr/lib/maas/network-monitor
+$USER ALL= NOPASSWD: /usr/lib/maas/dhcp-monitor
+$USER ALL= NOPASSWD: /usr/lib/maas/beacon-monitor
 EOF
 sudo chmod 440 $SUDOERS_FILE
 
 echo ""
 echo "Done. You should now be able to run the following to get raw 'tcpdump' output:"
-echo "    sudo /usr/lib/maas/maas-network-monitor <interface>"
-echo "    sudo /usr/lib/maas/maas-dhcp-monitor <interface>"
-echo "    sudo /usr/lib/maas/maas-beacon-monitor <interface>"
+echo "    sudo /usr/lib/maas/network-monitor <interface>"
+echo "    sudo /usr/lib/maas/dhcp-monitor <interface>"
+echo "    sudo /usr/lib/maas/beacon-monitor <interface>"
 echo ""
 echo "In addition, the following commands should now work in the dev env:"
 echo "Done. You should now be able to do the following to get raw 'tcpdump' output:"
-echo "    sudo /usr/lib/maas/maas-dhcp-monitor <interface>"
+echo "    sudo /usr/lib/maas/dhcp-monitor <interface>"
 echo "In addition, the following command should now work in the dev env:"
 echo "    bin/maas-rack observe-arp <interface>"
 echo "    bin/maas-rack observe-dhcp <interface>"