From 0681e213aef6a62b9beab2f90db61524ed4464fd Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 19 Jan 2011 03:19:15 +0000 Subject: add handling of rsyslog in cloud-config This adds the following cloud-config keys: - 'rsyslog_dir' default: /etc/rsyslog.d - 'rsyslog_filename' default: 20-cloud-config.conf - 'rsyslog' (list) default: empty --- cloudinit/CloudConfig/cc_rsyslog.py | 86 +++++++++++++++++++++++++++++++++++++ config/cloud.cfg | 1 + doc/examples/cloud-config.txt | 20 +++++++++ 3 files changed, 107 insertions(+) create mode 100644 cloudinit/CloudConfig/cc_rsyslog.py diff --git a/cloudinit/CloudConfig/cc_rsyslog.py b/cloudinit/CloudConfig/cc_rsyslog.py new file mode 100644 index 00000000..53fa1d23 --- /dev/null +++ b/cloudinit/CloudConfig/cc_rsyslog.py @@ -0,0 +1,86 @@ +# vi: ts=4 expandtab syntax=python +# +# Copyright (C) 2009-2010 Canonical Ltd. +# +# Author: Scott Moser +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +import cloudinit +import logging +import cloudinit.util as util +import subprocess +import traceback + +DEF_FILENAME = "20-cloud-config.conf" +DEF_DIR = "/etc/rsyslog.d" + +def handle(name,cfg,cloud,log,args): + # rsyslog: + # - "*.* @@192.158.1.1" + # - content: "*.* @@192.0.2.1:10514" + # - filename: 01-examplecom.conf + # content: | + # *.* @@syslogd.example.com + + # process 'rsyslog' + if not 'rsyslog' in cfg: return True + + def_dir = cfg.get('rsyslog_dir', DEF_DIR) + def_fname = cfg.get('rsyslog_filename', DEF_FILENAME) + + entries = cfg['rsyslog'] + + files = [ ] + elst = [ ] + for ent in cfg['rsyslog']: + if isinstance(ent,dict): + if not "content" in ent: + elst.append((ent, "no 'content' entry")) + continue + content = ent['content'] + filename = ent.get("filename", def_fname) + else: + content = ent + filename = def_fname + + if not filename.startswith("/"): + filename = "%s/%s" % (def_dir,filename) + + omode = "ab" + # truncate filename first time you see it + if filename not in files: + omode = "wb" + files.append(filename) + + try: + util.write_file(filename, content + "\n", omode=omode) + except Exception, e: + log.debug(traceback.format_exc(e)) + elst.append((content, "failed to write to %s" % filename)) + + # need to restart syslogd + try: + log.debug("restarting rsyslog") + p = util.subp(['service', 'rsyslog', 'restart']) + except Exception, e: + elst.append(("restart", str(e))) + + for e in elst: + log.warn("rsyslog error: %s\n" % ':'.join(e)) + return False + + cloudinit.logging_set_from_cfg_file() + log = logging.getLogger() + log.debug("rsyslog configured %s" % files) + + return True diff --git a/config/cloud.cfg b/config/cloud.cfg index 0bff9a88..8556dc78 100644 --- a/config/cloud.cfg +++ b/config/cloud.cfg @@ -5,6 +5,7 @@ preserve_hostname: False cloud_config_modules: - mounts + - rsyslog - ssh-import-id - locale - ssh diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index 70724590..58082667 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -25,6 +25,9 @@ apt_mirror: http://us.archive.ubuntu.com/ubuntu/ apt_preserve_sources_list: true apt_sources: + - source: "deb http://ppa.launchpad.net/byobu/ppa/ubuntu karmic main" + keyid: F430BBA5 # GPG key ID published on a key server + filename: byobu-ppa.list # PPA shortcut: # * Setup correct apt sources.list line @@ -249,3 +252,20 @@ disable_root: false # set the locale to a given locale # default: en_US.UTF-8 +locale: en_US.UTF-8 + +# add entries to rsyslog configuration +# The first occurance of a given filename will truncate. +# subsequent entries will append. +# if value is a scalar, its content is assumed to be 'content', and the +# default filename is used. +# if filename is not provided, it will default to 'rsylog_filename' +# if filename does not start with a '/', it will be put in 'rsyslog_dir' +# rsyslog_dir default: /etc/rsyslog.d +# rsyslog_filename default: 20-cloud-config.conf +rsyslog: + - ':syslogtag, isequal, "[CLOUDINIT]" /var/log/cloud-foo.log' + - content: "*.* @@192.0.2.1:10514" + - filename: 01-examplecom.conf + content: | + *.* @@syslogd.example.com -- cgit v1.2.3