From 1880a732e3abf1475abef6d5281338e042d77dfb Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Thu, 22 Sep 2022 11:15:53 +0100 Subject: [PATCH 1/6] playbook for installing and running cardiff --- etc/kayobe/ansible/cardiff-run.yml | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 etc/kayobe/ansible/cardiff-run.yml diff --git a/etc/kayobe/ansible/cardiff-run.yml b/etc/kayobe/ansible/cardiff-run.yml new file mode 100644 index 0000000000..0d2676e30b --- /dev/null +++ b/etc/kayobe/ansible/cardiff-run.yml @@ -0,0 +1,44 @@ +--- +- name: Cardiff run + hosts: localhost + gather_facts: no + tags: + - cardiff + vars: + venv: "~/venvs/cardiff-venv" + input_dir: "{{ lookup('env', 'PWD') }}/overcloud-introspection-data" + output_dir: "{{ lookup('env', 'PWD') }}/review" + tasks: + - name: Install dependencies + pip: + virtualenv: "{{ venv }}" + name: + - git+https://github.com/stackhpc/cardiff + - pyvis + - pyvis.network + state: latest + + - name: Create data directory + file: + path: '{{ output_dir }}/data' + state: directory + + - name: Extract data + shell: + cmd: > + {{ venv }}/bin/m2-extract {{ input_dir }}/*.json --output_dir {{ output_dir }}/data + + - name: Create review directory + file: + path: '{{ output_dir }}/results' + state: directory + + - name: Process data + shell: + cmd: > + {{ venv }}/bin/cardiff + -I ipmi + -p '{{ output_dir }}/data/extra-hardware/*.eval' + -o '{{ output_dir }}/results' + --visualise + # --visualise_dataless \ No newline at end of file From a1bccbc8221d881ddbc4919c6751208767c5a328 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Thu, 22 Sep 2022 14:37:05 +0100 Subject: [PATCH 2/6] Add regex pattern, add line to eof --- etc/kayobe/ansible/cardiff-run.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/ansible/cardiff-run.yml b/etc/kayobe/ansible/cardiff-run.yml index 0d2676e30b..a2090682d6 100644 --- a/etc/kayobe/ansible/cardiff-run.yml +++ b/etc/kayobe/ansible/cardiff-run.yml @@ -8,12 +8,14 @@ venv: "~/venvs/cardiff-venv" input_dir: "{{ lookup('env', 'PWD') }}/overcloud-introspection-data" output_dir: "{{ lookup('env', 'PWD') }}/review" + cardiff_pattern: ".*.eval" # Uses regex tasks: - name: Install dependencies pip: virtualenv: "{{ venv }}" name: - git+https://github.com/stackhpc/cardiff + #- /home/matt/Documents/cardiff - pyvis - pyvis.network state: latest @@ -38,7 +40,7 @@ cmd: > {{ venv }}/bin/cardiff -I ipmi - -p '{{ output_dir }}/data/extra-hardware/*.eval' + -p '{{ output_dir }}/data/extra-hardware/{{ cardiff_pattern }}' -o '{{ output_dir }}/results' --visualise - # --visualise_dataless \ No newline at end of file + # --visualise_dataless From 3df7cb4295246dd559f1a7cfe45a253fbded1e7c Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 7 Oct 2022 09:32:07 +0100 Subject: [PATCH 3/6] Review changes --- etc/kayobe/ansible/cardiff-run.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etc/kayobe/ansible/cardiff-run.yml b/etc/kayobe/ansible/cardiff-run.yml index a2090682d6..e51a7858d8 100644 --- a/etc/kayobe/ansible/cardiff-run.yml +++ b/etc/kayobe/ansible/cardiff-run.yml @@ -5,7 +5,7 @@ tags: - cardiff vars: - venv: "~/venvs/cardiff-venv" + venv: "~/venvs/cardiff-review" input_dir: "{{ lookup('env', 'PWD') }}/overcloud-introspection-data" output_dir: "{{ lookup('env', 'PWD') }}/review" cardiff_pattern: ".*.eval" # Uses regex @@ -15,7 +15,6 @@ virtualenv: "{{ venv }}" name: - git+https://github.com/stackhpc/cardiff - #- /home/matt/Documents/cardiff - pyvis - pyvis.network state: latest @@ -43,4 +42,3 @@ -p '{{ output_dir }}/data/extra-hardware/{{ cardiff_pattern }}' -o '{{ output_dir }}/results' --visualise - # --visualise_dataless From 9a48295a47fb1e67414ff3ac1d8c01cd61819438 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 14 Oct 2022 11:10:41 +0100 Subject: [PATCH 4/6] packages moved to requirements file --- etc/kayobe/ansible/cardiff-run.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/kayobe/ansible/cardiff-run.yml b/etc/kayobe/ansible/cardiff-run.yml index e51a7858d8..0b796a46e0 100644 --- a/etc/kayobe/ansible/cardiff-run.yml +++ b/etc/kayobe/ansible/cardiff-run.yml @@ -15,8 +15,6 @@ virtualenv: "{{ venv }}" name: - git+https://github.com/stackhpc/cardiff - - pyvis - - pyvis.network state: latest - name: Create data directory From f9ec2b1597de7a6ff6fac6a68e2d789b5a5e46b5 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Tue, 18 Oct 2022 15:03:10 +0100 Subject: [PATCH 5/6] Change name from cardiff to ADVise --- .../ansible/{cardiff-run.yml => advise-run.yml} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename etc/kayobe/ansible/{cardiff-run.yml => advise-run.yml} (74%) diff --git a/etc/kayobe/ansible/cardiff-run.yml b/etc/kayobe/ansible/advise-run.yml similarity index 74% rename from etc/kayobe/ansible/cardiff-run.yml rename to etc/kayobe/ansible/advise-run.yml index 0b796a46e0..c3b6f2ffdf 100644 --- a/etc/kayobe/ansible/cardiff-run.yml +++ b/etc/kayobe/ansible/advise-run.yml @@ -1,20 +1,20 @@ --- -- name: Cardiff run +- name: ADVise run hosts: localhost gather_facts: no tags: - - cardiff + - advise vars: - venv: "~/venvs/cardiff-review" + venv: "~/venvs/advise-review" input_dir: "{{ lookup('env', 'PWD') }}/overcloud-introspection-data" output_dir: "{{ lookup('env', 'PWD') }}/review" - cardiff_pattern: ".*.eval" # Uses regex + advise_pattern: ".*.eval" # Uses regex tasks: - name: Install dependencies pip: virtualenv: "{{ venv }}" name: - - git+https://github.com/stackhpc/cardiff + - git+https://github.com/stackhpc/ADVise state: latest - name: Create data directory @@ -35,8 +35,8 @@ - name: Process data shell: cmd: > - {{ venv }}/bin/cardiff + {{ venv }}/bin/advise -I ipmi - -p '{{ output_dir }}/data/extra-hardware/{{ cardiff_pattern }}' + -p '{{ output_dir }}/data/extra-hardware/{{ advise_pattern }}' -o '{{ output_dir }}/results' --visualise From 022e0bd4e2ea474b6cdab14e094e9cce5607aac1 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Mon, 24 Oct 2022 09:16:16 +0100 Subject: [PATCH 6/6] Separate processing from visualisation --- etc/kayobe/ansible/advise-run.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/ansible/advise-run.yml b/etc/kayobe/ansible/advise-run.yml index c3b6f2ffdf..09440aeb95 100644 --- a/etc/kayobe/ansible/advise-run.yml +++ b/etc/kayobe/ansible/advise-run.yml @@ -35,8 +35,12 @@ - name: Process data shell: cmd: > - {{ venv }}/bin/advise + {{ venv }}/bin/advise-process -I ipmi -p '{{ output_dir }}/data/extra-hardware/{{ advise_pattern }}' - -o '{{ output_dir }}/results' - --visualise + -o '{{ output_dir }}' + + - name: Visualise data + command: > + {{ venv }}/bin/advise-visualise + --output_dir '{{ output_dir }}'