From 740c9840973feb0a41209099b5d723bb22dfa160 Mon Sep 17 00:00:00 2001 From: Ivan Medvedkov Date: Thu, 15 Sep 2022 06:29:39 +0300 Subject: [PATCH 1/2] change and add --- .../Errors/{CRC_In_Delta.json => CRC_Delta.json} | 2 +- .../Errors/{Frame_In_Delta.json => Frame_Delta.json} | 2 +- collections/pm.metrictypes/Memory/Total.json | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) rename collections/pm.metrictypes/Interface/Errors/{CRC_In_Delta.json => CRC_Delta.json} (86%) rename collections/pm.metrictypes/Interface/Errors/{Frame_In_Delta.json => Frame_Delta.json} (86%) create mode 100644 collections/pm.metrictypes/Memory/Total.json diff --git a/collections/pm.metrictypes/Interface/Errors/CRC_In_Delta.json b/collections/pm.metrictypes/Interface/Errors/CRC_Delta.json similarity index 86% rename from collections/pm.metrictypes/Interface/Errors/CRC_In_Delta.json rename to collections/pm.metrictypes/Interface/Errors/CRC_Delta.json index f760e18120..0fe4abff8c 100644 --- a/collections/pm.metrictypes/Interface/Errors/CRC_In_Delta.json +++ b/collections/pm.metrictypes/Interface/Errors/CRC_Delta.json @@ -1,5 +1,5 @@ { - "name": "Interface | Errors | CRC | In | Delta", + "name": "Interface | Errors | CRC | Delta", "$collection": "pm.metrictypes", "uuid": "b2df0f15-229a-4981-ade2-b820e761f2ef", "scope__name": "Interface", diff --git a/collections/pm.metrictypes/Interface/Errors/Frame_In_Delta.json b/collections/pm.metrictypes/Interface/Errors/Frame_Delta.json similarity index 86% rename from collections/pm.metrictypes/Interface/Errors/Frame_In_Delta.json rename to collections/pm.metrictypes/Interface/Errors/Frame_Delta.json index 073e65a55a..5ab50d79c2 100644 --- a/collections/pm.metrictypes/Interface/Errors/Frame_In_Delta.json +++ b/collections/pm.metrictypes/Interface/Errors/Frame_Delta.json @@ -1,5 +1,5 @@ { - "name": "Interface | Errors | Frame | In | Delta", + "name": "Interface | Errors | Frame | Delta", "$collection": "pm.metrictypes", "uuid": "73daa660-0ddf-40d3-ac34-4bd259146694", "scope__name": "Interface", diff --git a/collections/pm.metrictypes/Memory/Total.json b/collections/pm.metrictypes/Memory/Total.json new file mode 100644 index 0000000000..18a8a03a29 --- /dev/null +++ b/collections/pm.metrictypes/Memory/Total.json @@ -0,0 +1,12 @@ +{ + "name": "Memory | Total", + "$collection": "pm.metrictypes", + "uuid": "2425fd6e-009b-4078-980e-aff3017d279e", + "scope__name": "Memory", + "field_name": "total", + "field_type": "UInt64", + "description": "Memory total in bytes", + "measure": "bytes", + "units__code": "byte", + "scale__code": "1" +} -- GitLab From fe5e08d02f2cb8b9dd90ba9eae85842822712004 Mon Sep 17 00:00:00 2001 From: Ivan Medvedkov Date: Fri, 16 Sep 2022 12:05:31 +0300 Subject: [PATCH 2/2] interface errors and memory --- .../interface_errors_collision_delta.json | 6 ++++++ .../interface_errors_collision_rate.json | 6 ++++++ .../interface_errors_crc_in_delta.json | 6 ++++++ .../interface_errors_frame_in_delta.json | 6 ++++++ .../Cisco/IOS/snmp_metrics/memory_total.json | 10 ++++++++++ .../interface_multicast_packets_in_delta.json | 16 ++++++++++++++++ .../network_stp_topology_changes_rate.json | 11 +++++++++++ .../Juniper/JUNOS/snmp_metrics/memory_total.json | 6 ++++++ 8 files changed, 67 insertions(+) create mode 100644 sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_collision_delta.json create mode 100644 sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_collision_rate.json create mode 100644 sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_crc_in_delta.json create mode 100644 sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_frame_in_delta.json create mode 100644 sa/profiles/Cisco/IOS/snmp_metrics/memory_total.json create mode 100644 sa/profiles/Generic/snmp_metrics/interface_multicast_packets_in_delta.json create mode 100644 sa/profiles/Generic/snmp_metrics/network_stp_topology_changes_rate.json create mode 100644 sa/profiles/Juniper/JUNOS/snmp_metrics/memory_total.json diff --git a/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_collision_delta.json b/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_collision_delta.json new file mode 100644 index 0000000000..87de099111 --- /dev/null +++ b/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_collision_delta.json @@ -0,0 +1,6 @@ +{ + "$metric": "Interface | Errors | Collision | Delta", + "$type": "ifindex", + "oid": "1.3.6.1.4.1.9.2.2.1.1.25.{{ ifIndex }}", + "type": "delta" +} diff --git a/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_collision_rate.json b/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_collision_rate.json new file mode 100644 index 0000000000..dfe18ba6c9 --- /dev/null +++ b/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_collision_rate.json @@ -0,0 +1,6 @@ +{ + "$metric": "Interface | Errors | Collision | Rate", + "$type": "ifindex", + "oid": "1.3.6.1.4.1.9.2.2.1.1.25.{{ ifIndex }}", + "type": "counter" +} diff --git a/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_crc_in_delta.json b/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_crc_in_delta.json new file mode 100644 index 0000000000..d443cfa698 --- /dev/null +++ b/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_crc_in_delta.json @@ -0,0 +1,6 @@ +{ + "$metric": "Interface | Errors | CRC | Delta", + "$type": "ifindex", + "oid": "1.3.6.1.4.1.9.2.2.1.1.12.{{ ifIndex }}", + "type": "delta" +} diff --git a/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_frame_in_delta.json b/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_frame_in_delta.json new file mode 100644 index 0000000000..a89f419258 --- /dev/null +++ b/sa/profiles/Cisco/IOS/snmp_metrics/interface_errors_frame_in_delta.json @@ -0,0 +1,6 @@ +{ + "$metric": "Interface | Errors | Frame | Delta", + "$type": "ifindex", + "oid": "1.3.6.1.4.1.9.2.2.1.1.13.{{ ifIndex }}", + "type": "delta" +} diff --git a/sa/profiles/Cisco/IOS/snmp_metrics/memory_total.json b/sa/profiles/Cisco/IOS/snmp_metrics/memory_total.json new file mode 100644 index 0000000000..a16834015e --- /dev/null +++ b/sa/profiles/Cisco/IOS/snmp_metrics/memory_total.json @@ -0,0 +1,10 @@ +{ + "$metric": "Memory | Total", + "$type": "oid", + "oid": [ + "1.3.6.1.4.1.9.9.48.1.1.1.6.1", + "1.3.6.1.4.1.9.9.48.1.1.1.5.1" + ], + "scale": "sum", + "units": "byte" +} \ No newline at end of file diff --git a/sa/profiles/Generic/snmp_metrics/interface_multicast_packets_in_delta.json b/sa/profiles/Generic/snmp_metrics/interface_multicast_packets_in_delta.json new file mode 100644 index 0000000000..981cbcbd64 --- /dev/null +++ b/sa/profiles/Generic/snmp_metrics/interface_multicast_packets_in_delta.json @@ -0,0 +1,16 @@ +{ + "$metric": "Interface | Multicast | In | Delta", + "$type": "hires", + "hires": { + "$type": "ifindex", + "oid": "IF-MIB::ifHCInMulticastPkts.{{ ifIndex }}", + "type": "delta", + "units": "pkt" + }, + "normal": { + "$type": "ifindex", + "oid": "IF-MIB::ifInMulticastPkts.{{ ifIndex }}", + "type": "delta", + "units": "pkt" + } +} diff --git a/sa/profiles/Generic/snmp_metrics/network_stp_topology_changes_rate.json b/sa/profiles/Generic/snmp_metrics/network_stp_topology_changes_rate.json new file mode 100644 index 0000000000..b2b05c77db --- /dev/null +++ b/sa/profiles/Generic/snmp_metrics/network_stp_topology_changes_rate.json @@ -0,0 +1,11 @@ +{ + "$metric": "Network | STP | Topology Changes | Rate", + "$type": "caps", + "oids": [[ + "Network | STP", { + "$type": "oid", + "oid": "1.3.6.1.2.1.17.2.4.0", + "type": "counter" + } + ]] +} diff --git a/sa/profiles/Juniper/JUNOS/snmp_metrics/memory_total.json b/sa/profiles/Juniper/JUNOS/snmp_metrics/memory_total.json new file mode 100644 index 0000000000..31b560e2bc --- /dev/null +++ b/sa/profiles/Juniper/JUNOS/snmp_metrics/memory_total.json @@ -0,0 +1,6 @@ +{ + "$metric": "Memory | Total", + "$type": "slot", + "oid": "1.3.6.1.4.1.2636.3.1.13.1.10.{{ hwSlotIndex }}", + "units": "byte" +} -- GitLab