Merge "[gnocchi] Disable statsd daemon by default"

This commit is contained in:
Zuul 2020-03-02 13:48:26 +00:00 committed by Gerrit Code Review
commit 19671fb3c7
5 changed files with 13 additions and 3 deletions

View File

@ -566,6 +566,7 @@ enable_etcd: "no"
enable_fluentd: "yes" enable_fluentd: "yes"
enable_freezer: "no" enable_freezer: "no"
enable_gnocchi: "no" enable_gnocchi: "no"
enable_gnocchi_statsd: "no"
enable_grafana: "no" enable_grafana: "no"
enable_heat: "{{ enable_openstack_core | bool }}" enable_heat: "{{ enable_openstack_core | bool }}"
enable_horizon: "{{ enable_openstack_core | bool }}" enable_horizon: "{{ enable_openstack_core | bool }}"

View File

@ -30,7 +30,7 @@ gnocchi_services:
gnocchi-statsd: gnocchi-statsd:
container_name: gnocchi_statsd container_name: gnocchi_statsd
group: gnocchi-statsd group: gnocchi-statsd
enabled: true enabled: "{{ enable_gnocchi_statsd | bool }}"
image: "{{ gnocchi_statsd_image_full }}" image: "{{ gnocchi_statsd_image_full }}"
volumes: "{{ gnocchi_statsd_default_volumes + gnocchi_statsd_extra_volumes }}" volumes: "{{ gnocchi_statsd_default_volumes + gnocchi_statsd_extra_volumes }}"
dimensions: "{{ gnocchi_statsd_dimensions }}" dimensions: "{{ gnocchi_statsd_dimensions }}"

View File

@ -27,13 +27,14 @@ max_pool_size = 50
max_overflow = 1000 max_overflow = 1000
max_retries = -1 max_retries = -1
{% if enable_gnocchi_statsd | bool %}
[statsd] [statsd]
resource_id = {{ gnocchi_resource_id }} resource_id = {{ gnocchi_resource_id }}
user_id = {{ gnocchi_user_id }} user_id = {{ gnocchi_user_id }}
project_id = {{ gnocchi_project_id }} project_id = {{ gnocchi_project_id }}
archive_policy_name = low archive_policy_name = low
flush_delay = 10
flush_delay=10 {% endif %}
[metricd] [metricd]
workers = {{ gnocchi_metricd_workers }} workers = {{ gnocchi_metricd_workers }}

View File

@ -253,6 +253,7 @@
#enable_fluentd: "yes" #enable_fluentd: "yes"
#enable_freezer: "no" #enable_freezer: "no"
#enable_gnocchi: "no" #enable_gnocchi: "no"
#enable_gnocchi_statsd: "no"
#enable_grafana: "no" #enable_grafana: "no"
#enable_heat: "{{ enable_openstack_core | bool }}" #enable_heat: "{{ enable_openstack_core | bool }}"
#enable_horizon: "{{ enable_openstack_core | bool }}" #enable_horizon: "{{ enable_openstack_core | bool }}"

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The `gnocchi-statsd <https://gnocchi.osci.io/statsd.html>`__ daemon is
no longer enabled by default. If you are using the daemon, you
will need to set ``enable_gnocchi_statsd: "yes"`` to continue using
it in your deployment.