Skip to content

Commit 59f0c81

Browse files
committed
Disable Monasca Log Metrics service by default
The Log Metrics service is an admin only service. We now have support in Fluentd via the Prometheus plugin to create metrics from logs. These metrics can be scraped into Monasca or Prometheus. It therefore makes sense to deprecate this service, starting by disabling it by default, and then removing it in the Xena release. This should improve the stability of the Monasca metrics pipeline by ensuring that all metrics pass via the Monasca API for validation, and ensure that metrics generated from logs are available to both Prometheus and Monasca users by default. Change-Id: I704feb4434c1eece3eb00c19dc5f934fd4bc27b4
1 parent 24da43a commit 59f0c81

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

ansible/roles/monasca/defaults/main.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ monasca_services:
3939
monasca-log-metrics:
4040
container_name: monasca_log_metrics
4141
group: monasca-log-metrics
42-
enabled: true
42+
enabled: "{{ monasca_enable_log_metrics_service | bool }}"
4343
image: "{{ monasca_logstash_image_full }}"
4444
volumes: "{{ monasca_log_metrics_default_volumes + monasca_log_metrics_extra_volumes }}"
4545
dimensions: "{{ monasca_log_metrics_dimensions }}"
@@ -125,6 +125,11 @@ monasca_influxdb_retention_policy:
125125
####################
126126
# Monasca
127127
####################
128+
129+
# NOTE(dszumski): This can be removed in the Xena cycle when the
130+
# log metrics service is removed
131+
monasca_enable_log_metrics_service: False
132+
128133
monasca_kafka_servers: "{% for host in groups['kafka'] %}{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ kafka_port }}{% if not loop.last %},{% endif %}{% endfor %}"
129134
monasca_zookeeper_servers: "{% for host in groups['zookeeper'] %}{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ zookeeper_client_port }}{% if not loop.last %},{% endif %}{% endfor %}"
130135
monasca_memcached_servers: "{% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"

doc/source/reference/logging-and-monitoring/monasca-guide.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,11 @@ which you must run the cleanup command is given below:
325325

326326
- Upgrading from Victoria to Wallaby to remove the unused Monasca Log
327327
Transformer service
328+
- Upgrading from Victoria to Wallaby to remove the Monasca Log Metrics
329+
service, unless the option to disable it by default has been overridden in
330+
Wallaby.
331+
- Upgrading from Wallaby to Xena to remove the Monasca Log Metrics service
332+
if the option to disable it by default was overridden in Wallaby.
328333

329334
The cleanup command can be invoked from the Kolla Ansible CLI, for example:
330335

@@ -367,7 +372,7 @@ Monasca will deploy the following Docker containers:
367372
* Monasca Agent Statsd
368373
* Monasca API
369374
* Monasca Log API
370-
* Monasca Log Metrics (Logstash)
375+
* Monasca Log Metrics (Logstash, optional, deprecated)
371376
* Monasca Log Persister (Logstash)
372377
* Monasca Notification
373378
* Monasca Persister
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
upgrade:
3+
- |
4+
The Monasca Log Metrics service has been deprecated and is now
5+
disabled by default. If you wish to enable it, you can set
6+
`monasca_enable_log_metrics_service` to `True` in `globals.yml`.
7+
deprecations:
8+
- |
9+
The Monasca Log Metrics service has been deprecated and will be
10+
removed in the Xena release.

0 commit comments

Comments
 (0)