Merge lp:~jacekn/charms/precise/haproxy/haproxy-stats-socket into lp:charms/haproxy

[Jacek Nykis]

* add support for stats socket including specifying access level
* add new "install_hatop" config option

This MP includes changes from here:
https://code.launchpad.net/~aglenyoung/charms/precise/haproxy/haproxy-stats-socket/+merge/201980

[Marco Ceppi (marcoceppi)]

The unit tests fail for me:

$ make test

http://paste.ubuntu.com/7033134/

Lint fails with the following:

Checking for Python syntax...
/tmp/precise/haproxy/hooks/hooks.py:638:62: E901 SyntaxError: invalid token
/tmp/precise/haproxy/hooks/tests/utils_for_tests.py:13:32: F821 undefined name 'file'
make: *** [lint] Error 1

Once these have been addressed and you're ready for another review make sure to "Request another review" from "charmers" to have it placed back in the queue. Thanks!

review: Needs Fixing

[Marco Ceppi (marcoceppi)]

I've moved this to work in progress. If it's still valid feel free to move it to Needs Review after updates, if you need to remove this please move the merge to either Rejected or antoher similar status.

Unmerged revisions

81. By Jacek Nykis on 2014-02-19

Fixed small bug when using global_stats_socket_level

80. By Jacek Nykis on 2014-02-19

Added install_hatop config option

79. By Jacek Nykis on 2014-02-19

Added global_stats_socket_level option to allow restricted socket creation

78. By Jacek Nykis on 2014-02-19

Merged Andrew's haproxy stats socket changes

77. By Jacek Nykis on 2014-02-19

Merged Andres changes to fix test linting errors and update README with additional required packages to run the test suite.

=== modified file 'README.md'
--- README.md	2014-01-07 19:03:41 +0000
+++ README.md	2014-02-19 17:52:19 +0000
@@ -97,7 +97,7 @@
     sudo apt-get install python-software-properties
     sudo add-apt-repository ppa:cjohnston/flake8
     sudo apt-get update
-    sudo apt-get install python-mock python-flake8 python-nose python-nosexcover
+    sudo apt-get install python-mock python-flake8 python-nose python-nosexcover python-testtools charm-tools
 
 To run the tests:
 
 
=== modified file 'config.yaml'
--- config.yaml	2014-01-07 18:44:15 +0000
+++ config.yaml	2014-02-19 17:52:19 +0000
@@ -34,6 +34,17 @@
         the same physical server. With the help of this parameter, it becomes 
         possible to add some randomness in the check interval between 0 and 
         +/- 50%. A value between 2 and 5 seems to show good results.
+  global_stats_socket:
+    default: False
+    type: boolean
+    description: |
+        Whether to enable the stats UNIX socket.
+  global_stats_socket_level:
+    default: "user"
+    type: string
+    description: |
+        Privilege level for the stats socket. Only used if global_stats_socket
+        is set to True. Accepted values are: "user", "operator" and "admin".
   default_log:
     default: "global"
     type: string
@@ -90,6 +101,13 @@
     default: 3
     type: int
     description: Monitoring interface refresh interval (in seconds)
+  install_hatop:
+    default: False
+    type: boolean
+    description: |
+        If set to True hatop package will be installed. The package requires
+        stats socket, see global_stats_socket and global_stats_socket_level
+        options for details
   package_status:
     default: "install"
     type: "string"
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-01-21 15:46:29 +0000
+++ hooks/hooks.py	2014-02-19 17:52:19 +0000
@@ -25,7 +25,7 @@
     close_port,
     unit_get,
     )
-from charmhelpers.fetch import apt_install
+from charmhelpers.fetch import apt_install, apt_purge
 from charmhelpers.contrib.charmsupport import nrpe
 
 
@@ -125,6 +125,13 @@
         haproxy_globals.append("    quiet")
     haproxy_globals.append("    spread-checks %d" %
                            config_data['global_spread_checks'])
+    if config_data['global_stats_socket'] is True:
+        sock_path = "/var/run/haproxy/haproxy.sock"
+        socket_level = config_data['global_stats_socket_level']
+        if socket_level not in ["user", "operator", "admin"]:
+            socket_level = "user"
+        haproxy_globals.append("    stats socket %s mode 0600 level %s" % (
+            sock_path, socket_level))
     return '\n'.join(haproxy_globals)
 
 
@@ -765,7 +772,10 @@
                              haproxy_defaults,
                              haproxy_monitoring,
                              haproxy_services)
-
+    if config_data['install_hatop'] is True:
+        apt_install('hatop', fatal=True)
+    else:
+        apt_purge('hatop', fatal=True)
     if service_haproxy("check"):
         update_service_ports(old_service_ports, get_service_ports())
         service_haproxy("reload")
 
=== modified file 'hooks/tests/test_helpers.py'
--- hooks/tests/test_helpers.py	2013-12-17 16:00:29 +0000
+++ hooks/tests/test_helpers.py	2014-02-19 17:52:19 +0000
@@ -23,9 +23,12 @@
             'global_spread_checks': 234,
             'global_debug': False,
             'global_quiet': False,
+            'global_stats_socket': True,
+            'global_stats_socket_level': "invalid-user",
         }
         result = hooks.create_haproxy_globals()
 
+        sock_path = "/var/run/haproxy/haproxy.sock"
         expected = '\n'.join([
             'global',
             '    log foo-log',
@@ -34,6 +37,7 @@
             '    user foo-user',
             '    group foo-group',
             '    spread-checks 234',
+            '    stats socket %s mode 0600 level user' % sock_path,
         ])
         self.assertEqual(result, expected)
 
@@ -47,9 +51,12 @@
             'global_spread_checks': 234,
             'global_debug': True,
             'global_quiet': True,
+            'global_stats_socket': True,
+            'global_stats_socket_level': "operator",
         }
         result = hooks.create_haproxy_globals()
 
+        sock_path = "/var/run/haproxy/haproxy.sock"
         expected = '\n'.join([
             'global',
             '    log foo-log',
@@ -60,6 +67,7 @@
             '    debug',
             '    quiet',
             '    spread-checks 234',
+            '    stats socket %s mode 0600 level operator' % sock_path,
         ])
         self.assertEqual(result, expected)