openstack/ci-log-processing
Code Issues Proposed changes

Render zuul_api_url as python list

Browse Source 
The logscraper tool gets zuul_api_url parameter as a list and
there can be multiple values provided.

Change-Id: I8356a6527214bf58201752146951b95912029309
This commit is contained in:
Daniel Pawlik 2023-02-07 21:29:04 +01:00
parent fff0191f98
commit 36f7f36bab
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/playbooks/check-services-sender.yml
View File

@ -5,8 +5,7 @@
# logscraper # logscraper
tenant_builds: tenant_builds:
- tenant: openstack - tenant: openstack
zuul_api_url: https://zuul.opendev.org/api/tenant/openstack zuul_api_url:
zuul_api_urls:
- https://zuul.opendev.org/api/tenant/openstack - https://zuul.opendev.org/api/tenant/openstack
insecure: false insecure: false
job_names: [] job_names: []

3
ansible/playbooks/check-services.yml
View File

@ -17,8 +17,7 @@
- tenant: openstack - tenant: openstack
gearman_port: "{{ gearman_port }}" gearman_port: "{{ gearman_port }}"
gearman_server: "{{ gearman_host }}" gearman_server: "{{ gearman_host }}"
zuul_api_url: https://zuul.opendev.org/api/tenant/openstack zuul_api_url:
zuul_api_urls:
- https://zuul.opendev.org/api/tenant/openstack - https://zuul.opendev.org/api/tenant/openstack
insecure: false insecure: false
job_names: [] job_names: []

3
ansible/playbooks/deploy-services.yml
View File

@ -6,7 +6,8 @@
# logscraper and logsender # logscraper and logsender
tenant_builds: tenant_builds:
- tenant: openstack - tenant: openstack
zuul_api_url: https://zuul.opendev.org/api/tenant/openstack zuul_api_url:
- https://zuul.opendev.org/api/tenant/openstack
download: true download: true
download_dir: /mnt/logscraper/openstack download_dir: /mnt/logscraper/openstack
es_username: logstash es_username: logstash

9
ansible/roles/logscraper/README.rst
View File

@ -25,7 +25,8 @@ for example:
- tenant: openstack - tenant: openstack
gearman_port: 4731 gearman_port: 4731
gearman_server: logstash.openstack.org gearman_server: logstash.openstack.org
zuul_api_url: https://zuul.opendev.org/api/tenant/openstack zuul_api_url:
- https://zuul.opendev.org/api/tenant/openstack
insecure: false insecure: false
will deploy service with name: `logscraper@openstack.service`. will deploy service with name: `logscraper@openstack.service`.
@ -57,10 +58,12 @@ and second one for getting logs from `sometenant` tenant.
- tenant: openstack - tenant: openstack
gearman_port: 4731 gearman_port: 4731
gearman_server: logstash.openstack.org gearman_server: logstash.openstack.org
zuul_api_url: https://zuul.opendev.org/api/tenant/openstack zuul_api_url:
- https://zuul.opendev.org/api/tenant/openstack
insecure: False insecure: False
- tenant: sometenant - tenant: sometenant
zuul_api_url: https://zuul.opendev.org/api/tenant/sometenant zuul_api_url:
- https://zuul.opendev.org/api/tenant/sometenant
insecure: True insecure: True
download: true download: true
download_dir: /mnt/logscraper download_dir: /mnt/logscraper

6
ansible/roles/logscraper/defaults/main.yml
View File

@ -14,11 +14,13 @@ container_images:
# - tenant: openstack # - tenant: openstack
# gearman_port: 4731 # gearman_port: 4731
# gearman_server: logstash.openstack.org # gearman_server: logstash.openstack.org
# zuul_api_url: https://zuul.opendev.org/api/tenant/openstack # zuul_api_url:
# - https://zuul.opendev.org/api/tenant/openstack
# insecure: false # insecure: false
# logscraper_workers: 1 # logscraper_workers: 1
# - tenant: sometenant # - tenant: sometenant
# zuul_api_url: https://zuul.opendev.org/api/tenant/sometenant # zuul_api_url:
# - https://zuul.opendev.org/api/tenant/sometenant
# insecure: true # insecure: true
# download: true # download: true
# download_dir: /mnt/logscraper/sometenant # download_dir: /mnt/logscraper/sometenant

2
ansible/roles/logscraper/templates/config.j2
View File

@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
zuul_api_url: {{ item['zuul_api_url'].split(', ') }} zuul_api_url: {{ item['zuul_api_url'] | list }}
follow: {{ item['follow'] | default(true) }} follow: {{ item['follow'] | default(true) }}
checkpoint_file: {{ item['checkpoint_file'] | default(logscraper_dir + '/checkpoint') }} checkpoint_file: {{ item['checkpoint_file'] | default(logscraper_dir + '/checkpoint') }}
workers: {{ item['logscraper_workers'] | default(1) }} workers: {{ item['logscraper_workers'] | default(1) }}