Merge lp:~hloeung/ubuntu-repository-cache/fix-nrpe-checks into lp:ubuntu-repository-cache

[Haw Loeung]

Fixed nrpe checks, escaping spaces

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Thomas Cuthbert (tcuthbert)]

LGTM+1

review: Approve

[lp:~hloeung/ubuntu-repository-cache/fix-nrpe-checks]

348. By Haw Loeung on 2022-05-30

Minor fix

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 347

=== modified file 'lib/ubuntu_repository_cache/apache.py'
--- lib/ubuntu_repository_cache/apache.py	2022-05-30 01:55:13 +0000
+++ lib/ubuntu_repository_cache/apache.py	2022-05-30 03:41:43 +0000
@@ -359,8 +359,8 @@
                     '--hostname ubuntu-archive-asm.trafficmanager.net '
                     '--url "/{}/" '
                     '--string "dists/" '
-                    '--expect 200\\\ OK '
-                    '--header Accept-Encoding:\\\ \\\*'
+                    '--expect 200\\ OK '
+                    '--header Accept-Encoding:\\ \\*'
                 ).format(path_base),
             )
 
@@ -372,7 +372,7 @@
             '--hostname localhost '
             '--url "/{}/" '
             '--string "dists/" '
-            '--expect 200\\\ OK '
-            '--header Accept-Encoding:\\\ \\\*'
+            '--expect 200\\ OK '
+            '--header Accept-Encoding:\\ \\*'
         ).format(path_base),
     )

=== modified file 'lib/ubuntu_repository_cache/mirror.py'
--- lib/ubuntu_repository_cache/mirror.py	2021-03-01 04:50:56 +0000
+++ lib/ubuntu_repository_cache/mirror.py	2022-05-30 03:41:43 +0000
@@ -102,7 +102,7 @@
 
 @util.run_as_user('www-sync')
 def rsync_from_peer(source_dir, dest_dir, peer_ip, link_dir=None, user='www-sync'):
-    '''Use rsync to pull a directory from a configured peer.  '''
+    '''Use rsync to pull a directory from a configured peer.'''
 
     rsync_source = '{}@{}:{}'.format(user, peer_ip, source_dir)
     LOG('Syncing {} to {}.'.format(rsync_source, dest_dir))

=== modified file 'lib/ubuntu_repository_cache/squid.py'
--- lib/ubuntu_repository_cache/squid.py	2022-05-30 01:55:13 +0000
+++ lib/ubuntu_repository_cache/squid.py	2022-05-30 03:41:43 +0000
@@ -248,7 +248,7 @@
 
 
 def update_checks(nrpe_config):
-    ''''Update Nagios checks for squid serving archive pool content'''
+    '''Update Nagios checks for squid serving archive pool content'''
 
     path_base = hookenv.config()['path-base']
     nrpe_config.add_check(
@@ -259,7 +259,7 @@
             '--hostname localhost '
             '--url "/{}/pool/" '
             '--string "main/" '
-            '--expect 200\\\ OK '
-            '--header Accept-Encoding:\\\ \\\*'
+            '--expect 200\\ OK '
+            '--header Accept-Encoding:\\ \\*'
         ).format(path_base),
     )

=== modified file 'tox.ini'
--- tox.ini	2021-02-16 23:48:45 +0000
+++ tox.ini	2022-05-30 03:41:43 +0000
@@ -32,5 +32,6 @@
     .bzr,
     __pycache__,
     .tox,
+    build,
 max-line-length = 120
 max-complexity = 14