From ca55e2ff593be0c888e68f7069a012c401b50726 Mon Sep 17 00:00:00 2001 From: Damien Arnodo Date: Tue, 16 Dec 2025 14:26:01 +0000 Subject: [PATCH] fix(grafana): correct metric names in weathermap queries Changed from: - gnmic_interfaces_interface_state_counters_out_octets - gnmic_interfaces_interface_state_counters_in_octets - target label To: - gnmic_interfaces_out_octets - gnmic_interfaces_in_octets - source label These match the actual metrics generated by gNMIc with the simplified /interfaces/interface/state path and trim-prefixes processor. --- monitoring/grafana/dashboards/weathermap.json | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/monitoring/grafana/dashboards/weathermap.json b/monitoring/grafana/dashboards/weathermap.json index b452657..b10d323 100644 --- a/monitoring/grafana/dashboards/weathermap.json +++ b/monitoring/grafana/dashboards/weathermap.json @@ -30,128 +30,128 @@ "id": "spine1-leaf1", "source": "spine1", "target": "leaf1", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine1\",interface_name=\"Ethernet1\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine1\",interface_name=\"Ethernet1\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine1\",interface_name=\"Ethernet1\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine1\",interface_name=\"Ethernet1\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine1-leaf2", "source": "spine1", "target": "leaf2", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine1\",interface_name=\"Ethernet2\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine1\",interface_name=\"Ethernet2\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine1\",interface_name=\"Ethernet2\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine1\",interface_name=\"Ethernet2\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine1-leaf3", "source": "spine1", "target": "leaf3", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine1\",interface_name=\"Ethernet3\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine1\",interface_name=\"Ethernet3\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine1\",interface_name=\"Ethernet3\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine1\",interface_name=\"Ethernet3\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine1-leaf4", "source": "spine1", "target": "leaf4", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine1\",interface_name=\"Ethernet4\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine1\",interface_name=\"Ethernet4\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine1\",interface_name=\"Ethernet4\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine1\",interface_name=\"Ethernet4\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine1-leaf5", "source": "spine1", "target": "leaf5", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine1\",interface_name=\"Ethernet5\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine1\",interface_name=\"Ethernet5\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine1\",interface_name=\"Ethernet5\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine1\",interface_name=\"Ethernet5\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine1-leaf6", "source": "spine1", "target": "leaf6", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine1\",interface_name=\"Ethernet6\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine1\",interface_name=\"Ethernet6\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine1\",interface_name=\"Ethernet6\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine1\",interface_name=\"Ethernet6\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine1-leaf7", "source": "spine1", "target": "leaf7", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine1\",interface_name=\"Ethernet7\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine1\",interface_name=\"Ethernet7\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine1\",interface_name=\"Ethernet7\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine1\",interface_name=\"Ethernet7\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine1-leaf8", "source": "spine1", "target": "leaf8", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine1\",interface_name=\"Ethernet8\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine1\",interface_name=\"Ethernet8\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine1\",interface_name=\"Ethernet8\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine1\",interface_name=\"Ethernet8\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine2-leaf1", "source": "spine2", "target": "leaf1", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine2\",interface_name=\"Ethernet1\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine2\",interface_name=\"Ethernet1\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine2\",interface_name=\"Ethernet1\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine2\",interface_name=\"Ethernet1\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine2-leaf2", "source": "spine2", "target": "leaf2", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine2\",interface_name=\"Ethernet2\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine2\",interface_name=\"Ethernet2\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine2\",interface_name=\"Ethernet2\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine2\",interface_name=\"Ethernet2\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine2-leaf3", "source": "spine2", "target": "leaf3", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine2\",interface_name=\"Ethernet3\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine2\",interface_name=\"Ethernet3\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine2\",interface_name=\"Ethernet3\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine2\",interface_name=\"Ethernet3\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine2-leaf4", "source": "spine2", "target": "leaf4", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine2\",interface_name=\"Ethernet4\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine2\",interface_name=\"Ethernet4\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine2\",interface_name=\"Ethernet4\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine2\",interface_name=\"Ethernet4\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine2-leaf5", "source": "spine2", "target": "leaf5", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine2\",interface_name=\"Ethernet5\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine2\",interface_name=\"Ethernet5\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine2\",interface_name=\"Ethernet5\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine2\",interface_name=\"Ethernet5\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine2-leaf6", "source": "spine2", "target": "leaf6", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine2\",interface_name=\"Ethernet6\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine2\",interface_name=\"Ethernet6\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine2\",interface_name=\"Ethernet6\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine2\",interface_name=\"Ethernet6\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine2-leaf7", "source": "spine2", "target": "leaf7", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine2\",interface_name=\"Ethernet7\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine2\",interface_name=\"Ethernet7\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine2\",interface_name=\"Ethernet7\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine2\",interface_name=\"Ethernet7\"}[1m])*8", "bandwidth": 1000000000 }, { "id": "spine2-leaf8", "source": "spine2", "target": "leaf8", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"spine2\",interface_name=\"Ethernet8\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"spine2\",interface_name=\"Ethernet8\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"spine2\",interface_name=\"Ethernet8\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"spine2\",interface_name=\"Ethernet8\"}[1m])*8", "bandwidth": 1000000000 }, { @@ -159,8 +159,8 @@ "source": "leaf1", "target": "leaf2", "label": "MLAG", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"leaf1\",interface_name=\"Ethernet10\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"leaf1\",interface_name=\"Ethernet10\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"leaf1\",interface_name=\"Ethernet10\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"leaf1\",interface_name=\"Ethernet10\"}[1m])*8", "bandwidth": 1000000000 }, { @@ -168,8 +168,8 @@ "source": "leaf3", "target": "leaf4", "label": "MLAG", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"leaf3\",interface_name=\"Ethernet10\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"leaf3\",interface_name=\"Ethernet10\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"leaf3\",interface_name=\"Ethernet10\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"leaf3\",interface_name=\"Ethernet10\"}[1m])*8", "bandwidth": 1000000000 }, { @@ -177,8 +177,8 @@ "source": "leaf5", "target": "leaf6", "label": "MLAG", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"leaf5\",interface_name=\"Ethernet10\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"leaf5\",interface_name=\"Ethernet10\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"leaf5\",interface_name=\"Ethernet10\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"leaf5\",interface_name=\"Ethernet10\"}[1m])*8", "bandwidth": 1000000000 }, { @@ -186,8 +186,8 @@ "source": "leaf7", "target": "leaf8", "label": "MLAG", - "queryA": "rate(gnmic_interfaces_interface_state_counters_out_octets{target=\"leaf7\",interface_name=\"Ethernet10\"}[1m])*8", - "queryB": "rate(gnmic_interfaces_interface_state_counters_in_octets{target=\"leaf7\",interface_name=\"Ethernet10\"}[1m])*8", + "queryA": "rate(gnmic_interfaces_out_octets{source=\"leaf7\",interface_name=\"Ethernet10\"}[1m])*8", + "queryB": "rate(gnmic_interfaces_in_octets{source=\"leaf7\",interface_name=\"Ethernet10\"}[1m])*8", "bandwidth": 1000000000 } ],