x
/
browbeat
Code Issues Proposed changes

Remove more Grafana Snapshot cruft. 

Change-Id: Ie69c3a032790d09ddeafc93012b54cc094b0f8c7
This commit is contained in:
akrzos 2017-09-21 08:38:32 -04:00 committed by Alex Krzos
parent 28f7f06ab4
commit 0c0497c4a3
21 changed files with 0 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: {{ connmon_enabled }}
@ -36,9 +35,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

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

@ -27,7 +27,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: {{ connmon_enabled }}
@ -38,9 +37,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2
View File

@ -27,7 +27,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: {{ connmon_enabled }}
@ -38,9 +37,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
yoda:
enabled: true
instackenv: "/home/stack/instackenv.json"

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

@ -26,7 +26,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: {{ connmon_enabled }}
@ -37,9 +36,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
yoda:
enabled: true
instackenv: "/home/stack/instackenv.json"

15
browbeat/grafana.py
View File

@ -19,25 +19,10 @@ class Grafana(object):
self.logger = logging.getLogger('browbeat.grafana')
self.config = config
self.cloud_name = self.config['browbeat']['cloud_name']
self.hosts_file = self.config['ansible']['hosts']
self.grafana_ip = self.config['grafana']['grafana_ip']
self.grafana_port = self.config['grafana']['grafana_port']
self.playbook = self.config['ansible']['grafana_snapshot']
self.grafana_url = {}
def extra_vars(self, from_ts, to_ts, result_dir, test_name):
extra_vars = 'grafana_ip={} '.format(
self.config['grafana']['grafana_ip'])
extra_vars += 'grafana_port={} '.format(
self.config['grafana']['grafana_port'])
extra_vars += 'from={} '.format(from_ts)
extra_vars += 'to={} '.format(to_ts)
extra_vars += 'results_dir={}/{} '.format(result_dir, test_name)
extra_vars += 'var_cloud={} '.format(self.cloud_name)
if self.config['grafana']['snapshot']['snapshot_compute']:
extra_vars += 'snapshot_compute=true '
return extra_vars
def grafana_urls(self):
return self.grafana_url

13
browbeat/validate.yaml
View File

@ -1,6 +1,5 @@
name: Browbeat configuration schema
type: map
allowempty: True
mapping:
browbeat:
required: True
@ -19,7 +18,6 @@ mapping:
type: str
required: True
elasticsearch:
required: True
type: map
@ -51,7 +49,6 @@ mapping:
type: str
required: True
ansible:
required: True
type: map
@ -91,7 +88,6 @@ mapping:
grafana:
required: True
type: map
allowempty: True
mapping:
enabled:
type: bool
@ -105,15 +101,6 @@ mapping:
type: seq
sequence:
- type: str
snapshot:
type: map
mapping:
enabled:
type: bool
required: True
snapshot_compute:
type: bool
required: True
perfkit:
required: False

5
ci-scripts/config/browbeat-ci.yaml
View File

@ -24,7 +24,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -35,9 +34,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
perfkit:
enabled: true
sleep_before: 0
@ -242,4 +238,3 @@ shaker:
time: 60
placement: single_room
file: lib/python2.7/site-packages/shaker/scenarios/openstack/dense_l3_east_west.yaml

4
conf/browbeat-glance-complete.yaml
View File

@ -26,7 +26,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -37,9 +36,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
conf/browbeat-keystone-complete.yaml
View File

@ -28,7 +28,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -39,9 +38,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
conf/browbeat-keystone-minimal.yaml
View File

@ -28,7 +28,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -39,9 +38,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

5
conf/browbeat-workloads.yml
View File

@ -25,7 +25,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -36,9 +35,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5
@ -80,4 +76,3 @@ rally:
elastic_host:
elastic_port: 9200
file: rally/rally-plugins/workloads/pbench-uperf.yml

4
conf/ceilometer-minimal.yaml
View File

@ -26,7 +26,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -37,9 +36,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
conf/ceilometer-persist-response-timing.yaml
View File

@ -29,7 +29,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -40,9 +39,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
conf/gnocchi-minimal.yaml
View File

@ -27,7 +27,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -38,9 +37,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 0

4
conf/perfkit-benchmarks.yaml
View File

@ -31,7 +31,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -42,9 +41,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
perfkit:
enabled: true
sleep_before: 0

4
conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml
View File

@ -33,7 +33,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -44,9 +43,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml
View File

@ -33,7 +33,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -44,9 +43,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml
View File

@ -33,7 +33,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -44,9 +43,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml
View File

@ -33,7 +33,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -44,9 +43,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 5

4
conf/telemetry-nova-persist-instances-with-network.yaml
View File

@ -31,7 +31,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -42,9 +41,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 0

4
conf/telemetry-nova-persist-instances.yaml
View File

@ -31,7 +31,6 @@ ansible:
neutron_l3: ansible/browbeat/adjustment-l3.yml
nova_db: ansible/browbeat/adjustment-db.yml
workers: ansible/browbeat/adjustment-workers.yml
grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
metadata: ansible/gather/site.yml
connmon:
enabled: false
@ -42,9 +41,6 @@ grafana:
grafana_port: 3000
dashboards:
- openstack-general-system-performance
snapshot:
enabled: false
snapshot_compute: false
rally:
enabled: true
sleep_before: 0