From c1110423263e6cf99cb3578c44e7d1f72a3629bb Mon Sep 17 00:00:00 2001 From: akrzos Date: Wed, 13 Sep 2017 14:27:01 -0600 Subject: [PATCH] Remove Grafana Snapshot It was a good idea, but as html+pngs it doesn't look well nor is used much (if any). Change-Id: I1f394c197686917e98a2be1364c4ae4d53aeee6c --- .../roles/grafana-snapshot/tasks/main.yml | 34 ------- .../grafana-snapshot/templates/index.html.j2 | 60 ----------- .../roles/grafana-snapshot/vars/main.yml | 99 ------------------- ...snapshot-general-performance-dashboard.yml | 51 ---------- browbeat-complete.yaml | 4 - browbeat-config.yaml | 4 - lib/Grafana.py | 29 ------ lib/PerfKit.py | 3 - lib/Rally.py | 3 - lib/Shaker.py | 3 - lib/validate.yaml | 3 - 11 files changed, 293 deletions(-) delete mode 100644 ansible/browbeat/roles/grafana-snapshot/tasks/main.yml delete mode 100644 ansible/browbeat/roles/grafana-snapshot/templates/index.html.j2 delete mode 100644 ansible/browbeat/roles/grafana-snapshot/vars/main.yml delete mode 100644 ansible/browbeat/snapshot-general-performance-dashboard.yml diff --git a/ansible/browbeat/roles/grafana-snapshot/tasks/main.yml b/ansible/browbeat/roles/grafana-snapshot/tasks/main.yml deleted file mode 100644 index fe047ab75..000000000 --- a/ansible/browbeat/roles/grafana-snapshot/tasks/main.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# -# Generate Snapshots -# - -- name: Generate General Snapshots - shell: "mkdir -p /home/stack/browbeat/{{results_dir}}/{{item[0]}}/; curl -X GET 'http://{{grafana_ip}}:{{grafana_port}}/render/dashboard-solo/db/openstack-general-system-performance?panelId={{item[1].panelId}}&from={{from}}&to={{to}}&var-Cloud={{var_cloud}}&var-Node={{item[0]}}{{host_suffix}}&var-Interface=interface-test&var-Disk=disk-sda&width=1200' > /home/stack/browbeat/{{results_dir}}/{{item[0]}}/{{item[0]}}-{{item[1].name}}.png" - with_nested: - - "{{ hosts_in_group }}" - - "{{ general_panels }}" - -- name: Generate Disk Snapshots - shell: "mkdir -p /home/stack/browbeat/{{results_dir}}/{{item[0]}}/;curl -X GET 'http://{{grafana_ip}}:{{grafana_port}}/render/dashboard-solo/db/openstack-general-system-performance?panelId={{item[2].panelId}}&from={{from}}&to={{to}}&var-Cloud={{var_cloud}}&var-Node={{item[0]}}{{host_suffix}}&var-Interface=interface-test&var-Disk=disk-{{item[1]}}&width=1200' > /home/stack/browbeat/{{results_dir}}/{{item[0]}}/{{item[0]}}-{{item[2].name}}-{{item[1]}}.png" - with_nested: - - "{{ hosts_in_group }}" - - "{{ disks_in_group }}" - - "{{ disk_panels }}" - -- name: Generate Interface Snapshots - shell: "mkdir -p /home/stack/browbeat/{{results_dir}}/{{item[0]}}/;curl -X GET 'http://{{grafana_ip}}:{{grafana_port}}/render/dashboard-solo/db/openstack-general-system-performance?panelId={{item[2].panelId}}&from={{from}}&to={{to}}&var-Cloud={{var_cloud}}&var-Node={{item[0]}}{{host_suffix}}&var-Interface=interface-{{item[1]}}&var-Disk=disk-sda&width=1200' > /home/stack/browbeat/{{results_dir}}/{{item[0]}}/{{item[0]}}-{{item[2].name}}-{{item[1]}}.png" - with_nested: - - "{{ hosts_in_group }}" - - "{{ interfaces_in_group }}" - - "{{ interface_panels }}" - -- name: Generate index.html per host - template: - src=index.html.j2 - dest=/home/stack/browbeat/{{results_dir}}/{{item}}/index.html - owner=stack - group=stack - mode=0644 - with_items: - - "{{groups[host_type]}}" diff --git a/ansible/browbeat/roles/grafana-snapshot/templates/index.html.j2 b/ansible/browbeat/roles/grafana-snapshot/templates/index.html.j2 deleted file mode 100644 index de4a5a211..000000000 --- a/ansible/browbeat/roles/grafana-snapshot/templates/index.html.j2 +++ /dev/null @@ -1,60 +0,0 @@ - - - {{item}} - - - -
- {{item}} - System Performance Snapshot -
- Undercloud: - {% for host in groups['undercloud'] %} - {{host}} - {% endfor %} -
- Controllers: - {% for host in groups['controller'] %} - {{host}} - {% endfor %} - {% if snapshot_compute is defined and snapshot_compute %} -
- Computes: - {% for host in groups['compute'] %} - {{host}} - {% endfor %} - {% endif %} -
-
- Disks : - {% for disk in disks_in_group %} - {{disk}} - {% endfor %} -

