diff --git a/ceilometer/api/v1/blueprint.py b/ceilometer/api/v1/blueprint.py index 84ad16fcf..a0a2a40a8 100644 --- a/ceilometer/api/v1/blueprint.py +++ b/ceilometer/api/v1/blueprint.py @@ -391,7 +391,7 @@ def _list_samples(meter, user=None): """Return a list of raw samples. - Note: the API talks about "events" these are equivelent to samples. + Note: the API talks about "events" these are equivalent to samples. but we still need to return the samples within the "events" dict to maintain API compatibilty. """ diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index 5557acb30..49d27d272 100644 --- a/ceilometer/event/converter.py +++ b/ceilometer/event/converter.py @@ -279,7 +279,7 @@ class NotificationEventsConverter(object): * ['*', '!image.*'] same as above. traits: dictionary, The keys are trait names, the values are the trait definitions - Each trait definiton is a dictionary with the following keys: + Each trait definition is a dictionary with the following keys: type (optional): The data type for this trait. (as a string) Valid options are: 'text', 'int', 'float' and 'datetime' defaults to 'text' if not specified. diff --git a/ceilometer/openstack/common/rpc/matchmaker.py b/ceilometer/openstack/common/rpc/matchmaker.py index d76ac8db5..9551f26b8 100644 --- a/ceilometer/openstack/common/rpc/matchmaker.py +++ b/ceilometer/openstack/common/rpc/matchmaker.py @@ -90,7 +90,7 @@ class MatchMakerBase(object): """Acknowledge that a key.host is alive. Used internally for updating heartbeats, but may also be used - publically to acknowledge a system is alive (i.e. rpc message + publicly to acknowledge a system is alive (i.e. rpc message successfully sent to host) """ pass @@ -172,7 +172,7 @@ class HeartbeatMatchMakerBase(MatchMakerBase): """Acknowledge that a host.topic is alive. Used internally for updating heartbeats, but may also be used - publically to acknowledge a system is alive (i.e. rpc message + publicly to acknowledge a system is alive (i.e. rpc message successfully sent to host) """ raise NotImplementedError("Must implement ack_alive") diff --git a/ceilometer/sample.py b/ceilometer/sample.py index a5b10bae1..8c9dadfe7 100644 --- a/ceilometer/sample.py +++ b/ceilometer/sample.py @@ -34,7 +34,7 @@ OPTS = [ cfg.StrOpt('sample_source', default='openstack', deprecated_name='counter_source', - help='Source for samples emited on this instance'), + help='Source for samples emitted on this instance'), ] cfg.CONF.register_opts(OPTS) diff --git a/ceilometer/storage/base.py b/ceilometer/storage/base.py index dada7def6..b7abf354d 100644 --- a/ceilometer/storage/base.py +++ b/ceilometer/storage/base.py @@ -245,7 +245,7 @@ class Connection(object): end_timestamp=None, end_timestamp_op=None): """Yields list of AlarmChanges describing alarm history - Changes are always sorted in reverse order of occurence, given + Changes are always sorted in reverse order of occurrence, given the importance of currency. Segregation for non-administrative users is done on the basis diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py index 289d5cd8b..86bfccfad 100644 --- a/ceilometer/storage/impl_mongodb.py +++ b/ceilometer/storage/impl_mongodb.py @@ -910,7 +910,7 @@ class Connection(base.Connection): end_timestamp=None, end_timestamp_op=None): """Yields list of AlarmChanges describing alarm history - Changes are always sorted in reverse order of occurence, given + Changes are always sorted in reverse order of occurrence, given the importance of currency. Segregation for non-administrative users is done on the basis diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index fc5f5af9f..8e31d18c3 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/ceilometer/storage/impl_sqlalchemy.py @@ -789,7 +789,7 @@ class Connection(base.Connection): end_timestamp=None, end_timestamp_op=None): """Yields list of AlarmChanges describing alarm history - Changes are always sorted in reverse order of occurence, given + Changes are always sorted in reverse order of occurrence, given the importance of currency. Segregation for non-administrative users is done on the basis diff --git a/ceilometer/storage/models.py b/ceilometer/storage/models.py index 2d414608a..44c206a59 100644 --- a/ceilometer/storage/models.py +++ b/ceilometer/storage/models.py @@ -62,7 +62,7 @@ class Event(Model): the Event ID, which comes from the underlying storage system. :param event_type: The type of the event. - :param generated: UTC time for when the event occured. + :param generated: UTC time for when the event occurred. :param traits: list of Traits on this Event. """ Model.__init__(self, message_id=message_id, event_type=event_type, diff --git a/ceilometer/tests/api/v2/test_alarm_scenarios.py b/ceilometer/tests/api/v2/test_alarm_scenarios.py index 51e0d25f1..067827cf5 100644 --- a/ceilometer/tests/api/v2/test_alarm_scenarios.py +++ b/ceilometer/tests/api/v2/test_alarm_scenarios.py @@ -434,7 +434,7 @@ class TestAlarms(FunctionalTest, json['threshold_rule']['query'].append({ 'field': 'project_id', 'op': 'eq', 'value': self.auth_headers['X-Project-Id']}) - # to check to BoundedInt type convertion + # to check to BoundedInt type conversion json['threshold_rule']['evaluation_periods'] = 3 json['threshold_rule']['period'] = 180 if alarms[0].name == 'added_alarm': diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 76ae09a15..8600b0596 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -37,7 +37,7 @@ cinder_control_exchange cinder Exchange neutron_control_exchange neutron Exchange name for Neutron notifications metering_secret change this or be hacked Secret value for signing metering messages metering_topic metering the topic ceilometer uses for metering messages -sample_source openstack The source name of emited samples +sample_source openstack The source name of emitted samples control_exchange ceilometer AMQP exchange to connect to if using RabbitMQ or Qpid database_connection mongodb://localhost:27017/ceilometer Database connection string metering_api_port 8777 The port for the ceilometer API server diff --git a/doc/source/events.rst b/doc/source/events.rst index c3b97e6dd..9a6fc1ec9 100644 --- a/doc/source/events.rst +++ b/doc/source/events.rst @@ -43,7 +43,7 @@ Event Structure Events contain the following information: event_type - A dotted string defining what event occured, such as "compute.instance.resize.start" + A dotted string defining what event occurred, such as "compute.instance.resize.start" message_id A UUID for this event. diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample index ab7f53505..eb2ae4571 100644 --- a/etc/ceilometer/ceilometer.conf.sample +++ b/etc/ceilometer/ceilometer.conf.sample @@ -23,7 +23,7 @@ # Options defined in ceilometer.sample # -# Source for samples emited on this instance (string value) +# Source for samples emitted on this instance (string value) # Deprecated group/name - [DEFAULT]/counter_source #sample_source=openstack