openstack
/
monasca-log-api
Code Issues Proposed changes

Merge "Allow to disable statsd self-moniotring"

This commit is contained in:
Zuul 2018-01-16 11:25:16 +00:00 committed by Gerrit Code Review
parent 51e6802932 ddb16f626f
commit 07f3cde33b
6 changed files with 141 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
monasca_log_api/app/base/log_publisher.py
View File

@ -68,7 +68,7 @@ class LogPublisher(object):
self._kafka_publisher = producer.KafkaProducer(
url=CONF.log_publisher.kafka_url
)
if CONF.monitoring.enable:
self._statsd = client.get_client()
# setup counter, gauges etc
@ -117,9 +117,11 @@ class LogPublisher(object):
for message in messages:
msg = self._transform_message(message)
send_messages.append(msg)
if CONF.monitoring.enable:
with self._publish_time_ms.time(name=None):
self._publish(send_messages)
else:
self._publish(send_messages)
sent_counter = len(send_messages)
except Exception as ex:
@ -199,10 +201,12 @@ class LogPublisher(object):
envelope['log']['truncated'] = True
envelope['log']['message'] = truncated_log_msg
if CONF.monitoring.enable:
self._logs_truncated_gauge.send(name=None, value=truncated_by)
msg_str = rest_utils.as_json(envelope)
else:
if CONF.monitoring.enable:
self._logs_truncated_gauge.send(name=None, value=0)
return msg_str
@ -255,6 +259,6 @@ class LogPublisher(object):
error_str = ('Failed to send all messages, %d '
'messages out of %d have not been published')
LOG.error(error_str, failed_to_send, to_send_count)
if CONF.monitoring.enable:
self._logs_published_counter.increment(value=send_count)
self._logs_lost_counter.increment(value=failed_to_send)

3
monasca_log_api/app/controller/api/logs_api.py
View File

@ -16,9 +16,11 @@
import falcon
from oslo_log import log
from monasca_log_api import conf
from monasca_log_api.monitoring import client
from monasca_log_api.monitoring import metrics
CONF = conf.CONF
LOG = log.getLogger(__name__)
@ -32,6 +34,7 @@ class LogsApi(object):
"""
def __init__(self):
super(LogsApi, self).__init__()
if CONF.monitoring.enable:
self._statsd = client.get_client()
# create_common counters, gauges etc.

12
monasca_log_api/app/controller/v2/logs.py
View File

@ -16,11 +16,14 @@
import falcon
import six
from monasca_log_api.app.base import log_publisher
from monasca_log_api.app.controller.api import headers
from monasca_log_api.app.controller.api import logs_api
from monasca_log_api.app.controller.v2.aid import service
from monasca_log_api import conf
CONF = conf.CONF
_DEPRECATED_INFO = ('/v2.0/log/single has been deprecated. '
'Please use /v3.0/logs')
@ -38,7 +41,13 @@ class Logs(logs_api.LogsApi):
@falcon.deprecated(_DEPRECATED_INFO)
def on_post(self, req, res):
if CONF.monitoring.enable:
with self._logs_processing_time.time(name=None):
self.process_on_post_request(req, res)
else:
self.process_on_post_request(req, res)
def process_on_post_request(self, req, res):
try:
req.validate(self.SUPPORTED_CONTENT_TYPES)
tenant_id = (req.project_id if req.project_id
@ -49,13 +58,14 @@ class Logs(logs_api.LogsApi):
log=log,
tenant_id=tenant_id
)
if CONF.monitoring.enable:
self._logs_size_gauge.send(name=None,
value=int(req.content_length))
self._logs_in_counter.increment()
except Exception:
# any validation that failed means
# log is invalid and rejected
if CONF.monitoring.enable:
self._logs_rejected_counter.increment()
raise

10
monasca_log_api/app/controller/v3/aid/bulk_processor.py
View File

@ -32,7 +32,7 @@ class BulkProcessor(log_publisher.LogPublisher):
"""
def __init__(self, logs_in_counter, logs_rejected_counter):
def __init__(self, logs_in_counter=None, logs_rejected_counter=None):
"""Initializes BulkProcessor.
:param logs_in_counter: V3 received logs counter
@ -40,9 +40,9 @@ class BulkProcessor(log_publisher.LogPublisher):
"""
super(BulkProcessor, self).__init__()
if CONF.monitoring.enable:
assert logs_in_counter is not None
assert logs_rejected_counter is not None
self._logs_in_counter = logs_in_counter
self._logs_rejected_counter = logs_rejected_counter
@ -70,9 +70,12 @@ class BulkProcessor(log_publisher.LogPublisher):
log_tenant_id)
if t_el:
to_send_msgs.append(t_el)
if CONF.monitoring.enable:
with self._publish_time_ms.time(name=None):
self._publish(to_send_msgs)
else:
self._publish(to_send_msgs)
sent_count = len(to_send_msgs)
except Exception as ex:
@ -81,6 +84,7 @@ class BulkProcessor(log_publisher.LogPublisher):
LOG.exception(ex)
raise ex
finally:
if CONF.monitoring.enable:
self._update_counters(len(to_send_msgs), num_of_msgs)
self._after_publish(sent_count, len(to_send_msgs))

15
monasca_log_api/app/controller/v3/logs.py
View File

@ -21,8 +21,11 @@ from monasca_log_api.app.base import validation
from monasca_log_api.app.controller.api import logs_api
from monasca_log_api.app.controller.v3.aid import bulk_processor
from monasca_log_api.app.controller.v3.aid import helpers
from monasca_log_api import conf
from monasca_log_api.monitoring import metrics
CONF = conf.CONF
LOG = log.getLogger(__name__)
@ -34,6 +37,7 @@ class Logs(logs_api.LogsApi):
def __init__(self):
super(Logs, self).__init__()
if CONF.monitoring.enable:
self._processor = bulk_processor.BulkProcessor(
logs_in_counter=self._logs_in_counter,
logs_rejected_counter=self._logs_rejected_counter
@ -42,9 +46,17 @@ class Logs(logs_api.LogsApi):
name=metrics.LOGS_BULKS_REJECTED_METRIC,
dimensions=self._metrics_dimensions
)
else:
self._processor = bulk_processor.BulkProcessor()
def on_post(self, req, res):
if CONF.monitoring.enable:
with self._logs_processing_time.time(name=None):
self.process_on_post_request(req, res)
else:
self.process_on_post_request(req, res)
def process_on_post_request(self, req, res):
try:
req.validate(self.SUPPORTED_CONTENT_TYPES)
@ -56,11 +68,12 @@ class Logs(logs_api.LogsApi):
except Exception as ex:
LOG.error('Entire bulk package has been rejected')
LOG.exception(ex)
if CONF.monitoring.enable:
self._bulks_rejected_counter.increment(value=1)
raise ex
if CONF.monitoring.enable:
self._bulks_rejected_counter.increment(value=0)
self._logs_size_gauge.send(name=None,
value=int(req.content_length))

3
monasca_log_api/conf/monitoring.py
View File

@ -19,6 +19,9 @@ _DEFAULT_PORT = 8125
_DEFAULT_BUFFER_SIZE = 50
monitoring_opts = [
cfg.BoolOpt('enable',
default=True,
help='Determine if self monitoring is enabled'),
cfg.IPOpt('statsd_host',
default=_DEFAULT_HOST,
help=('IP address of statsd server, default to %s'