diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2 index ee633db51..52f8bba6a 100644 --- a/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2 +++ b/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2 @@ -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 diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2 index d8dfb6cb9..1a949364d 100644 --- a/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2 +++ b/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2 @@ -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 diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2 index 2c0dc4c3f..381180d22 100644 --- a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2 +++ b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-ci.yaml.j2 @@ -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" diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2 index 6c159577d..96470fc40 100644 --- a/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2 +++ b/ansible/oooq/roles/template-configs/templates/browbeat-yoda-scale.yaml.j2 @@ -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" diff --git a/browbeat/grafana.py b/browbeat/grafana.py index 6bf25ea8c..487334fbb 100644 --- a/browbeat/grafana.py +++ b/browbeat/grafana.py @@ -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 diff --git a/browbeat/validate.yaml b/browbeat/validate.yaml index 5e54745c7..1e2b15c7f 100644 --- a/browbeat/validate.yaml +++ b/browbeat/validate.yaml @@ -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 diff --git a/ci-scripts/config/browbeat-ci.yaml b/ci-scripts/config/browbeat-ci.yaml index eeb08519f..75e64ca0e 100644 --- a/ci-scripts/config/browbeat-ci.yaml +++ b/ci-scripts/config/browbeat-ci.yaml @@ -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 - diff --git a/conf/browbeat-glance-complete.yaml b/conf/browbeat-glance-complete.yaml index cfcd2289c..8eca75a5b 100644 --- a/conf/browbeat-glance-complete.yaml +++ b/conf/browbeat-glance-complete.yaml @@ -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 diff --git a/conf/browbeat-keystone-complete.yaml b/conf/browbeat-keystone-complete.yaml index f04de5b17..d221bae99 100644 --- a/conf/browbeat-keystone-complete.yaml +++ b/conf/browbeat-keystone-complete.yaml @@ -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 diff --git a/conf/browbeat-keystone-minimal.yaml b/conf/browbeat-keystone-minimal.yaml index 1cc582a1d..db93c4928 100644 --- a/conf/browbeat-keystone-minimal.yaml +++ b/conf/browbeat-keystone-minimal.yaml @@ -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 diff --git a/conf/browbeat-workloads.yml b/conf/browbeat-workloads.yml index 83e0a6725..f8c51680b 100644 --- a/conf/browbeat-workloads.yml +++ b/conf/browbeat-workloads.yml @@ -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 - diff --git a/conf/ceilometer-minimal.yaml b/conf/ceilometer-minimal.yaml index 2650c1c26..3686bfaec 100644 --- a/conf/ceilometer-minimal.yaml +++ b/conf/ceilometer-minimal.yaml @@ -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 diff --git a/conf/ceilometer-persist-response-timing.yaml b/conf/ceilometer-persist-response-timing.yaml index 26297d641..cc6d01173 100644 --- a/conf/ceilometer-persist-response-timing.yaml +++ b/conf/ceilometer-persist-response-timing.yaml @@ -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 diff --git a/conf/gnocchi-minimal.yaml b/conf/gnocchi-minimal.yaml index b7a37d871..ad9f8ccec 100644 --- a/conf/gnocchi-minimal.yaml +++ b/conf/gnocchi-minimal.yaml @@ -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 diff --git a/conf/perfkit-benchmarks.yaml b/conf/perfkit-benchmarks.yaml index e00c2e904..250cc8082 100644 --- a/conf/perfkit-benchmarks.yaml +++ b/conf/perfkit-benchmarks.yaml @@ -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 diff --git a/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml index 4249bb524..73ea0cd62 100644 --- a/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml @@ -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 diff --git a/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml index 92638dfca..d26cdedfa 100644 --- a/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml @@ -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 diff --git a/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml index 775a48eea..a0f9824a9 100644 --- a/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml @@ -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 diff --git a/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml b/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml index 78a93d7b7..72b8c87df 100644 --- a/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml +++ b/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml @@ -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 diff --git a/conf/telemetry-nova-persist-instances-with-network.yaml b/conf/telemetry-nova-persist-instances-with-network.yaml index f3aed12f9..1c794989e 100644 --- a/conf/telemetry-nova-persist-instances-with-network.yaml +++ b/conf/telemetry-nova-persist-instances-with-network.yaml @@ -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 diff --git a/conf/telemetry-nova-persist-instances.yaml b/conf/telemetry-nova-persist-instances.yaml index 3d8a81725..b8c486186 100644 --- a/conf/telemetry-nova-persist-instances.yaml +++ b/conf/telemetry-nova-persist-instances.yaml @@ -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