- Interfaces : - {% for interface in interfaces_in_group %} - {{interface}} - {% endfor %} -

- {% for panel in general_panels %} -
- {% endfor %} -
- {% for disk in disks_in_group %} - {% for panel in disk_panels %} -
-
- {% endfor %} - {% endfor %} -
- {% for interface in interfaces_in_group %} - {% for panel in interface_panels %} -
-
- {% endfor %} - {% endfor %} - diff --git a/ansible/browbeat/roles/grafana-snapshot/vars/main.yml b/ansible/browbeat/roles/grafana-snapshot/vars/main.yml deleted file mode 100644 index bf93f009f..000000000 --- a/ansible/browbeat/roles/grafana-snapshot/vars/main.yml +++ /dev/null @@ -1,99 +0,0 @@ ---- -# -# Grafana Snapshot vars -# - -# Task prepends "disk-" prefix for you -disks: - undercloud: - - vda - controller: - - sda - - sda2 - compute: - - sda - - sda2 - -disk_panels: - - panelId: 9 - name: disk-iops - - panelId: 10 - name: disk-throughput - - panelId: 14 - name: disk-io-time - -# Task prepends "interface-" prefix for you -interfaces: - undercloud: - - br-ctlplane - # - br-int - - ens3 - - ens7 - - lo - # - ovs-system - controller: - - br-ex - - br-int - - br-tun - - br-vlan - - enp3s0f0 - - enp3s0f1 - - enp4s0f0 - - enp4s0f1 - # - ens1f0 - # - ens1f1 - - lo - # - ovs-system - - vlan201 - - vlan202 - - vlan203 - - vlan204 - compute: - - br-ex - - br-int - - br-tun - - br-vlan - - enp3s0f0 - - enp3s0f1 - - enp4s0f0 - - enp4s0f1 - # - ens1f0 - # - ens1f1 - - lo - # - ovs-system - - vlan201 - - vlan202 - - vlan203 - - vlan204 - -interface_panels: - - panelId: 16 - name: network-pps - - panelId: 17 - name: network-throughput - -general_panels: - - panelId: 1 - name: all-cpu - - panelId: 2 - name: all-cpu-sum - - panelId: 5 - name: memory-bytes - - panelId: 6 - name: memory-percentage - - panelId: 7 - name: swap-usage - - panelId: 19 - name: conntrack - - panelId: 25 - name: numa - - panelId: 26 - name: irq - - panelId: 27 - name: interrupts - - panelId: 28 - name: load-uptime - - panelId: 29 - name: processes - - panelId: 126 - name: tail-errors diff --git a/ansible/browbeat/snapshot-general-performance-dashboard.yml b/ansible/browbeat/snapshot-general-performance-dashboard.yml deleted file mode 100644 index 43ae0e525..000000000 --- a/ansible/browbeat/snapshot-general-performance-dashboard.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -# -# Snapshot Dashboard -# -# Example Usage: -# ansible-playbook -i hosts browbeat/snapshot-general-performance-dashboard.yml -e "grafana_ip=1.1.1.1 grafana_port=3000 from=1455649200000 to=1455656400000 results_dir=results/ var_cloud=openstack" -# -# Append snapshot_compute=true to run snapshots against computes. -# - -- hosts: localhost - gather_facts: false - remote_user: stack - vars: - ansible_connection: local - ansible_python_interpreter: "/usr/bin/python" - host_type: undercloud - host_suffix: "" - hosts_in_group: "{{groups['undercloud']}}" - disks_in_group: "{{disks['undercloud']}}" - interfaces_in_group: "{{interfaces['undercloud']}}" - roles: - - grafana-snapshot - -- hosts: localhost - gather_facts: false - remote_user: stack - vars: - ansible_connection: local - ansible_python_interpreter: "/usr/bin/python" - host_type: controller - host_suffix: "" - hosts_in_group: "{{groups['controller']}}" - disks_in_group: "{{disks['controller']}}" - interfaces_in_group: "{{interfaces['controller']}}" - roles: - - grafana-snapshot - -- hosts: localhost - gather_facts: false - remote_user: stack - vars: - ansible_connection: local - ansible_python_interpreter: "/usr/bin/python" - host_type: compute - host_suffix: "" - hosts_in_group: "{{groups['compute']}}" - disks_in_group: "{{disks['compute']}}" - interfaces_in_group: "{{interfaces['compute']}}" - roles: - - { role: grafana-snapshot, when: snapshot_compute is defined } diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index 4b471b44f..d6cc2c646 100644 --- a/browbeat-complete.yaml +++ b/browbeat-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 perfkit: enabled: true sleep_before: 0 diff --git a/browbeat-config.yaml b/browbeat-config.yaml index fad56da9f..2e41e72cd 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.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 perfkit: enabled: false sleep_before: 0 diff --git a/lib/Grafana.py b/lib/Grafana.py index 0b78679b4..7abc18cbb 100644 --- a/lib/Grafana.py +++ b/lib/Grafana.py @@ -11,7 +11,6 @@ # limitations under the License. import logging -import subprocess class Grafana(object): @@ -63,31 +62,3 @@ class Grafana(object): test_name, dashboard, self.grafana_url[dashboard])) - - def log_snapshot_playbook_cmd(self, from_ts, to_ts, result_dir, test_name): - if 'grafana' in self.config and self.config['grafana']['enabled']: - extra_vars = self.extra_vars( - from_ts, to_ts, result_dir, test_name) - snapshot_cmd = 'ansible-playbook -i {} {} -e "{}"'.format( - self.hosts_file, self.playbook, extra_vars) - self.logger.debug('Snapshot command: {}'.format(snapshot_cmd)) - - def run_playbook(self, from_ts, to_ts, result_dir, test_name): - if 'grafana' in self.config and self.config['grafana']['enabled']: - if self.config['grafana']['snapshot']['enabled']: - extra_vars = self.extra_vars( - from_ts, to_ts, result_dir, test_name) - subprocess_cmd = [ - 'ansible-playbook', - '-i', - self.hosts_file, - self.playbook, - '-e', - '{}'.format(extra_vars)] - snapshot_log = open('{}/snapshot.log'.format(result_dir), 'a+') - self.logger.info( - 'Running ansible to create snapshots for: {}'.format(test_name)) - subprocess.Popen( - subprocess_cmd, - stdout=snapshot_log, - stderr=subprocess.STDOUT) diff --git a/lib/PerfKit.py b/lib/PerfKit.py index 1fbf4f450..60c7cfb48 100644 --- a/lib/PerfKit.py +++ b/lib/PerfKit.py @@ -190,9 +190,6 @@ class PerfKit(WorkloadBase.WorkloadBase): {'from_ts': int(from_ts * 1000), 'to_ts': int(to_ts * 1000)}) self.grafana.print_dashboard_url(test_name) - self.grafana.log_snapshot_playbook_cmd( - from_ts, to_ts, result_dir, test_name) - self.grafana.run_playbook(from_ts, to_ts, result_dir, test_name) return success, to_ts, from_ts diff --git a/lib/Rally.py b/lib/Rally.py index ded6ca0b3..e7012f2c5 100644 --- a/lib/Rally.py +++ b/lib/Rally.py @@ -73,9 +73,6 @@ class Rally(WorkloadBase.WorkloadBase): to_ts = int(time.time() * 1000) self.grafana.create_grafana_urls({'from_ts': from_ts, 'to_ts': to_ts}) self.grafana.print_dashboard_url(test_name) - self.grafana.log_snapshot_playbook_cmd( - from_ts, to_ts, result_dir, test_name) - self.grafana.run_playbook(from_ts, to_ts, result_dir, test_name) return (from_time, to_time) def update_tests(self): diff --git a/lib/Shaker.py b/lib/Shaker.py index 0266326bc..cce80e5f5 100644 --- a/lib/Shaker.py +++ b/lib/Shaker.py @@ -395,9 +395,6 @@ class Shaker(WorkloadBase.WorkloadBase): # Snapshotting self.grafana.create_grafana_urls({'from_ts': from_ts, 'to_ts': to_ts}) self.grafana.print_dashboard_url(test_name) - self.grafana.log_snapshot_playbook_cmd( - from_ts, to_ts, result_dir, test_name) - self.grafana.run_playbook(from_ts, to_ts, result_dir, test_name) # Send Data to elastic if self.config['elasticsearch']['enabled']: index_status = self.send_to_elastic(outputfile, scenario['name'], shaker_uuid, diff --git a/lib/validate.yaml b/lib/validate.yaml index 007adcf87..5e54745c7 100644 --- a/lib/validate.yaml +++ b/lib/validate.yaml @@ -74,9 +74,6 @@ mapping: type: str workers: type: str - grafana_snapshot: - type: str - required: True shaker_build: type: str metadata: