diff options
| author | Zuul <zuul@review.opendev.org> | 2025-07-11 12:30:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-07-11 12:30:30 +0000 |
| commit | fd2a07c3365a33a255bf742424ed9ab3cacdc99e (patch) | |
| tree | 3ef7fbe3398aecbc3b19460ab003b31261baf351 | |
| parent | 9634064baa2bac2c87dd9eff6f63b5bf390b5217 (diff) | |
| parent | 308bc91d7665ddebe6d1e0e3d16a4b76139c3ba4 (diff) | |
| download | kolla-ansible-fd2a07c3365a33a255bf742424ed9ab3cacdc99e.tar.gz kolla-ansible-fd2a07c3365a33a255bf742424ed9ab3cacdc99e.zip | |
Merge "gnocchi: Remove from openstack fluentd services"
| -rw-r--r-- | ansible/roles/common/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2 | 5 | ||||
| -rwxr-xr-x | tests/check-logs.sh | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml index 12922e0b4..c7e1fa85c 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -162,8 +162,6 @@ fluentd_input_openstack_services: enabled: "{{ enable_designate | bool }}" - name: glance enabled: "{{ enable_glance | bool }}" - - name: gnocchi - enabled: "{{ enable_gnocchi | bool }}" - name: heat enabled: "{{ enable_heat | bool }}" - name: horizon diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2 index ee761a34f..050798bc1 100644 --- a/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2 +++ b/ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2 @@ -113,11 +113,6 @@ </rule> <rule> key programname - pattern ^(gnocchi-api|gnocchi-statsd|gnocchi-metricd|gnocchi-upgrade)$ - tag openstack_python - </rule> - <rule> - key programname pattern ^(ironic-api|ironic-conductor|ironic-inspector)$ tag openstack_python </rule> diff --git a/tests/check-logs.sh b/tests/check-logs.sh index 9435e4ba5..a0b328076 100755 --- a/tests/check-logs.sh +++ b/tests/check-logs.sh @@ -45,6 +45,9 @@ function check_fluentd_missing_logs { /var/log/kolla/glance-tls-proxy/glance-tls-proxy.log) continue ;; + /var/log/kolla/gnocchi/*) + continue + ;; /var/log/kolla/grafana/grafana.log) continue ;; |