From 29d4b8b63b7538272a14a115757d733ddbfe45a8 Mon Sep 17 00:00:00 2001 From: Sindhur Malleni Date: Thu, 10 Mar 2016 16:37:36 -0500 Subject: [PATCH] Adding MySQL Tuner to checks + Adding undercloud Change-Id: Ide98d1795e17d3b0d13a8af42959522e41c04329 Signed-off-by: Sindhur Malleni --- ansible/check/roles/controller/tasks/main.yml | 5 +++++ ansible/check/roles/undercloud/tasks/main.yml | 4 ++++ ansible/check/site.yml | 4 ++++ ansible/check/templates/mysql_report.j2 | 16 ++++++++++++++++ ansible/install/roles/browbeat/tasks/main.yml | 6 ++++++ 5 files changed, 35 insertions(+) create mode 100644 ansible/check/templates/mysql_report.j2 diff --git a/ansible/check/roles/controller/tasks/main.yml b/ansible/check/roles/controller/tasks/main.yml index d76bda4a9..e9a31c31e 100644 --- a/ansible/check/roles/controller/tasks/main.yml +++ b/ansible/check/roles/controller/tasks/main.yml @@ -63,3 +63,8 @@ register: rabbit_partitioned changed_when: no failed_when: rabbit_partitioned.rc == 0 + +- name: Run MySQL Tuner script + script: mysqltuner.pl --nocolor + register: mysql_out + diff --git a/ansible/check/roles/undercloud/tasks/main.yml b/ansible/check/roles/undercloud/tasks/main.yml index d37759378..2ef18e711 100644 --- a/ansible/check/roles/undercloud/tasks/main.yml +++ b/ansible/check/roles/undercloud/tasks/main.yml @@ -49,3 +49,7 @@ register: rabbit_partitioned changed_when: no failed_when: rabbit_partitioned.rc == 0 + +- name: Run MySQL Tuner script + script: mysqltuner.pl --nocolor + register: mysql_out diff --git a/ansible/check/site.yml b/ansible/check/site.yml index f05f3f83d..4da5317c6 100644 --- a/ansible/check/site.yml +++ b/ansible/check/site.yml @@ -41,3 +41,7 @@ tasks: - local_action: template src=templates/bug_report.j2 dest=./bug_report.log become: false + - local_action: template src=templates/mysql_report.j2 dest=./mysql_report.log + become: false + - replace: dest=mysql_report.log regexp='\[([^\s+]+)' replace='' + - replace: dest=mysql_report.log regexp='\r' replace='' diff --git a/ansible/check/templates/mysql_report.j2 b/ansible/check/templates/mysql_report.j2 new file mode 100644 index 000000000..df0757332 --- /dev/null +++ b/ansible/check/templates/mysql_report.j2 @@ -0,0 +1,16 @@ +# MYSQL Tuner Report + +{% for host in groups['undercloud'] %} +------------------------------------------- +| Results for host : {{ host }} +------------------------------------------- +{{hostvars[host]['mysql_out']['stdout']}} +{% endfor %} + + +{% for host in groups['controller'] %} +------------------------------------------- +| Results for host : {{ host }} +------------------------------------------- +{{hostvars[host]['mysql_out']['stdout']}} +{% endfor %} diff --git a/ansible/install/roles/browbeat/tasks/main.yml b/ansible/install/roles/browbeat/tasks/main.yml index c2f37ab3d..fea451582 100644 --- a/ansible/install/roles/browbeat/tasks/main.yml +++ b/ansible/install/roles/browbeat/tasks/main.yml @@ -64,6 +64,12 @@ - name: Install PerfKitBenchmarker Openstack requirements into perfkit-venv pip: requirements={{ perfkit_venv }}/PerfKitBenchmarker/requirements-openstack.txt virtualenv={{ perfkit_venv }} +- name: Install MySQl Tuner + git: repo=https://github.com/major/MySQLTuner-perl.git dest={{ home_dir }}/MySQLTuner-perl + +- name: Copy the MYSQl Tuner script into browbeat + command: cp {{ home_dir }}/MySQLTuner-perl/mysqltuner.pl {{ browbeat_path }}/ansible/check + - name: Install rally into rally-venv pip: name=rally virtualenv={{ rally_venv }} become: true