x
/
browbeat
Code Issues Proposed changes

Merge "Store Grafana links for CI results"

This commit is contained in:
Jenkins 2017-06-20 16:47:30 +00:00 committed by Gerrit Code Review
parent da86670d13 b1b78c5e92
commit 6f9aef7987
7 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
View File

@ -60,5 +60,4 @@
- name: Run Browbeat - name: Run Browbeat
hosts: undercloud hosts: undercloud
roles: roles:
- browbeat/grafana-dashboard-setup
- browbeat/browbeat-run - browbeat/browbeat-run

1
ansible/oooq/quickstart-browbeat.yml
View File

@ -31,5 +31,4 @@
roles: roles:
- browbeat/collectd - browbeat/collectd
- browbeat/bug-check - browbeat/bug-check
- browbeat/grafana-dashboard-setup
- browbeat/browbeat-run - browbeat/browbeat-run

10
ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
View File

@ -3,8 +3,8 @@ browbeat:
rerun: 3 rerun: 3
cloud_name: {{ browbeat_cloud_name }} cloud_name: {{ browbeat_cloud_name }}
elasticsearch: elasticsearch:
enabled: {{ elastic_enabled_template }} enabled: {{ elastic_enabled }}
host: {{ elastic_host_template }} host: {{ elastic_host }}
port: 9200 port: 9200
regather: true regather: true
metadata_files: metadata_files:
@ -27,11 +27,11 @@ ansible:
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml metadata: ansible/gather/site.yml
connmon: connmon:
enabled: {{ connmon_enabled_template }} enabled: {{ connmon_enabled }}
sudo: true sudo: true
grafana: grafana:
enabled: {{ grafana_enabled_template }} enabled: {{ grafana_enabled }}
grafana_ip: {{ grafana_host_template }} grafana_ip: {{ grafana_host }}
grafana_port: 3000 grafana_port: 3000
dashboards: dashboards:
- openstack-general-system-performance - openstack-general-system-performance

10
ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
View File

@ -5,8 +5,8 @@ browbeat:
rerun: 1 rerun: 1
cloud_name: {{ browbeat_cloud_name }} cloud_name: {{ browbeat_cloud_name }}
elasticsearch: elasticsearch:
enabled: {{ elastic_enabled_template }} enabled: {{ elastic_enabled }}
host: {{ elastic_host_template }} host: {{ elastic_host }}
port: 9200 port: 9200
regather: true regather: true
metadata_files: metadata_files:
@ -29,11 +29,11 @@ ansible:
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml metadata: ansible/gather/site.yml
connmon: connmon:
enabled: {{ connmon_enabled_template }} enabled: {{ connmon_enabled }}
sudo: true sudo: true
grafana: grafana:
enabled: {{ grafana_enabled_template }} enabled: {{ grafana_enabled }}
grafana_ip: {{ grafana_host_template }} grafana_ip: {{ grafana_host }}
grafana_port: 3000 grafana_port: 3000
dashboards: dashboards:
- openstack-general-system-performance - openstack-general-system-performance

10
ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2
View File

@ -5,8 +5,8 @@ browbeat:
rerun: 1 rerun: 1
cloud_name: {{ browbeat_cloud_name }} cloud_name: {{ browbeat_cloud_name }}
elasticsearch: elasticsearch:
enabled: {{ elastic_enabled_template }} enabled: {{ elastic_enabled }}
host: {{ elastic_host_template }} host: {{ elastic_host }}
port: 9200 port: 9200
regather: true regather: true
metadata_files: metadata_files:
@ -29,11 +29,11 @@ ansible:
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml metadata: ansible/gather/site.yml
connmon: connmon:
enabled: {{ connmon_enabled_template }} enabled: {{ connmon_enabled }}
sudo: true sudo: true
grafana: grafana:
enabled: {{ grafana_enabled_template }} enabled: {{ grafana_enabled }}
grafana_ip: {{ grafana_host_template }} grafana_ip: {{ grafana_host }}
grafana_port: 3000 grafana_port: 3000
dashboards: dashboards:
- openstack-general-system-performance - openstack-general-system-performance

10
ansible/oooq/roles/template-configs/vars/main.yml
View File

@ -1,8 +1,8 @@
elastic_enabled_template: false elastic_enabled: false
elastic_host_template: "1.2.3.4.5" elastic_host: "1.2.3.4.5"
connmon_enabled_template: false connmon_enabled: false
grafana_enabled_template: false grafana_enabled: false
grafana_host_template: "1.2.3.4.5" grafana_host: "1.2.3.4.5"
browbeat_config_file: "browbeat-basic.yaml.j2" browbeat_config_file: "browbeat-basic.yaml.j2"
browbeat_cloud_name: "browbeat_ci" browbeat_cloud_name: "browbeat_ci"
overcloud_size: "{{ groups['overcloud'] | length }}" overcloud_size: "{{ groups['overcloud'] | length }}"

6
ci-scripts/tripleo/microbrow.sh
View File

@ -23,9 +23,9 @@ export HW_ENV_DIR=$WORKSPACE/tripleo-environments/hardware_environments/$HW_ENV
export NETWORK_ISOLATION=no_vlan export NETWORK_ISOLATION=no_vlan
export REQS=quickstart-extras-requirements.txt export REQS=quickstart-extras-requirements.txt
export PLAYBOOK=baremetal-virt-undercloud-tripleo-browbeat.yml export PLAYBOOK=baremetal-virt-undercloud-tripleo-browbeat.yml
export VARS="elastic_enabled_template=true \ export VARS="elastic_enabled=true \
--extra-vars grafana_enabled_template=false \ --extra-vars grafana_enabled=true \
--extra-vars elastic_host_template=$ELASTIC_HOST \ --extra-vars elastic_host=$ELASTIC_HOST \
--extra-vars graphite_host=$GRAPH_HOST \ --extra-vars graphite_host=$GRAPH_HOST \
--extra-vars statsd_host=$GRAPH_HOST \ --extra-vars statsd_host=$GRAPH_HOST \
--extra-vars statsd_enabled=True \ --extra-vars statsd_enabled=True \