From 2e88816b07f11d8218773b4824a8b308536950e1 Mon Sep 17 00:00:00 2001 From: Asma Syed Hameed Date: Thu, 19 Nov 2020 10:35:32 +0530 Subject: [PATCH] Fix grafana-dashboard match is deprecated in ansible 2.9 Change-Id: Ib05e65334829235f48a0b805a0fb28d1d954d329 --- .../templates/partials/per_process_rows.yaml.j2 | 2 +- .../templates/partials/per_process_single_row.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/install/roles/grafana-dashboards/templates/partials/per_process_rows.yaml.j2 b/ansible/install/roles/grafana-dashboards/templates/partials/per_process_rows.yaml.j2 index cb2b6340c..9fc2a9adc 100644 --- a/ansible/install/roles/grafana-dashboards/templates/partials/per_process_rows.yaml.j2 +++ b/ansible/install/roles/grafana-dashboards/templates/partials/per_process_rows.yaml.j2 @@ -23,7 +23,7 @@ targets: {% for process in panel.processes %} {% for metric in metrics.metrics %} - {% if metrics.name|match('Process CPU') %} + {% if metrics.name == 'Process CPU' %} - target: alias(scale($Cloud.$Node.processes-{{process|replace('.', '_')|replace(':', '_')}}{{metric.query}}, 0.0001), '{{process}} {{metric.name}}') {% else %} - target: alias($Cloud.$Node.processes-{{process|replace('.', '_')|replace(':', '_')}}{{metric.query}}, '{{process}} {{metric.name}}') diff --git a/ansible/install/roles/grafana-dashboards/templates/partials/per_process_single_row.yaml.j2 b/ansible/install/roles/grafana-dashboards/templates/partials/per_process_single_row.yaml.j2 index e3aea71b2..9319a0d7a 100644 --- a/ansible/install/roles/grafana-dashboards/templates/partials/per_process_single_row.yaml.j2 +++ b/ansible/install/roles/grafana-dashboards/templates/partials/per_process_single_row.yaml.j2 @@ -22,7 +22,7 @@ targets: {% for process in partial_panel.processes %} {% for metric in metrics.metrics %} - {% if metrics.name|match('Process CPU') %} + {% if metrics.name == 'Process CPU' %} - target: alias(scale($Cloud.$Node.processes-{{process|replace('.', '_')|replace(':', '_')}}{{metric.query}}, 0.0001), '{{process}} {{metric.name}}') {% else %} - target: alias($Cloud.$Node.processes-{{process|replace('.', '_')|replace(':', '_')}}{{metric.query}}, '{{process}} {{metric.name}}')