From 61d00fec6f948a7b8263acf96704b59dafe1450b Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Thu, 21 Oct 2021 14:32:24 -0700
Subject: [PATCH] Use pcp instead of dstand and return dstat graph artifact

Dstat is dead, but pcp supplies a compatible interface.

Installation can be unreliable, so let's ignore failures since
this isn't generally critical.

Change-Id: I9234b226242f145db9c235797649202aa530ec74
---
 roles/dstat-graph/tasks/main.yaml | 10 ++++++++++
 roles/run-dstat/tasks/main.yaml   |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/roles/dstat-graph/tasks/main.yaml b/roles/dstat-graph/tasks/main.yaml
index f4a5a051e..4a0a1ea55 100644
--- a/roles/dstat-graph/tasks/main.yaml
+++ b/roles/dstat-graph/tasks/main.yaml
@@ -18,3 +18,13 @@
   shell: "./generate_page.sh {{ dstat_data_path }} > {{ ansible_user_dir }}/zuul-output/logs/dstat.html"
   args:
     chdir: "{{ dstat_path }}"
+
+- name: Return dstat artifact to Zuul
+  zuul_return:
+    data:
+      zuul:
+        artifacts:
+          - name: "Dstat graph"
+            url: "dstat.html"
+            metadata:
+              type: dstat_graph
diff --git a/roles/run-dstat/tasks/main.yaml b/roles/run-dstat/tasks/main.yaml
index 9e4a44032..60b9c435f 100644
--- a/roles/run-dstat/tasks/main.yaml
+++ b/roles/run-dstat/tasks/main.yaml
@@ -1,9 +1,11 @@
 - name: Install dstat
   package:
-    name: dstat
+    name: pcp
     state: present
   become: true
+  failed_when: false
 - name: Run dstat
   shell: "dstat -tcmndrylpg --tcp --output {{ dstat_data_path }} >& /dev/null &"
   args:
     executable: /bin/bash
+  failed_when: false