Change-Id: I420f443efe9aa6d3b09f261def20df3209c321c6
This commit is contained in:
Shinya Kawabata 2015-09-24 16:00:11 +09:00
parent bf7c8ba3be
commit c29232a263
13 changed files with 15 additions and 15 deletions

View File

@ -19,7 +19,7 @@ instances:
# * Restarting message broker rabbitmq-server
#
# For every instance a 'rabbitmq_api_url' must be provided, pointing to the api
# url of the RabbitMQ Managment Plugin (http://www.rabbitmq.com/management.html)
# url of the RabbitMQ Management Plugin (http://www.rabbitmq.com/management.html)
# optional: 'rabbitmq_user' (default: guest) and 'rabbitmq_pass' (default: guest)
#
# If you have less than 5 queues, you don't have to set the queues parameters

View File

@ -62,10 +62,10 @@ The order of precedence for all dimensions is:
| observer_hostname | The FQDN of the host that runs a check against another host. |
| url | In the case of the http endpoint check the url of the http endpoint being checked. |
| device | The device name |
| service | The sevice name that owns this metric |
| service | The service name that owns this metric |
| component | The component name within the device that the metric comes from |
One way to add additional dimensions for all metrics is by using the `--dimensions` command line option to `monasca-setup`. This will populate /etc/monasca/agent/agent.yaml with dimensions to be included with all metrics. The syntax is a comma seperated list of name/value pairs, 'name:value,name2:value2'
One way to add additional dimensions for all metrics is by using the `--dimensions` command line option to `monasca-setup`. This will populate /etc/monasca/agent/agent.yaml with dimensions to be included with all metrics. The syntax is a comma separated list of name/value pairs, 'name:value,name2:value2'
```
/etc/monasca/agent/agent.yaml

View File

@ -431,7 +431,7 @@ class ApplyResult(object):
traceback.print_exc()
def _set_exception(self):
"""Called by a Job object to tell that an exception occured
"""Called by a Job object to tell that an exception occurred
during the processing of the function. The object will become
ready but not successful. The collector's notify_ready()

View File

@ -69,7 +69,7 @@ DOCKER_TAGS = [
class UnixHTTPConnection(httplib.HTTPConnection, object):
"""Class used in conjuction with UnixSocketHandler to make urllib2
"""Class used in conjunction with UnixSocketHandler to make urllib2
compatible with Unix sockets.
"""

View File

@ -121,7 +121,7 @@ class Jenkins(AgentCheck):
dimensions = self._set_dimensions(None, instance)
if self.high_watermarks.get(instance.get('name'), None) is None:
# On the first run of check(), prime the high_watermarks dict
# so that we only send events that occured after the agent
# so that we only send events that occurred after the agent
# started.
# (Setting high_watermarks in the next statement prevents
# any kind of infinite loop (assuming nothing ever sets

View File

@ -101,7 +101,7 @@ class Riak(AgentCheck):
self.event({
'timestamp': int(time.time()),
'event_type': 'riak_check',
'msg_title': 'Invalid reponse code for riak check',
'msg_title': 'Invalid response code for riak check',
'msg_text': '%s returned a status of %s' % (url, r.status_code),
'aggregation_key': aggregation_key
})

View File

@ -133,7 +133,7 @@ class Zookeeper(AgentCheck):
_, value = buf.readline().split(':')
metrics.append(('zookeeper.connections_count', int(value.strip())))
else:
# If the zk version doesnt explicitly give the Connections val,
# If the zk version doesn't explicitly give the Connections val,
# use the value we computed from the client list.
metrics.append(('zookeeper.connections_count', connections))

View File

@ -118,7 +118,7 @@ class MetricTransaction(Transaction):
class TransactionManager(util.Dimensions):
"""Holds any transaction derived object list and make sure they
are all commited, without exceeding parameters (throttling, memory consumption)
are all committed, without exceeding parameters (throttling, memory consumption)
"""
def __init__(self, max_wait_for_replay, max_queue_size, throttling_delay, agent_config):
@ -129,7 +129,7 @@ class TransactionManager(util.Dimensions):
self._flush_without_ioloop = False # useful for tests
self._transactions = [] # List of all non commited transactions
self._transactions = [] # List of all non committed transactions
self._total_count = 0 # Maintain size/count not to recompute it everytime
self._total_size = 0
self._flush_count = 0

View File

@ -10,7 +10,7 @@ log = logging.getLogger(__name__)
class HttpCheck(monasca_setup.detection.ArgsPlugin):
"""Setup an http_check according to the passed in args.
Despite being a detection plugin this plugin does no detection and will be a noop without arguments.
Expects space seperated arguments, the required argument is url. Optional parameters include:
Expects space separated arguments, the required argument is url. Optional parameters include:
disable_ssl_validation and match_pattern.
"""

View File

@ -171,7 +171,7 @@ def parse_arguments(parser):
parser.add_argument('-a', '--detection_args', help="A string of arguments that will be passed to detection " +
"plugins. Only certain detection plugins use arguments.")
parser.add_argument('--check_frequency', help="How often to run metric collection in seconds", type=int, default=30)
parser.add_argument('--dimensions', help="Additional dimensions to set for all metrics. A comma seperated list " +
parser.add_argument('--dimensions', help="Additional dimensions to set for all metrics. A comma separated list " +
"of name/value pairs, 'name:value,name2:value2'")
parser.add_argument('--ca_file', help="Sets the path to the ca certs file if using certificates. " +
"Required only if insecure is set to False", default='')

View File

@ -11,7 +11,7 @@ log = logging.getLogger(__name__)
def detect_init(*args, **kwargs):
"""Detect the service manager running on this box
args/kwargs match those of service.Service
:return: The apropriate Service object for this system
:return: The appropriate Service object for this system
"""
detected_os = platform.system()
if detected_os == 'Linux':

View File

@ -121,7 +121,7 @@ case "$1" in
info)
shift # Shift 'info' out of args so we can pass any
# addtional options to the real command
# additional options to the real command
# (right now only monasca-agent supports additional flags)
su $AGENTUSER -c "$AGENTPATH info $@"
COLLECTOR_RETURN=$?

View File

@ -124,7 +124,7 @@ case "$1" in
info)
shift # Shift 'info' out of args so we can pass any
# addtional options to the real command
# additional options to the real command
# (right now only monasca-agent supports additional flags)
su $AGENTUSER -c "$AGENTPATH info $@"
COLLECTOR_RETURN=$?