Merge lp:~verterok/charms/trusty/tanuki-spec-manager/gunicorn-metrics into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

[Guillermo Gonzalez]

add statsd config for gunicorn

add statsd config for gunicorn

[lp:~verterok/charms/trusty/tanuki-spec-manager/gunicorn-metrics]

33. By Guillermo Gonzalez on 2015-10-14

fix config and skip config if there is no statsd section

Unmerged revisions

33. By Guillermo Gonzalez on 2015-10-14

fix config and skip config if there is no statsd section

32. By Guillermo Gonzalez on 2015-10-14

add statsd config for gunicorn

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-10-05 14:39:08 +0000
+++ hooks/actions.py	2015-10-14 20:17:46 +0000
@@ -89,6 +89,26 @@
                            '-r', requirements])
 
 
+def render_upstart(service_name):
+    parser = ConfigParser.ConfigParser()
+    config_file = os.path.join(SERVICE_DIR, 'service.conf')
+    parser.read([config_file])
+    if 'statsd' not in parser.sections():
+        # no statsd config, bail out
+        return
+    prefix = parser.get('statsd', 'prefix')
+    host = parser.get('statsd', 'host')
+    port = parser.get('statsd', 'port')
+    context = {}
+    context.update(config)
+    revno, unit_idx = hookenv.local_unit().split('-r')[-1].split('/')
+    config['metrics_prefix'] = "{}.gunicorn.r{}-{}".format(prefix, revno, unit_idx)
+    config['metrics_target'] = "{}:{}".format(host, port)
+    render(source='upstart.conf',
+           target='/etc/init/spec-manager.conf',
+           context=config)
+
+
 def prepare_for_wsgi(service_name):
     host.adduser(WSGI_USER)
     host.add_group(WSGI_GROUP)

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-09-14 19:48:15 +0000
+++ hooks/services.py	2015-10-14 20:17:46 +0000
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
 from charmhelpers.core import hookenv
-from charmhelpers.core.services import helpers
 from charmhelpers.core.services.base import ServiceManager
 
 import actions
@@ -23,9 +22,7 @@
                 actions.install_python_packages,
                 actions.get_config_file,
                 actions.prepare_for_wsgi,
-                helpers.render_template(
-                    source='upstart.conf',
-                    target='/etc/init/spec-manager.conf'),
+                actions.render_upstart,
                 actions.write_db_config,
                 actions.setup_store_poller,
                 actions.publish_conn_check_relation_data,

=== modified file 'templates/upstart.conf'
--- templates/upstart.conf	2015-09-04 11:29:29 +0000
+++ templates/upstart.conf	2015-10-14 20:17:46 +0000
@@ -28,7 +28,9 @@
     --workers={{ gunicorn_num_workers }} \
     --log-file=${LOG_DIR}/gunicorn.log \
     --log-level=INFO \
-    --access-logfile=${LOG_DIR}/access.log \
+    --access-logfile=${LOG_DIR}/access.log \{% if metrics_prefix and metrics_target %}
+    --statsd-prefix={{ metrics_prefix }} \
+    --statsd-host={{ metrics_target }} \{% endif %}
     specmgr.wsgi:app
 
 end script