diff --git a/config.yaml b/config.yaml index b687fe1..a5888c7 100644 --- a/config.yaml +++ b/config.yaml @@ -34,3 +34,9 @@ options: default: openstack type: string description: RabbitMQ virtual host to request access on rabbitmq-server. + use-syslog: + type: boolean + default: False + description: | + By default, all services will log into their corresponding log files. + Setting this to True will force all services to log to the syslog. diff --git a/hooks/ceilometer_utils.py b/hooks/ceilometer_utils.py index 3919b34..9b84c60 100644 --- a/hooks/ceilometer_utils.py +++ b/hooks/ceilometer_utils.py @@ -48,7 +48,8 @@ CONFIG_FILES = { context.AMQPContext(ssl_dir=CEILOMETER_CONF_DIR), LoggingConfigContext(), MongoDBContext(), - CeilometerContext()], + CeilometerContext(), + context.SyslogContext()], 'services': CEILOMETER_SERVICES } } diff --git a/icon.svg b/icon.svg new file mode 100644 index 0000000..84de61c --- /dev/null +++ b/icon.svg @@ -0,0 +1,717 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/revision b/revision index d81cc07..920a139 100644 --- a/revision +++ b/revision @@ -1 +1 @@ -42 +43 diff --git a/templates/grizzly/ceilometer.conf b/templates/grizzly/ceilometer.conf index 657aeeb..79b1b55 100644 --- a/templates/grizzly/ceilometer.conf +++ b/templates/grizzly/ceilometer.conf @@ -7,6 +7,7 @@ [DEFAULT] debug = {{ debug }} verbose = {{ verbose }} +use_syslog = {{ use_syslog }} metering_secret = {{ metering_secret }} metering_api_port = {{ port }} diff --git a/templates/havana/ceilometer.conf b/templates/havana/ceilometer.conf index 854d3dc..8f6a64c 100644 --- a/templates/havana/ceilometer.conf +++ b/templates/havana/ceilometer.conf @@ -7,6 +7,7 @@ [DEFAULT] debug = {{ debug }} verbose = {{ verbose }} +use_syslog = {{ use_syslog }} rabbit_host = {{ rabbitmq_host }} rabbit_userid = {{ rabbitmq_user }}