← Back to branch summary

~paulgear/charms/trusty/memcached/correct-nagios-service

« back to all changes in this revision

Viewing changes to hooks/memcached_hooks.py

  • Committer: Paul Gear
  • Date: 2015-02-24 06:55:41 UTC
  • Revision ID: paul.gear@canonical.com-20150224065541-yq9g0v8cv01d6fr4
https://launchpad.net/bugs/1424938
Use correct template and config variables

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/memcached_hooks.py
290
290
 
291
291
    nagios_hostname = "{}-{}".format(config('nagios_context'),
292
292
                                     local_unit().replace('/', '-'))
293
 
    configs = {'tcp_port': config('tcp_port'),
294
 
               'servicegroup': config('nagios-context'),
295
 
               'hostname': nagios_hostname}
 
293
    configs = {'tcp_port': config('tcp-port'),
 
294
               'NAGIOS_SERVICEGROUP': config('nagios_context'),
 
295
               'NAGIOS_HOSTNAME': nagios_hostname}
296
296
 
297
297
    templating.render('nrpe_check_memcached.cfg.tmpl',
298
298
                      '/etc/nagios/nrpe.d/check_memcached.cfg',