x/browbeat
Code Issues Proposed changes

Merge "Fix grafana-dashboard match is deprecated in ansible 2.9"

Browse Source
This commit is contained in:
Zuul 2020-11-20 11:35:24 +00:00 committed by Gerrit Code Review
commit 0ef0b7e3a4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/install/roles/grafana-dashboards/templates/partials/per_process_rows.yaml.j2
View File

@ -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}}')

2
ansible/install/roles/grafana-dashboards/templates/partials/per_process_single_row.yaml.j2
View File

@ -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}}')