Commit 62514157 authored by MaksimSmile13's avatar MaksimSmile13
Browse files

Merge branch 'fix/ddash2' into 'master'

Fix ddash when no metric on interface profile

See merge request !2490
parents d886ca6f 1e843d4f
Pipeline #15303 passed with stages
in 54 minutes and 50 seconds
......@@ -112,7 +112,6 @@ class MODashboard(BaseDashboard):
"metrics": interface_radio_metrics(profile),
}
]
continue
if iface.type == "physical":
ports += [
{
......
{% set comma = joiner(",") -%}
{
"id": "dca571a2-2018-432e-b6a5-101670b395ca",
"title": "{{device}}",
......@@ -20,6 +19,7 @@
"templating": {
"list": [
{%if port_types %}
{% set comma = joiner(",") -%}
{% for port_type in port_types -%}
{% from 'template_port.j2' import ports -%}
{{ comma() }}{{ ports(port_type) }}
......@@ -27,10 +27,11 @@
{% endif %}
{% if radio_types %}
{% set comma = joiner(",") -%}
{% for port_type in radio_types -%}
{% from 'template_radio.j2' import radio -%}
{{ radio(port_type) }}{{ comma() }}
{% endfor -%}
{{ comma() }}{{ radio(port_type) }}
{% endfor -%},
{% endif %}
{% if subifaces %}
......@@ -196,7 +197,7 @@
"editable": false,
"height": "250px",
"showTitle": true,
"title": "{{radio.name}}",
"title": "Radio: {{radio.name}}",
"internal_comment": "radio_row",
"panels": [
{%if "tx_power" in radio.ports[0].metrics or "rx_power" in radio.ports[0].metrics %}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment