diff --git a/ceilometer/event/trait_plugins.py b/ceilometer/event/trait_plugins.py index c0083b5c..78a4c664 100644 --- a/ceilometer/event/trait_plugins.py +++ b/ceilometer/event/trait_plugins.py @@ -166,7 +166,7 @@ class BitfieldTraitPlugin(TraitPluginBase): value: set bit if corresponding field's value matches this. If value is not provided, bit will be set if the field exists (and - is non-null), regardless of it's value. + is non-null), regardless of its value. """ self.initial_bitfield = initial_bitfield diff --git a/ceilometer/publisher/kafka_broker.py b/ceilometer/publisher/kafka_broker.py index 3018841e..1ad16564 100644 --- a/ceilometer/publisher/kafka_broker.py +++ b/ceilometer/publisher/kafka_broker.py @@ -55,9 +55,9 @@ class KafkaBrokerPublisher(messaging.MessagingPublisher): metering data under a topic name, 'ceilometer'. If the port number is not specified, this Kafka Publisher will use 9092 as the broker's port. This publisher has transmit options such as queue, drop, and retry. These - this option is specified using policy field of URL parameter. When queue + options are specified using policy field of URL parameter. When queue option could be selected, local queue length can be determined using - max_queue_length field as well. When the transfer fails with with retry + max_queue_length field as well. When the transfer fails with retry option, try to resend the data as many times as specified in max_retry field. If max_retry is not specified, default the number of retry is 100. """ diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 268d16fe..abcedff1 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -397,7 +397,7 @@ function start_ceilometer { tail_log ceilometer-api /var/log/$APACHE_NAME/ceilometer_access.log fi - # run the the collector after restarting apache as it needs + # run the collector after restarting apache as it needs # operational keystone if using gnocchi run_process ceilometer-collector "$CEILOMETER_BIN_DIR/ceilometer-collector --config-file $CEILOMETER_CONF" diff --git a/doc/source/install/manual.rst b/doc/source/install/manual.rst index 30d58f24..8a78e5d8 100644 --- a/doc/source/install/manual.rst +++ b/doc/source/install/manual.rst @@ -554,7 +554,7 @@ Ceilometer allows multiple topics to be configured so that polling agent can send the same messages of notifications to other queues. Notification agents also use **notification_topics** to configure which queue to listen for. If you use multiple topics, you should configure notification agent and polling -agent seperately, otherwise Ceilometer collects duplicate samples. +agent separately, otherwise Ceilometer collects duplicate samples. By default, the ceilometer.conf file is as follows:: @@ -564,7 +564,7 @@ By default, the ceilometer.conf file is as follows:: To use multiple topics, you should give ceilometer-agent-notification and ceilometer-polling services different ceilometer.conf files. The Ceilometer configuration file ceilometer.conf is normally locate in the /etc/ceilometer -directory. Make changes according to your requirments which may look like +directory. Make changes according to your requirements which may look like the following:: For notification agent using ceilometer-notification.conf, settings like::