diff --git a/collections/pm.measurementunits/Ampere.json b/collections/pm.measurementunits/Ampere.json index 6c732edd6289873fc6a7438e92b16be552646737..60bd032521ad5eb60576fb335fca0e4f990216e5 100644 --- a/collections/pm.measurementunits/Ampere.json +++ b/collections/pm.measurementunits/Ampere.json @@ -4,7 +4,17 @@ "uuid": "9e59d6e9-debf-48d4-b122-8283e1206797", "description": "Electric current measurement", "label": "A", - "dashboard_label": "mamp", + "dashboard_label": "amp", "dashboard_sr_color": 16777215, - "scale_type": "d" + "scale_type": "d", + "alt_units": [ + { + "dashboard_label": "mamp", + "description": "milliAmpere", + "from_primary": "x * 1000", + "label": "mA", + "name": "milliAmpere", + "to_primary": "x / 1000" + } + ] } diff --git a/collections/pm.measurementunits/Bytes.json b/collections/pm.measurementunits/Bytes.json new file mode 100644 index 0000000000000000000000000000000000000000..4f7a84355f02e312856bace094909ada7482e3c2 --- /dev/null +++ b/collections/pm.measurementunits/Bytes.json @@ -0,0 +1,19 @@ +{ + "name": "Bytes", + "$collection": "pm.measurementunits", + "uuid": "c78335e8-540b-4843-9fde-65baed385c9d", + "description": "Bytes, or multiples thereof, are almost always used to specify the sizes of computer files and the capacity of storage units", + "label": "bytes", + "dashboard_label": "bytes", + "scale_type": "b", + "alt_units": [ + { + "dashboard_label": "bits", + "description": "Bit", + "from_primary": "x * 8", + "label": "bits", + "name": "bit", + "to_primary": "x / 8" + } + ] +} diff --git a/collections/pm.measurementunits/Decibel-mw.json b/collections/pm.measurementunits/Decibel-mw.json new file mode 100644 index 0000000000000000000000000000000000000000..4abb56356669d54bbd17903b615d820781502fc5 --- /dev/null +++ b/collections/pm.measurementunits/Decibel-mw.json @@ -0,0 +1,9 @@ +{ + "name": "Decibel-mw", + "$collection": "pm.measurementunits", + "uuid": "e787d8a7-e3e2-40a5-8570-782f6aad90ef", + "description": "dBm or dBmW (decibel-milliwatts) is a unit of level used to indicate that a power level is expressed in decibels (dB) with reference to one milliwatt (mW)", + "label": "dBm", + "dashboard_label": "dBm", + "scale_type": "d" +} diff --git a/collections/pm.measurementunits/Decibel-uv.json b/collections/pm.measurementunits/Decibel-uv.json new file mode 100644 index 0000000000000000000000000000000000000000..1de1fbe1a50f6cf90f4d4fd350c36b12d27fd1eb --- /dev/null +++ b/collections/pm.measurementunits/Decibel-uv.json @@ -0,0 +1,9 @@ +{ + "name": "Decibel-uv", + "$collection": "pm.measurementunits", + "uuid": "c26cd7d5-7a25-48f1-bdfb-90ceae629245", + "description": "Voltage relative to 1 microvolt.", + "label": "dBuV", + "dashboard_label": "dBuV", + "scale_type": "d" +} diff --git a/collections/pm.measurementunits/Decibel.json b/collections/pm.measurementunits/Decibel.json new file mode 100644 index 0000000000000000000000000000000000000000..efcc1b57ac73843f0d52d9d9164083741ba4105e --- /dev/null +++ b/collections/pm.measurementunits/Decibel.json @@ -0,0 +1,9 @@ +{ + "name": "Decibel", + "$collection": "pm.measurementunits", + "uuid": "63fe8f4f-7f6b-4423-94da-a17a679bdae3", + "description": "The decibel (symbol: dB) is a relative unit of measurement corresponding to one tenth of a bel (B).", + "label": "dB", + "dashboard_label": "dB", + "scale_type": "d" +} diff --git a/collections/pm.measurementunits/DuplexStatus.json b/collections/pm.measurementunits/DuplexStatus.json new file mode 100644 index 0000000000000000000000000000000000000000..4a0839ba1b72a44a1f73809190c606de1d90d08a --- /dev/null +++ b/collections/pm.measurementunits/DuplexStatus.json @@ -0,0 +1,23 @@ +{ + "name": "DuplexStatus", + "$collection": "pm.measurementunits", + "uuid": "a12e431c-442d-47a7-a135-7a0524903fa1", + "description": "Interface Duplex state", + "label": " ", + "dashboard_label": " ", + "scale_type": "d", + "enum": [ + { + "key": "Unknown", + "value": 1 + }, + { + "key": "Half", + "value": 2 + }, + { + "key": "Full", + "value": 3 + } + ] +} diff --git a/collections/pm.measurementunits/InterfaceStatus.json b/collections/pm.measurementunits/InterfaceStatus.json new file mode 100644 index 0000000000000000000000000000000000000000..6eaac4a90c8c88f09d81287749306f620bdf07de --- /dev/null +++ b/collections/pm.measurementunits/InterfaceStatus.json @@ -0,0 +1,39 @@ +{ + "name": "InterfaceOperState", + "$collection": "pm.measurementunits", + "uuid": "75284e4b-3a00-40de-ab36-a210663ed889", + "description": "Operational state of the interface", + "label": " ", + "dashboard_label": " ", + "scale_type": "d", + "enum": [ + { + "key": "up", + "value": 1 + }, + { + "key": "Down", + "value": 2 + }, + { + "key": "testing", + "value": 3 + }, + { + "key": "unknown", + "value": 4 + }, + { + "key": "dormant", + "value": 5 + }, + { + "key": "notPresent", + "value": 6 + }, + { + "key": "lowerLayerDown", + "value": 7 + } + ] +} diff --git a/collections/pm.measurementunits/Microsecond.json b/collections/pm.measurementunits/Microsecond.json new file mode 100644 index 0000000000000000000000000000000000000000..d69722d072bd99d253e90f3442d3e39288a785ab --- /dev/null +++ b/collections/pm.measurementunits/Microsecond.json @@ -0,0 +1,27 @@ +{ + "name": "microSecond", + "$collection": "pm.measurementunits", + "uuid": "13d2469b-9acb-4997-8a3e-efd48d2ff674", + "description": "Time measurement", + "label": "μs", + "dashboard_label": "μs", + "scale_type": "d", + "alt_units": [ + { + "dashboard_label": "s", + "description": "Second", + "from_primary": "x / 1000000", + "label": "s", + "name": "Second", + "to_primary": "x * 1000000" + }, + { + "dashboard_label": "ms", + "description": "Millisecond", + "from_primary": "x / 1000", + "label": "ms", + "name": "milliSecond", + "to_primary": "x * 1000" + } + ] +} diff --git a/collections/pm.measurementunits/Millisecond.json b/collections/pm.measurementunits/Millisecond.json new file mode 100644 index 0000000000000000000000000000000000000000..86f97c5ac6a61134347c8d78b6f05378d7698c46 --- /dev/null +++ b/collections/pm.measurementunits/Millisecond.json @@ -0,0 +1,27 @@ +{ + "name": "milliSecond", + "$collection": "pm.measurementunits", + "uuid": "f3c6a418-88bd-4009-bea1-d5457275073f", + "description": "Time measurement", + "label": "ms", + "dashboard_label": "ms", + "scale_type": "d", + "alt_units": [ + { + "dashboard_label": "s", + "description": "Second", + "from_primary": "x / 1000", + "label": "s", + "name": "Second", + "to_primary": "x * 1000" + }, + { + "dashboard_label": "μs", + "description": "Microsecond", + "from_primary": "x * 1000", + "label": "μs", + "name": "microSecond", + "to_primary": "x / 1000" + } + ] +} diff --git a/collections/pm.measurementunits/Packets.json b/collections/pm.measurementunits/Packets.json new file mode 100644 index 0000000000000000000000000000000000000000..c4f66d9db3136127b046c4da68a0745838bc4da2 --- /dev/null +++ b/collections/pm.measurementunits/Packets.json @@ -0,0 +1,19 @@ +{ + "name": "Packets", + "$collection": "pm.measurementunits", + "uuid": "fa757cfd-621e-4dad-a8fe-3350ff44e46a", + "description": "Network packet is a formatted unit of data carried by a packet-switched network.", + "label": "packets", + "dashboard_label": "packets", + "scale_type": "d", + "alt_units": [ + { + "dashboard_label": "pps", + "description": "Packets per seconds", + "from_primary": "x / timedelta", + "label": "packets/s", + "name": "Packets/s", + "to_primary": "x * timedelta" + } + ] +} diff --git a/collections/pm.measurementunits/Packets_s.json b/collections/pm.measurementunits/Packets_s.json new file mode 100644 index 0000000000000000000000000000000000000000..06f0df76d06fc4dc5f914f4e37b16a95db70de2c --- /dev/null +++ b/collections/pm.measurementunits/Packets_s.json @@ -0,0 +1,19 @@ +{ + "name": "Packets/s", + "$collection": "pm.measurementunits", + "uuid": "1c1f8f7e-b513-4eea-bdf1-cb4428519420", + "description": "Packets per second (pps) is a measure of throughput", + "label": "pps", + "dashboard_label": "pps", + "scale_type": "d", + "alt_units": [ + { + "dashboard_label": "packets", + "description": "Packets", + "from_primary": "x * time_delta", + "label": "packets", + "name": "Packets", + "to_primary": "x / time_delta" + } + ] +} diff --git a/collections/pm.measurementunits/Scalar.json b/collections/pm.measurementunits/Scalar.json new file mode 100644 index 0000000000000000000000000000000000000000..911a3d7fb79b3add6ba37499810fa22e12f975dc --- /dev/null +++ b/collections/pm.measurementunits/Scalar.json @@ -0,0 +1,9 @@ +{ + "name": "Scalar", + "$collection": "pm.measurementunits", + "uuid": "4b3a9ec4-491a-4e2c-857d-e13656c0ada9", + "description": "Value with unknown measurement units", + "label": "Scalar", + "dashboard_label": "null", + "scale_type": "d" +} diff --git a/collections/pm.measurementunits/Second.json b/collections/pm.measurementunits/Second.json index 275cfa32bb6b52c458687d95973589d70724445c..2b43270432ef33c92626c081840f7497170d3769 100644 --- a/collections/pm.measurementunits/Second.json +++ b/collections/pm.measurementunits/Second.json @@ -5,5 +5,23 @@ "description": "Time measurement", "label": "s", "dashboard_label": "s", - "scale_type": "d" + "scale_type": "d", + "alt_units": [ + { + "dashboard_label": "ms", + "description": null, + "from_primary": "x * 1000", + "label": "ms", + "name": "milliSecond", + "to_primary": "x / 1000" + }, + { + "dashboard_label": "μs", + "description": null, + "from_primary": "x * 1000000", + "label": "μs", + "name": "microSecond", + "to_primary": "x / 1000000" + } + ] } diff --git a/collections/pm.measurementunits/Units.json b/collections/pm.measurementunits/Units.json new file mode 100644 index 0000000000000000000000000000000000000000..a330e5cafe8b94291318473cf735c831544ab84f --- /dev/null +++ b/collections/pm.measurementunits/Units.json @@ -0,0 +1,9 @@ +{ + "name": "Units", + "$collection": "pm.measurementunits", + "uuid": "47d59f1d-c463-4f2c-b85d-265618fc7cf6", + "description": "Once measurement unit", + "label": " ", + "dashboard_label": "unit", + "scale_type": "d" +} diff --git a/collections/pm.measurementunits/bit_s.json b/collections/pm.measurementunits/bit_s.json new file mode 100644 index 0000000000000000000000000000000000000000..17af77353abed47824f9683b1ba7d394f0af979d --- /dev/null +++ b/collections/pm.measurementunits/bit_s.json @@ -0,0 +1,35 @@ +{ + "name": "Bit/s", + "$collection": "pm.measurementunits", + "uuid": "ae068b8b-1c6b-4949-afc0-0e5010a777a4", + "description": "Bit rate (bitrate or as a variable R) is the number of bits that are conveyed or processed per unit of time", + "label": "bit/s", + "dashboard_label": "bps", + "scale_type": "d", + "alt_units": [ + { + "dashboard_label": "Bps", + "description": "Byte per second", + "from_primary": "x / 8", + "label": "B/s", + "name": "byte/s", + "to_primary": "x * 8" + }, + { + "dashboard_label": "bytes", + "description": "Bytes", + "from_primary": "(x / 8) / time_delta", + "label": "B", + "name": "Bytes", + "to_primary": "(x * 8) / time_delta" + }, + { + "dashboard_label": "b", + "description": "bit", + "from_primary": "x * time_delta", + "label": "b", + "name": "bit", + "to_primary": "x / time_delta" + } + ] +} diff --git a/collections/pm.measurementunits/milliAmpere.json b/collections/pm.measurementunits/milliAmpere.json new file mode 100644 index 0000000000000000000000000000000000000000..695ff3543588a6c83ea2b0e7a759f2863fe5654e --- /dev/null +++ b/collections/pm.measurementunits/milliAmpere.json @@ -0,0 +1,20 @@ +{ + "name": "milliAmpere", + "$collection": "pm.measurementunits", + "uuid": "a18c82bf-9338-4fe5-93fa-91be9c2a62c0", + "description": "Electric current measurement", + "label": "mA", + "dashboard_label": "mamp", + "dashboard_sr_color": 16777215, + "scale_type": "d", + "alt_units": [ + { + "dashboard_label": "amp", + "description": "Electric current measurement", + "from_primary": "x * 1000", + "label": "A", + "name": "Ampere", + "to_primary": "x / 1000" + } + ] +} diff --git a/collections/pm.metrictypes/CPU/Load/1min.json b/collections/pm.metrictypes/CPU/Load/1min.json index 6fc69d84ecfe9141db7497d5bfff22f16682eb68..72718928859a86d7522a3bb9e9c49f5ffc5abb32 100644 --- a/collections/pm.metrictypes/CPU/Load/1min.json +++ b/collections/pm.metrictypes/CPU/Load/1min.json @@ -6,5 +6,6 @@ "field_name": "load_1min", "field_type": "UInt8", "description": null, - "measure": "%" + "measure": "%", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/CPU/Load/5min.json b/collections/pm.metrictypes/CPU/Load/5min.json index daa0057b9f83d42b717e15e90f3c62a50ffe4d07..b7ed021fd0371bd35af7a2eb834e9e04bf1115b5 100644 --- a/collections/pm.metrictypes/CPU/Load/5min.json +++ b/collections/pm.metrictypes/CPU/Load/5min.json @@ -6,5 +6,6 @@ "field_name": "load_5min", "field_type": "UInt8", "description": null, - "measure": "%" + "measure": "%", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/CPU/Usage.json b/collections/pm.metrictypes/CPU/Usage.json index c8fcbf9ab2b94ab2661a0bf093462bdf47f4a962..27aaeae8594cc066c817a5eab0e7dcbe11bd2ce3 100644 --- a/collections/pm.metrictypes/CPU/Usage.json +++ b/collections/pm.metrictypes/CPU/Usage.json @@ -6,5 +6,6 @@ "field_name": "usage", "field_type": "UInt8", "description": "CPU Usage in percents", - "measure": "%" + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/CPU/Usage/5sec.json b/collections/pm.metrictypes/CPU/Usage/5sec.json index 19348340b79cdc11e175219fdc25cb32f9d00a59..3242253e00dda84a32042e51a8f24c60fa566b40 100644 --- a/collections/pm.metrictypes/CPU/Usage/5sec.json +++ b/collections/pm.metrictypes/CPU/Usage/5sec.json @@ -6,5 +6,6 @@ "field_name": "load_5s", "field_type": "UInt8", "description": "CPU Usage in percents", - "measure": "%" + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/Disk/Usage.json b/collections/pm.metrictypes/Disk/Usage.json index ec191b7f7facf12ab68d60033f726e49ec93319d..8af4167aceacf5fc30d28e610b4c53a6bbf9bf42 100644 --- a/collections/pm.metrictypes/Disk/Usage.json +++ b/collections/pm.metrictypes/Disk/Usage.json @@ -6,5 +6,6 @@ "field_name": "disk_usage_b", "field_type": "UInt64", "description": "Disk Usage byte", - "measure": "bytes" + "measure": "bytes", + "units__name": "Bytes" } diff --git a/collections/pm.metrictypes/Disk/Usage_Percent.json b/collections/pm.metrictypes/Disk/Usage_Percent.json index 4a9390a8860bc0d596209a03f145a8d69b1d7ae6..c3ed489af93f5c81f5323fc74abeca78700cacb1 100644 --- a/collections/pm.metrictypes/Disk/Usage_Percent.json +++ b/collections/pm.metrictypes/Disk/Usage_Percent.json @@ -6,5 +6,6 @@ "field_name": "disk_usage_p", "field_type": "UInt8", "description": "Disk Usage %", - "measure": "%" + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/Environment/Battery/Capacity/Level.json b/collections/pm.metrictypes/Environment/Battery/Capacity/Level.json index 93e76e66c7b5f554a38f16d88f9c6b9b81e63fd1..faedb19d1e50778c7f84455469f5a0049b39463e 100644 --- a/collections/pm.metrictypes/Environment/Battery/Capacity/Level.json +++ b/collections/pm.metrictypes/Environment/Battery/Capacity/Level.json @@ -6,5 +6,6 @@ "field_name": "battery_capacity_level", "field_type": "UInt8", "description": "Metric Battery Level (%)", - "measure": "%" + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/Environment/Current.json b/collections/pm.metrictypes/Environment/Current.json index 958235155d58b9057a980fb07251f78ca1dc34a4..c7d6f2ad21ee6bc4f567da2054884b56a4b96e03 100644 --- a/collections/pm.metrictypes/Environment/Current.json +++ b/collections/pm.metrictypes/Environment/Current.json @@ -6,5 +6,6 @@ "field_name": "elec_current", "field_type": "Float32", "description": "The metric for the Electric Сurrent", - "measure": "mA" + "measure": "mA", + "units__name": "milliAmpere" } diff --git a/collections/pm.metrictypes/Environment/EnergyConsumption.json b/collections/pm.metrictypes/Environment/EnergyConsumption.json index 960b214e4a628c1223eedd0dad0b9ed0082ceae0..9858ebc6debe31c83413deaedd0f9a2b4a56cd6c 100644 --- a/collections/pm.metrictypes/Environment/EnergyConsumption.json +++ b/collections/pm.metrictypes/Environment/EnergyConsumption.json @@ -6,5 +6,6 @@ "field_name": "energy_consumption", "field_type": "Float32", "description": "The metric for the Energy consumption (kWh)", - "measure": "kWh" + "measure": "kWh", + "units__name": "Kilowatt-hour" } diff --git a/collections/pm.metrictypes/Environment/Power.json b/collections/pm.metrictypes/Environment/Power.json index f34306f963aa5ea3ca4e6b6a302089a6556057e7..e6b4959de5ee71b010207d0d6c46098cc8b291d7 100644 --- a/collections/pm.metrictypes/Environment/Power.json +++ b/collections/pm.metrictypes/Environment/Power.json @@ -6,5 +6,6 @@ "field_name": "power_consume", "field_type": "UInt16", "description": "Metric for device Consume Power (W)", - "measure": "W" + "measure": "W", + "units__name": "Watt" } diff --git a/collections/pm.metrictypes/Environment/Power/Input/Status.json b/collections/pm.metrictypes/Environment/Power/Input/Status.json index baf4b6d521f90a0fcff032e8e99278b0b279572b..74f564b4fc3d7603ddfd5e7c71d2b4c72a80b7f6 100644 --- a/collections/pm.metrictypes/Environment/Power/Input/Status.json +++ b/collections/pm.metrictypes/Environment/Power/Input/Status.json @@ -6,5 +6,6 @@ "field_name": "power_input_status", "field_type": "Int8", "description": "Power input status", - "measure": " " + "measure": "", + "units__name": "StatusEnum" } diff --git a/collections/pm.metrictypes/Environment/Pulse.json b/collections/pm.metrictypes/Environment/Pulse.json index c53935dc2f93be2f999b7dd770eb81202d040751..382b8e7e57fc4bd3b8f9cbae16c8846af6c1b341 100644 --- a/collections/pm.metrictypes/Environment/Pulse.json +++ b/collections/pm.metrictypes/Environment/Pulse.json @@ -6,5 +6,6 @@ "field_name": "pulse", "field_type": "UInt32", "description": "Metric for pulse output. The number of impulses since switching on.", - "measure": " " + "measure": "", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Environment/Status.json b/collections/pm.metrictypes/Environment/Status.json index 41116d72a2d29e30d529d0e0e160a3e6a13222be..1363a4a8e388cce4741595b845d227b0fb9b3246 100644 --- a/collections/pm.metrictypes/Environment/Status.json +++ b/collections/pm.metrictypes/Environment/Status.json @@ -6,5 +6,6 @@ "field_name": "sensor_status", "field_type": "Int8", "description": "Metric for displaying the status of sensors", - "measure": " " + "measure": "", + "units__name": "StatusEnum" } diff --git a/collections/pm.metrictypes/Environment/Temperature.json b/collections/pm.metrictypes/Environment/Temperature.json index 0cb4811167e036d79c39bff4c284ee51f7acc86a..07a3628eddd72be5592c8fb7f3f2453a43e39c54 100644 --- a/collections/pm.metrictypes/Environment/Temperature.json +++ b/collections/pm.metrictypes/Environment/Temperature.json @@ -6,5 +6,6 @@ "field_name": "temperature", "field_type": "Int16", "description": "Temparature, in Celsium", - "measure": "C" + "measure": "C", + "units__name": "Celsius" } diff --git a/collections/pm.metrictypes/Environment/Voltage.json b/collections/pm.metrictypes/Environment/Voltage.json index af44ea8789bf1f1032d874090e9a26a5382fbf98..4e37cbe98d9307ceda84b0bb1f106761395eb952 100644 --- a/collections/pm.metrictypes/Environment/Voltage.json +++ b/collections/pm.metrictypes/Environment/Voltage.json @@ -6,5 +6,6 @@ "field_name": "voltage", "field_type": "Float32", "description": "The metric for the Voltage (V)", - "measure": "V" + "measure": "V", + "units__name": "Volt DC" } diff --git a/collections/pm.metrictypes/Interface/Broadcast/In.json b/collections/pm.metrictypes/Interface/Broadcast/In.json index 8a9f97e240167e0327f20304013ed942a7e56e40..19912723b9f913dee92f0ca7919482c18f74a50b 100644 --- a/collections/pm.metrictypes/Interface/Broadcast/In.json +++ b/collections/pm.metrictypes/Interface/Broadcast/In.json @@ -6,5 +6,6 @@ "field_name": "broadcast_in", "field_type": "UInt64", "description": "Broadcast packets on input interface", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Broadcast/Out.json b/collections/pm.metrictypes/Interface/Broadcast/Out.json index 4a692d8829c3806477330ba2114e93b0eb47cfd4..d556eb5722675e6f9d8afbbb5e05c0319c5003a8 100644 --- a/collections/pm.metrictypes/Interface/Broadcast/Out.json +++ b/collections/pm.metrictypes/Interface/Broadcast/Out.json @@ -6,5 +6,6 @@ "field_name": "broadcast_out", "field_type": "UInt64", "description": "Broadcast packets on output interface", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/CBQOS/Drops/In_Delta.json b/collections/pm.metrictypes/Interface/CBQOS/Drops/In_Delta.json index f70ccfa804454b1d229d78fec425201c5fc7950d..1e1b29316555b671c01929fa8453d694a49b40a7 100644 --- a/collections/pm.metrictypes/Interface/CBQOS/Drops/In_Delta.json +++ b/collections/pm.metrictypes/Interface/CBQOS/Drops/In_Delta.json @@ -6,5 +6,6 @@ "field_name": "cbqos_drops_in_delta", "field_type": "UInt64", "description": "Drops packet on input class-map (delta)", - "measure": "packets" + "measure": "packets", + "units__name": "Packets" } diff --git a/collections/pm.metrictypes/Interface/CBQOS/Drops/Out_Delta.json b/collections/pm.metrictypes/Interface/CBQOS/Drops/Out_Delta.json index d4783419ea39c8ad7090d8abbd4535f0df428145..0edd4b58c9b375f0dfa62d4c2b1fa36020bc0ba7 100644 --- a/collections/pm.metrictypes/Interface/CBQOS/Drops/Out_Delta.json +++ b/collections/pm.metrictypes/Interface/CBQOS/Drops/Out_Delta.json @@ -6,5 +6,6 @@ "field_name": "cbqos_drops_out_delta", "field_type": "UInt64", "description": "Drops packet on output class-map (delta)", - "measure": "packets" + "measure": "packets", + "units__name": "Packets" } diff --git a/collections/pm.metrictypes/Interface/CBQOS/Octets/In_Delta.json b/collections/pm.metrictypes/Interface/CBQOS/Octets/In_Delta.json index 845a740910cd911696b8f81c661894782f2dd577..bfa08afb8d50bd2dc83a594e9b46834f2c6cc16c 100644 --- a/collections/pm.metrictypes/Interface/CBQOS/Octets/In_Delta.json +++ b/collections/pm.metrictypes/Interface/CBQOS/Octets/In_Delta.json @@ -6,5 +6,6 @@ "field_name": "cbqos_octets_in_delta", "field_type": "UInt64", "description": "The total number of received octets passed by the interface class-map.", - "measure": "bytes" + "measure": "bytes", + "units__name": "Bytes" } diff --git a/collections/pm.metrictypes/Interface/CBQOS/Octets/Out_Delta.json b/collections/pm.metrictypes/Interface/CBQOS/Octets/Out_Delta.json index 8f1a7f136ad519a20454abd0b3d0582bcdcb26f1..e2dfc5570abedec7dd16e1e9ecb9004dcff606c1 100644 --- a/collections/pm.metrictypes/Interface/CBQOS/Octets/Out_Delta.json +++ b/collections/pm.metrictypes/Interface/CBQOS/Octets/Out_Delta.json @@ -6,5 +6,6 @@ "field_name": "cbqos_octets_out_delta", "field_type": "UInt64", "description": "The total number of sending octets passed by the interface class-map.", - "measure": "bytes" + "measure": "bytes", + "units__name": "Bytes" } diff --git a/collections/pm.metrictypes/Interface/CBQOS/Packets/In_Delta.json b/collections/pm.metrictypes/Interface/CBQOS/Packets/In_Delta.json index b11b738fdd56b98b222e7ad08c32e30a6e55e331..b7478feb7868d9a45a652527748ffe2c9be9dfaa 100644 --- a/collections/pm.metrictypes/Interface/CBQOS/Packets/In_Delta.json +++ b/collections/pm.metrictypes/Interface/CBQOS/Packets/In_Delta.json @@ -6,5 +6,6 @@ "field_name": "cbqos_packets_in_delta", "field_type": "UInt64", "description": "The total number of received packets passed by the interface class-map.", - "measure": "bytes" + "measure": "bytes", + "units__name": "Packets" } diff --git a/collections/pm.metrictypes/Interface/CBQOS/Packets/Out_Delta.json b/collections/pm.metrictypes/Interface/CBQOS/Packets/Out_Delta.json index 94c881fea7e42af9baca22e03e71b443c89bd622..d8a2e792ad466685279c8e8e4a1d1c87bb75957a 100644 --- a/collections/pm.metrictypes/Interface/CBQOS/Packets/Out_Delta.json +++ b/collections/pm.metrictypes/Interface/CBQOS/Packets/Out_Delta.json @@ -6,5 +6,6 @@ "field_name": "cbqos_packets_out_delta", "field_type": "UInt64", "description": "The total number of sending packets passed by the interface class-map.", - "measure": "bytes" + "measure": "bytes", + "units__name": "Packets" } diff --git a/collections/pm.metrictypes/Interface/DOM/BiasCurrent.json b/collections/pm.metrictypes/Interface/DOM/BiasCurrent.json index 1873e669d999db305c8a0ea6759012b271a39219..6f86eebf98bd2f845beb32b7f01b1e7d703e22d7 100644 --- a/collections/pm.metrictypes/Interface/DOM/BiasCurrent.json +++ b/collections/pm.metrictypes/Interface/DOM/BiasCurrent.json @@ -6,5 +6,6 @@ "field_name": "current_ma", "field_type": "Int16", "description": "Laser bias current", - "measure": "mA" + "measure": "mA", + "units__name": "milliAmpere" } diff --git a/collections/pm.metrictypes/Interface/DOM/RxPower.json b/collections/pm.metrictypes/Interface/DOM/RxPower.json index 63692fec09db3d2ff2aa4a1de5add5299b6b90d3..0108522ebdb7428292c10aedb078cb01e0925d25 100644 --- a/collections/pm.metrictypes/Interface/DOM/RxPower.json +++ b/collections/pm.metrictypes/Interface/DOM/RxPower.json @@ -6,5 +6,6 @@ "field_name": "optical_rx_dbm", "field_type": "Int16", "description": "Signal Receive Power on transmitter", - "measure": "dBm" + "measure": "dBm", + "units__name": "Decibel-mw" } diff --git a/collections/pm.metrictypes/Interface/DOM/Temperature.json b/collections/pm.metrictypes/Interface/DOM/Temperature.json index 50c8e7359eeb993d1694e4d7dc252b20c00d830f..c6e1570f6feaee288da3f94675b1b59783a2b62d 100644 --- a/collections/pm.metrictypes/Interface/DOM/Temperature.json +++ b/collections/pm.metrictypes/Interface/DOM/Temperature.json @@ -6,5 +6,6 @@ "field_name": "temp_c", "field_type": "Int16", "description": "Temparature, in Celsius", - "measure": "C" + "measure": "C", + "units__name": "Celsius" } diff --git a/collections/pm.metrictypes/Interface/DOM/TxPower.json b/collections/pm.metrictypes/Interface/DOM/TxPower.json index 47de26056a2228fb5eea7b5f4c20c3faf4a658f6..ccccde7d8e756b60ac326ec674ceef3c017a377f 100644 --- a/collections/pm.metrictypes/Interface/DOM/TxPower.json +++ b/collections/pm.metrictypes/Interface/DOM/TxPower.json @@ -6,5 +6,6 @@ "field_name": "optical_tx_dbm", "field_type": "Int16", "description": "Signal Transmit Power on transmitter", - "measure": "dBm" + "measure": "dBm", + "units__name": "Decibel-mw" } diff --git a/collections/pm.metrictypes/Interface/DOM/Voltage.json b/collections/pm.metrictypes/Interface/DOM/Voltage.json index 020a79fbed3df5710ba9f5d15e677640b9fdad85..2940cf79734b1e7847b893072de06b5a9d11ab50 100644 --- a/collections/pm.metrictypes/Interface/DOM/Voltage.json +++ b/collections/pm.metrictypes/Interface/DOM/Voltage.json @@ -6,5 +6,6 @@ "field_name": "voltage_v", "field_type": "Int16", "description": "Transceiver supply voltage", - "measure": "V" + "measure": "V", + "units__name": "Volt DC" } diff --git a/collections/pm.metrictypes/Interface/Discards/In.json b/collections/pm.metrictypes/Interface/Discards/In.json index 75f04fa8d1651790741f379726e142670b443755..93275ce589551ef8fb67dc2b74da990463623084 100644 --- a/collections/pm.metrictypes/Interface/Discards/In.json +++ b/collections/pm.metrictypes/Interface/Discards/In.json @@ -6,5 +6,6 @@ "field_name": "discards_in", "field_type": "UInt32", "description": "Discard packet on input interface", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Discards/Out.json b/collections/pm.metrictypes/Interface/Discards/Out.json index 7eeab671350a06582a64c4576a669d8d974a745c..c41575d4cec775f91f5adb36aeec506d1c5e2bef 100644 --- a/collections/pm.metrictypes/Interface/Discards/Out.json +++ b/collections/pm.metrictypes/Interface/Discards/Out.json @@ -6,5 +6,6 @@ "field_name": "discards_out", "field_type": "UInt32", "description": "Discard packet on output interface", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Errors/CRC.json b/collections/pm.metrictypes/Interface/Errors/CRC.json index 638ae864c3908f4168c693629ec95a7866596497..8862f1983bfa9c6c0f0f6105e997a847f46a41e0 100644 --- a/collections/pm.metrictypes/Interface/Errors/CRC.json +++ b/collections/pm.metrictypes/Interface/Errors/CRC.json @@ -6,5 +6,6 @@ "field_name": "errors_crc_in", "field_type": "UInt32", "description": "Errors when recieved packets which have CRC checking errors ", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Errors/Frame.json b/collections/pm.metrictypes/Interface/Errors/Frame.json index 023c5a67fcb473a3c8c15a30a2002d0c05777585..3143d495624afcdb27c846198bccd1274a648dd5 100644 --- a/collections/pm.metrictypes/Interface/Errors/Frame.json +++ b/collections/pm.metrictypes/Interface/Errors/Frame.json @@ -6,5 +6,6 @@ "field_name": "errors_frame_in", "field_type": "UInt32", "description": "Errors when received frames whose actual length differs with 802.3 ", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Errors/In.json b/collections/pm.metrictypes/Interface/Errors/In.json index ba1d78d0e47af082149a79a684bf959f3368f94d..2b0cf8952ab6c6a80aaced7152ed89e3fd9bddbc 100644 --- a/collections/pm.metrictypes/Interface/Errors/In.json +++ b/collections/pm.metrictypes/Interface/Errors/In.json @@ -6,5 +6,6 @@ "field_name": "errors_in", "field_type": "UInt32", "description": "Errors when receive packet", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Errors/In_Delta.json b/collections/pm.metrictypes/Interface/Errors/In_Delta.json index 52c6b3603e8437f6aaaa4302b60c3173f03b8b84..9c8951eebdb7a98a03bbbe946c02e3f4d12552ac 100644 --- a/collections/pm.metrictypes/Interface/Errors/In_Delta.json +++ b/collections/pm.metrictypes/Interface/Errors/In_Delta.json @@ -6,5 +6,6 @@ "field_name": "errors_in_delta", "field_type": "UInt32", "description": "Errors when receive packet (delta)", - "measure": "packets" + "measure": "packets", + "units__name": "Packets" } diff --git a/collections/pm.metrictypes/Interface/Errors/Out.json b/collections/pm.metrictypes/Interface/Errors/Out.json index c18fe090feaa2b854fdc571b717a1aa460edfb40..b71d5b82cd4429b7589c069e01426b7cffedfa9d 100644 --- a/collections/pm.metrictypes/Interface/Errors/Out.json +++ b/collections/pm.metrictypes/Interface/Errors/Out.json @@ -6,5 +6,6 @@ "field_name": "errors_out", "field_type": "UInt32", "description": "Errors when transmit packet", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Errors/Out_Delta.json b/collections/pm.metrictypes/Interface/Errors/Out_Delta.json index 59b9b2de1dc926110a3f69e38c271e81225aaf99..ac4496900fc66c7eaf4cc8d01213fbe5f3244d1e 100644 --- a/collections/pm.metrictypes/Interface/Errors/Out_Delta.json +++ b/collections/pm.metrictypes/Interface/Errors/Out_Delta.json @@ -6,5 +6,6 @@ "field_name": "errors_out_delta", "field_type": "UInt32", "description": "Errors when transmit packet (delta)", - "measure": "packets" + "measure": "packets", + "units__name": "Packets" } diff --git a/collections/pm.metrictypes/Interface/Load/In.json b/collections/pm.metrictypes/Interface/Load/In.json index 26569910bd798b31ea0b2ccdc8cf9e23143114fb..0958bb7678c237ad79836d1c42d279cad692882f 100644 --- a/collections/pm.metrictypes/Interface/Load/In.json +++ b/collections/pm.metrictypes/Interface/Load/In.json @@ -6,5 +6,6 @@ "field_name": "load_in", "field_type": "UInt64", "description": "Interface input throughput", - "measure": "bit/s" + "measure": "bit/s", + "units__name": "Bit/s" } diff --git a/collections/pm.metrictypes/Interface/Load/Out.json b/collections/pm.metrictypes/Interface/Load/Out.json index d18fe577493c639ef84615923bca4caf677bcce9..fe31bcc3a78edb452a3a610f5334f3526a8157fc 100644 --- a/collections/pm.metrictypes/Interface/Load/Out.json +++ b/collections/pm.metrictypes/Interface/Load/Out.json @@ -6,5 +6,6 @@ "field_name": "load_out", "field_type": "UInt64", "description": "Interface output throughput", - "measure": "bit/s" + "measure": "bit/s", + "units__name": "Bit/s" } diff --git a/collections/pm.metrictypes/Interface/Multicast/In.json b/collections/pm.metrictypes/Interface/Multicast/In.json index 8e00690e4ac18b36dd7540a01b9e802b4ab90686..789fad9c61e69760336f3317a477f6958e7dc874 100644 --- a/collections/pm.metrictypes/Interface/Multicast/In.json +++ b/collections/pm.metrictypes/Interface/Multicast/In.json @@ -6,5 +6,6 @@ "field_name": "multicast_in", "field_type": "UInt64", "description": "Multicast packets on input interface", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Multicast/Out.json b/collections/pm.metrictypes/Interface/Multicast/Out.json index 8dd9712b5cbb9d0cfdb2211dbf1897fdcd744e31..90a678c8a0f45ead47a1c0eb1b3d2769ddf94fc6 100644 --- a/collections/pm.metrictypes/Interface/Multicast/Out.json +++ b/collections/pm.metrictypes/Interface/Multicast/Out.json @@ -6,5 +6,6 @@ "field_name": "multicast_out", "field_type": "UInt64", "description": "Multicast packets on output interface", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Octets/In.json b/collections/pm.metrictypes/Interface/Octets/In.json index 68ca543b3dbc9a01f71ba4aafd53dbec8c5e5ba9..a4b621b1e11054750488ff7754539229661c98a3 100644 --- a/collections/pm.metrictypes/Interface/Octets/In.json +++ b/collections/pm.metrictypes/Interface/Octets/In.json @@ -6,5 +6,6 @@ "field_name": "octets_in", "field_type": "UInt64", "description": "The total number of octets received on the interface, including framing characters. ", - "measure": "bytes" + "measure": "bytes", + "units__name": "Bytes" } diff --git a/collections/pm.metrictypes/Interface/Octets/Out.json b/collections/pm.metrictypes/Interface/Octets/Out.json index 63c8c0654717ad14fbffd65fe41790efc05b7894..71d5c2c7ac26a590e46e3886002c2ec6a404979c 100644 --- a/collections/pm.metrictypes/Interface/Octets/Out.json +++ b/collections/pm.metrictypes/Interface/Octets/Out.json @@ -6,5 +6,6 @@ "field_name": "octets_out", "field_type": "UInt64", "description": "The total number of octets transmitted out of the interface, including framing characters.", - "measure": "bytes" + "measure": "bytes", + "units__name": "Bytes" } diff --git a/collections/pm.metrictypes/Interface/Packets/In.json b/collections/pm.metrictypes/Interface/Packets/In.json index 37fdb37db5112ff8a0411eb4dfd8305eb7cd1ac1..beae71449679a7e62c1ca9ed766b661a1a7bedfa 100644 --- a/collections/pm.metrictypes/Interface/Packets/In.json +++ b/collections/pm.metrictypes/Interface/Packets/In.json @@ -6,5 +6,6 @@ "field_name": "packets_in", "field_type": "UInt64", "description": "Packets on input interface", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/Packets/Out.json b/collections/pm.metrictypes/Interface/Packets/Out.json index 5192f8a1492287cd0efdcb67607aa989d17900d8..27483e76b43fe7c5acfe948500442c64f316baa0 100644 --- a/collections/pm.metrictypes/Interface/Packets/Out.json +++ b/collections/pm.metrictypes/Interface/Packets/Out.json @@ -6,5 +6,6 @@ "field_name": "packets_out", "field_type": "UInt64", "description": "Packets on output interface", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/QOS/Discards/ In_Delta.json b/collections/pm.metrictypes/Interface/QOS/Discards/ In_Delta.json index 6ee51210384772dba07e6b601398231bf01c7866..1af535cbf1650151ff5d571df20552a997593061 100644 --- a/collections/pm.metrictypes/Interface/QOS/Discards/ In_Delta.json +++ b/collections/pm.metrictypes/Interface/QOS/Discards/ In_Delta.json @@ -6,5 +6,6 @@ "field_name": "qos_discards_in_delta", "field_type": "UInt64", "description": "Discards packet on input queue (delta)", - "measure": "packets" + "measure": "packets", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Interface/QOS/Discards/ Out_Delta.json b/collections/pm.metrictypes/Interface/QOS/Discards/ Out_Delta.json index d4f5379fe759a0191646f8378035242052690ece..7a85d4721ba0d3adaf53202ba5115aba6436ab58 100644 --- a/collections/pm.metrictypes/Interface/QOS/Discards/ Out_Delta.json +++ b/collections/pm.metrictypes/Interface/QOS/Discards/ Out_Delta.json @@ -6,5 +6,6 @@ "field_name": "qos_discards_out_delta", "field_type": "UInt64", "description": "Discards packet on output queue (delta)", - "measure": "packets" + "measure": "packets", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Interface/QOS/Octets/In.json b/collections/pm.metrictypes/Interface/QOS/Octets/In.json index 53708732c4306bef5e5c91650bbf3ef9ffa9885a..b48d291d9548dfdf8ad40027a797f6f6147a5425 100644 --- a/collections/pm.metrictypes/Interface/QOS/Octets/In.json +++ b/collections/pm.metrictypes/Interface/QOS/Octets/In.json @@ -6,5 +6,6 @@ "field_name": "qos_octets_in", "field_type": "UInt64", "description": "The total number of received octets passed by the interface queue.", - "measure": "bytes" + "measure": "bytes", + "units__name": "Bytes" } diff --git a/collections/pm.metrictypes/Interface/QOS/Octets/Out.json b/collections/pm.metrictypes/Interface/QOS/Octets/Out.json index d08558eece1957c38251cd432733fd5d681cc83f..af4459e30e9a0e08369444f4bb6bf38bd4b75cab 100644 --- a/collections/pm.metrictypes/Interface/QOS/Octets/Out.json +++ b/collections/pm.metrictypes/Interface/QOS/Octets/Out.json @@ -6,5 +6,6 @@ "field_name": "qos_octets_out", "field_type": "UInt64", "description": "The total number of transmitted out octets passed by the interface queue.", - "measure": "bytes" + "measure": "bytes", + "units__name": "Bytes" } diff --git a/collections/pm.metrictypes/Interface/QOS/Packets/In.json b/collections/pm.metrictypes/Interface/QOS/Packets/In.json index 88d259d5bf7152746ea736c978324c0daaadaf7d..fc90f5f5c34df7ea14d92cf7152e45b2e856fbeb 100644 --- a/collections/pm.metrictypes/Interface/QOS/Packets/In.json +++ b/collections/pm.metrictypes/Interface/QOS/Packets/In.json @@ -6,5 +6,6 @@ "field_name": "qos_packets_in", "field_type": "UInt64", "description": "Packets on input interface queue", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/QOS/Packets/Out.json b/collections/pm.metrictypes/Interface/QOS/Packets/Out.json index 1cc39ec0ef029212a25d7b334b8e2d032e0778df..2cda8461ac68897bf4746f00909edfc63fdb634d 100644 --- a/collections/pm.metrictypes/Interface/QOS/Packets/Out.json +++ b/collections/pm.metrictypes/Interface/QOS/Packets/Out.json @@ -6,5 +6,6 @@ "field_name": "qos_packets_out", "field_type": "UInt64", "description": "Packets on output interface queue", - "measure": "packet/s" + "measure": "packet/s", + "units__name": "Packets/s" } diff --git a/collections/pm.metrictypes/Interface/RF/TxPower.json b/collections/pm.metrictypes/Interface/RF/TxPower.json index bbb8cf95a8dfb2364b4a0c0a097cf73cdcb54f53..f69ef192255b8b647d042651c6326909b4ae55dd 100644 --- a/collections/pm.metrictypes/Interface/RF/TxPower.json +++ b/collections/pm.metrictypes/Interface/RF/TxPower.json @@ -6,5 +6,6 @@ "field_name": "rf_tx_dbm", "field_type": "Float32", "description": "RF Tx power", - "measure": "dBuV" + "measure": "dBuV", + "units__name": "Decibel-uv" } diff --git a/collections/pm.metrictypes/Interface/Speed.json b/collections/pm.metrictypes/Interface/Speed.json index a4959387a678c2f0b7d137db0ef9caad877ddece..79ffa036620cc50523a1432781799cd2763a929a 100644 --- a/collections/pm.metrictypes/Interface/Speed.json +++ b/collections/pm.metrictypes/Interface/Speed.json @@ -6,5 +6,6 @@ "field_name": "speed", "field_type": "UInt64", "description": "Interface speed", - "measure": "bit/s" + "measure": "bit/s", + "units__name": "Bit/s" } diff --git a/collections/pm.metrictypes/Interface/Status/Admin.json b/collections/pm.metrictypes/Interface/Status/Admin.json index f851fcf68c27afa29d7584cd78aafc878642117c..9843ffa4264c09d217a931c27206dcdd9d5db6d1 100644 --- a/collections/pm.metrictypes/Interface/Status/Admin.json +++ b/collections/pm.metrictypes/Interface/Status/Admin.json @@ -5,6 +5,7 @@ "scope__name": "Interface", "field_name": "status_admin", "field_type": "UInt8", - "description": "Interface admin status", - "measure": "" + "description": "Interface admin state", + "measure": " ", + "units__name": "InterfaceOperState" } diff --git a/collections/pm.metrictypes/Interface/Status/Duplex.json b/collections/pm.metrictypes/Interface/Status/Duplex.json index 26e779f2089a68d8d336d3d3dc7c26a9666fb07a..3b20f0c464498a1763ecb8a74f36d62dfbd9da9e 100644 --- a/collections/pm.metrictypes/Interface/Status/Duplex.json +++ b/collections/pm.metrictypes/Interface/Status/Duplex.json @@ -6,5 +6,6 @@ "field_name": "status_duplex", "field_type": "UInt8", "description": "Interface duplex status (1 - unknown, 2 - half, 3 - full)", - "measure": " " + "measure": "", + "units__name": "DuplexStatus" } diff --git a/collections/pm.metrictypes/Interface/Status/Oper.json b/collections/pm.metrictypes/Interface/Status/Oper.json index 8d60c8b11239b6a35d276205a5e9548fc16b0415..42479ed9444c4ad39509c5f2a868a196a3ddec76 100644 --- a/collections/pm.metrictypes/Interface/Status/Oper.json +++ b/collections/pm.metrictypes/Interface/Status/Oper.json @@ -6,5 +6,6 @@ "field_name": "status_oper", "field_type": "UInt8", "description": "Interface admin status", - "measure": "" + "measure": " ", + "units__name": "InterfaceOperState" } diff --git a/collections/pm.metrictypes/Interface/lastchange.json b/collections/pm.metrictypes/Interface/lastchange.json index 57bb293e97a89af647f394151918fa1603150937..e0e451fe7baa291cd62d8a058b390be502f98e47 100644 --- a/collections/pm.metrictypes/Interface/lastchange.json +++ b/collections/pm.metrictypes/Interface/lastchange.json @@ -1,10 +1,11 @@ { - "name": "Interface | Last Сhange", + "name": "Interface | Last Change", "$collection": "pm.metrictypes", "uuid": "b345c39b-c77a-4e86-89de-746932307e8c", "scope__name": "Interface", "field_name": "lastchange", "field_type": "Int16", "description": "Last change interface day(s)", - "measure": "day(s)" -} \ No newline at end of file + "measure": "day(s)", + "units__name": "Units" +} diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Attenuation_downstream.json b/collections/pm.metrictypes/Interface/xDSL/Line/Attenuation_downstream.json index f97ca75642bf67809dc02353fd8e5398350f89ea..66fb60170f1a0d98108101141fa7d5bb6934a6eb 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Attenuation_downstream.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Attenuation_downstream.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_attenuation_down", "field_type": "UInt16", "description": "Measured difference in the the total power transmitted by this ATU and total power received by the peer ATU.", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Attenuation_upstream.json b/collections/pm.metrictypes/Interface/xDSL/Line/Attenuation_upstream.json index ec68f4c071905fba84dbac6262c19845c059d51b..ec210f0d2d8c0894ce26aa5be2b17d3947d1824d 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Attenuation_upstream.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Attenuation_upstream.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_attenuation_up", "field_type": "UInt16", "description": "Measured difference in the total power transmitted by the peer ATU and the total power received by this ATU.", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/ES_Delta.json b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/ES_Delta.json index 4ddf5ac3fc7129ac0b61b8a3c2923bc99dfac888..ebced4406201a273a9289c0c4341f43ebe0d2fd5 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/ES_Delta.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/ES_Delta.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_errors_es_delta", "field_type": "UInt32", "description": "Count of the number of Errored Seconds since agent reset. The errored second parameter is a count of one-second intervals containing one or more crc anomalies, or one or more los or sef defects.", - "measure": "count" + "measure": "count", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOF_Delta.json b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOF_Delta.json index 47da75a82e0d98f898bb466c6165f86bc1c5cb38..976a193879341566f90b0f1b72cb34ac883f56af 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOF_Delta.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOF_Delta.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_errors_lof_delta", "field_type": "UInt32", "description": "Count of the number of Loss of Framing failures since agent reset.", - "measure": "count" + "measure": "count", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOLS_Delta.json b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOLS_Delta.json index cc8c67980d3e1928f445dc1efef06986a727c4e9..5e5ae67251c9f5d20239779abb570ffbf13e0c4c 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOLS_Delta.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOLS_Delta.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_errors_lols_delta", "field_type": "UInt32", "description": "Count of the number of Loss of Link failures since agent reset.", - "measure": "count" + "measure": "count", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOSS_Delta.json b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOSS_Delta.json index 417de7169ba7ee2bd89ec9f12e08341fe17f6054..6448ed8f782c2eadf83afb5346872d80bda42fc2 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOSS_Delta.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LOSS_Delta.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_errors_loss_delta", "field_type": "UInt32", "description": "Count of the number of Loss of Signal failures since agent reset.", - "measure": "count" + "measure": "count", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LPRS_Delta.json b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LPRS_Delta.json index 9318cced826375fcb577f2f314e523b851321e51..e58eb1c21a2a5905c1c966c5d1e8c2d067724247 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LPRS_Delta.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/LPRS_Delta.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_errors_lprs_delta", "field_type": "UInt32", "description": "Count of the number of Loss of Power failures since agent reset.", - "measure": "count" + "measure": "count", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/Retrain_Delta.json b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/Retrain_Delta.json index 7eb9ced898b762fc7c2d0918de225978cab4d3d2..3516be3c9893db590704f55f1e42f93aa7726be0 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/Retrain_Delta.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/Retrain_Delta.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_errors_retrain_delta", "field_type": "UInt32", "description": "Refer to changing the line parameters (retrain) to adapt to the change of transmission line characteristics.", - "measure": "count" + "measure": "count", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/SES_Errors.json b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/SES_Errors.json index f4cee03a774f3625a2317a8febfb87af931f6246..24603753fcb3ec21260c081a51b9361f72cad3cc 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/SES_Errors.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/SES_Errors.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_errors_ses_delta", "field_type": "UInt32", "description": "Count of seconds during this interval where there was:\nATU-C:(CRC-8 summed over all bearer channels) >=18 OR\nLOS >=1 OR SEF >=1 OR LPR >=1\nATU-R:(FEBE summed over all bearer channels) >=18 OR\nLOS-FE >=1 OR RDI >=1 OR LPR-FE >=1 .\nThis parameter is inhibited during UAS.", - "measure": "count" + "measure": "count", + "units__name": "Second" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/UAS_Delta.json b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/UAS_Delta.json index fc55bc2c31b20135333d162465921248504162ad..38d056408bf7821c8551452050aff8c84e9215ca 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Errors/UAS_Delta.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Errors/UAS_Delta.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_errors_uas_delta", "field_type": "UInt32", "description": "The UAS counts the seconds when the port is not in the activating status. For the port which is being activated, ATUR-UAS increases. When the port is in activating and deactivating period, the statistics of unavailable seconds do not increase.", - "measure": "count" + "measure": "count", + "units__name": "Second" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Noise_margin_downstream.json b/collections/pm.metrictypes/Interface/xDSL/Line/Noise_margin_downstream.json index 736e194d157430e58e03f1da8f71613cd4507fda..44ae6752464aea6d5f08485221b835c910420437 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Noise_margin_downstream.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Noise_margin_downstream.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_noise_margin_down", "field_type": "Int16", "description": "Noise Margin as seen by this ATU with respect to its transmitted signal in tenth dB.", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/Noise_margin_upstream.json b/collections/pm.metrictypes/Interface/xDSL/Line/Noise_margin_upstream.json index c826d79baf0d2435028cb57a8d8a80a197d1aa73..03b2ca60e3a62a92baf211646c1ef6480f4b30a3 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/Noise_margin_upstream.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/Noise_margin_upstream.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_noise_margin_up", "field_type": "Int16", "description": "Noise Margin as seen by this ATU with respect to its received signal in tenth dB.", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/SNR_downstream.json b/collections/pm.metrictypes/Interface/xDSL/Line/SNR_downstream.json index 5554fd8e4d4d2d21fb3b4ed0c443e3c41a806361..adb5f29cc6c22ce8a05c0b288dea9509c0c9dd22 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/SNR_downstream.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/SNR_downstream.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_snr_down", "field_type": "UInt16", "description": "(Signal-to-noise ratio) Measured difference in level of a desired signal to the level of background noise.", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/SNR_upstream.json b/collections/pm.metrictypes/Interface/xDSL/Line/SNR_upstream.json index ac565e2209c0826b8dff1e08feb0f3c8fff4e7f5..98a0695b41d6d596acd405e8ec657a4d66076def 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/SNR_upstream.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/SNR_upstream.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_snr_up", "field_type": "UInt16", "description": "(Signal-to-noise ratio) Measured difference in level of a desired signal to the level of background noise.", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/TxPower_downstream.json b/collections/pm.metrictypes/Interface/xDSL/Line/TxPower_downstream.json index 759192f73b7e0532764a2344c9b39077a46fa7f6..3081e73eb0144e2f314eaf0677448e8b7dd91a79 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/TxPower_downstream.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/TxPower_downstream.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_txpower_down", "field_type": "UInt16", "description": "(≈ voltage) with which device sends its signal to the cable.", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Interface/xDSL/Line/TxPower_upstream.json b/collections/pm.metrictypes/Interface/xDSL/Line/TxPower_upstream.json index 3873976a8ec6a74ede918b7f5f16803f76ca906f..7059fd89c58062fc7a7267a5994c5d3a6aeb0313 100644 --- a/collections/pm.metrictypes/Interface/xDSL/Line/TxPower_upstream.json +++ b/collections/pm.metrictypes/Interface/xDSL/Line/TxPower_upstream.json @@ -6,5 +6,6 @@ "field_name": "xdsl_line_txpower_up", "field_type": "UInt16", "description": "(≈ voltage) with which device sends its signal to the cable.", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Memory/Heap.json b/collections/pm.metrictypes/Memory/Heap.json index 3e27e479ce7957ae94b61a5766d9e2effad40b73..418363810ea6245ed6495b7fe3986e79c9324d86 100644 --- a/collections/pm.metrictypes/Memory/Heap.json +++ b/collections/pm.metrictypes/Memory/Heap.json @@ -6,5 +6,6 @@ "field_name": "heap", "field_type": "UInt8", "description": "Memory Heap in percents", - "measure": "%" + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/Memory/Load/1min.json b/collections/pm.metrictypes/Memory/Load/1min.json index 45c94c9a511d44f5aec65603b7888e4660dfcb14..4bf3adec35077ba07122e3069cba6f9e5e922643 100644 --- a/collections/pm.metrictypes/Memory/Load/1min.json +++ b/collections/pm.metrictypes/Memory/Load/1min.json @@ -5,6 +5,7 @@ "scope__name": "Memory", "field_name": "load_1min", "field_type": "UInt8", - "description": "", - "measure": "%" + "description": null, + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/Memory/Usage.json b/collections/pm.metrictypes/Memory/Usage.json index 72aa6a64bc08ceadb54f31430575205ab889b081..e24b76ec0ff7a1f62b38b38bfa80cc4516237199 100644 --- a/collections/pm.metrictypes/Memory/Usage.json +++ b/collections/pm.metrictypes/Memory/Usage.json @@ -6,5 +6,6 @@ "field_name": "usage", "field_type": "UInt8", "description": "Memory Usage in percents", - "measure": "%" + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/Memory/Usage/5sec.json b/collections/pm.metrictypes/Memory/Usage/5sec.json index 1a3bff4d1ee866c9a5e912125ff586fb2cf9d8b4..137b99d55cb673ad56b2075d47c120f785053191 100644 --- a/collections/pm.metrictypes/Memory/Usage/5sec.json +++ b/collections/pm.metrictypes/Memory/Usage/5sec.json @@ -6,5 +6,6 @@ "field_name": "usage_5s", "field_type": "UInt8", "description": "Memory Usage in percents", - "measure": "%" + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/Multicast/Channel/Bandwidth/Percent.json b/collections/pm.metrictypes/Multicast/Channel/Bandwidth/Percent.json index 1c795a7969fc8700eeaf5e7a34f03c68d92e1c4f..a0f0ed0b529f189fd82968a02d04292e4c787008 100644 --- a/collections/pm.metrictypes/Multicast/Channel/Bandwidth/Percent.json +++ b/collections/pm.metrictypes/Multicast/Channel/Bandwidth/Percent.json @@ -6,5 +6,6 @@ "field_name": "c_bandwidth_percent", "field_type": "UInt8", "description": "Used Bandwidth in Percent", - "measure": "%" + "measure": "%", + "units__name": "Percent" } diff --git a/collections/pm.metrictypes/Multicast/Channel/Bandwidth/Used.json b/collections/pm.metrictypes/Multicast/Channel/Bandwidth/Used.json index c3965b10ec47219009115737924c6765d193dcd0..42393e0b446e092cf284a4138d921d387a1c0a6c 100644 --- a/collections/pm.metrictypes/Multicast/Channel/Bandwidth/Used.json +++ b/collections/pm.metrictypes/Multicast/Channel/Bandwidth/Used.json @@ -6,5 +6,6 @@ "field_name": "c_bandwidth_used", "field_type": "Float32", "description": "Used Bandwidth (bps)", - "measure": "bps" + "measure": "bps", + "units__name": "Bit/s" } diff --git a/collections/pm.metrictypes/Multicast/Channel/Group/Count.json b/collections/pm.metrictypes/Multicast/Channel/Group/Count.json index 8f7dac60cfe179249b6a02106eb4e01f20456bb9..a14cc493eacdb71deb58155f8365c636b6c202de 100644 --- a/collections/pm.metrictypes/Multicast/Channel/Group/Count.json +++ b/collections/pm.metrictypes/Multicast/Channel/Group/Count.json @@ -6,5 +6,6 @@ "field_name": "c_group_count", "field_type": "UInt8", "description": "Used multicast groups on channel", - "measure": " " + "measure": "", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Multicast/Group/Bitrate/In.json b/collections/pm.metrictypes/Multicast/Group/Bitrate/In.json index 658e2ff49ff730419b86f4d036779d8b627af923..3d4eb9893250ce5a679d5f02ac7e27d6ed829f7e 100644 --- a/collections/pm.metrictypes/Multicast/Group/Bitrate/In.json +++ b/collections/pm.metrictypes/Multicast/Group/Bitrate/In.json @@ -6,5 +6,6 @@ "field_name": "g_bitrate_in", "field_type": "UInt64", "description": "Input Bitrate (bps)", - "measure": "bps" + "measure": "bps", + "units__name": "Bit/s" } diff --git a/collections/pm.metrictypes/Multicast/Group/Bitrate/Out.json b/collections/pm.metrictypes/Multicast/Group/Bitrate/Out.json index 68cf96ec3adea4c1d981e207ac208fbf8fa8ea92..13458d0e4798cdae906c23674d4ca636e04d8456 100644 --- a/collections/pm.metrictypes/Multicast/Group/Bitrate/Out.json +++ b/collections/pm.metrictypes/Multicast/Group/Bitrate/Out.json @@ -6,5 +6,6 @@ "field_name": "g_bitrate_out", "field_type": "UInt64", "description": "Output Bitrate (bps)", - "measure": "bps" + "measure": "bps", + "units__name": "Bit/s" } diff --git a/collections/pm.metrictypes/Multicast/Group/Status.json b/collections/pm.metrictypes/Multicast/Group/Status.json index b58ff60cf4493a28c3ccdf029cc8e6fd155ece9d..282bcd072968ea50319ae99fc1b160df7285ab87 100644 --- a/collections/pm.metrictypes/Multicast/Group/Status.json +++ b/collections/pm.metrictypes/Multicast/Group/Status.json @@ -6,5 +6,6 @@ "field_name": "g_status", "field_type": "Int8", "description": "Multicast Group status 1 - Ok, 0 - Off, -1 - Error ", - "measure": " " + "measure": "", + "units__name": "StatusEnum" } diff --git a/collections/pm.metrictypes/Network/STP/Topology_Changes.json b/collections/pm.metrictypes/Network/STP/Topology_Changes.json index b50f21692ab8aeb28e8fd249ba5636f05a921566..cbc0054e6337c63489da110885e369bf7d261399 100644 --- a/collections/pm.metrictypes/Network/STP/Topology_Changes.json +++ b/collections/pm.metrictypes/Network/STP/Topology_Changes.json @@ -6,5 +6,6 @@ "field_name": "stp_topology_changes", "field_type": "UInt32", "description": "The total number of topology changes detected by this bridge since the management entity was last reset or initialized.", - "measure": "C" + "measure": "C", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Network/STP/Topology_Changes_Delta.json b/collections/pm.metrictypes/Network/STP/Topology_Changes_Delta.json index 751da92426656b074d2db49dc93c3b06e30cfc0d..66fa7d7b8659a1e02e93b525fb9c1969400cda07 100644 --- a/collections/pm.metrictypes/Network/STP/Topology_Changes_Delta.json +++ b/collections/pm.metrictypes/Network/STP/Topology_Changes_Delta.json @@ -6,5 +6,6 @@ "field_name": "stp_topology_changes_delta", "field_type": "UInt32", "description": "The delta of topology changes detected by this bridge since the management entity was last collect.", - "measure": "C" + "measure": "C", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Object/SysUptime.json b/collections/pm.metrictypes/Object/SysUptime.json index b68de84e0f1d5cd10769ca1a33fbbcd697ad2c86..8afc7bbe19207b26f02d0c06871e559e734dfa86 100644 --- a/collections/pm.metrictypes/Object/SysUptime.json +++ b/collections/pm.metrictypes/Object/SysUptime.json @@ -6,5 +6,6 @@ "field_name": "sys_uptime", "field_type": "UInt64", "description": "Object RFC1213-MIB:SysUptime ", - "measure": "sec" + "measure": "sec", + "units__name": "Second" } diff --git a/collections/pm.metrictypes/Ping/Attempts.json b/collections/pm.metrictypes/Ping/Attempts.json index e39cbe48855bd64ca86f879c1ca4fcb74f18ff50..3c5b0d8f1e5129f0c3b3370ee3a8b9649ea1265d 100644 --- a/collections/pm.metrictypes/Ping/Attempts.json +++ b/collections/pm.metrictypes/Ping/Attempts.json @@ -6,5 +6,6 @@ "field_name": "attempts", "field_type": "UInt16", "description": "ICMP Ping packet loss in per request", - "measure": "int" + "measure": "", + "units__name": "Packets" } diff --git a/collections/pm.metrictypes/Ping/RTT.json b/collections/pm.metrictypes/Ping/RTT.json index 4a4ea35c8f777de49ce3594c93f16f10a16e9414..ed196ea732405971f5b7a340fa3d2bc8dfa5943d 100644 --- a/collections/pm.metrictypes/Ping/RTT.json +++ b/collections/pm.metrictypes/Ping/RTT.json @@ -6,5 +6,6 @@ "field_name": "rtt", "field_type": "UInt32", "description": "ICMP Ping round trip time in microseconds", - "measure": "ms" + "measure": "ms", + "units__name": "milliSecond" } diff --git a/collections/pm.metrictypes/Radio/CINR.json b/collections/pm.metrictypes/Radio/CINR.json index 1abaddae2fd19b5be8685c577c18782b67c50813..46b367ddb0dad2ec3fc41947295c699a61f07d80 100644 --- a/collections/pm.metrictypes/Radio/CINR.json +++ b/collections/pm.metrictypes/Radio/CINR.json @@ -6,5 +6,6 @@ "field_name": "cinr", "field_type": "Int16", "description": "Carrier to Interference + Noise Ratio", - "measure": "dB" + "measure": "dB", + "units__name": "Decibel" } diff --git a/collections/pm.metrictypes/Radio/Level/Noise.json b/collections/pm.metrictypes/Radio/Level/Noise.json index 6695126f03a1db6f7901f21a9f8a0749288e7689..7b871aacced0dcfea07b20bc8fcd8a3214a1c65c 100644 --- a/collections/pm.metrictypes/Radio/Level/Noise.json +++ b/collections/pm.metrictypes/Radio/Level/Noise.json @@ -6,5 +6,6 @@ "field_name": "noise_level", "field_type": "Int32", "description": "Noise Level", - "measure": "dBm" + "measure": "dBm", + "units__name": "Decibel-mw" } diff --git a/collections/pm.metrictypes/Radio/Level/Signal.json b/collections/pm.metrictypes/Radio/Level/Signal.json index d940aabc726a0188b2c45980c2d19bd1aba0bcf8..d02524dda4fa3057b0d1d254f9cb7a13a7ecda2b 100644 --- a/collections/pm.metrictypes/Radio/Level/Signal.json +++ b/collections/pm.metrictypes/Radio/Level/Signal.json @@ -6,5 +6,6 @@ "field_name": "signal_level", "field_type": "Int32", "description": "Signal Level", - "measure": "dBm" + "measure": "dBm", + "units__name": "Decibel-mw" } diff --git a/collections/pm.metrictypes/Radio/RSSI.json b/collections/pm.metrictypes/Radio/RSSI.json index 8956c823c14fe09a29bef3464329ad4d0084ae3c..a5d907e6786f9509b93171fb8a965c76e6db11ed 100644 --- a/collections/pm.metrictypes/Radio/RSSI.json +++ b/collections/pm.metrictypes/Radio/RSSI.json @@ -6,5 +6,6 @@ "field_name": "rssi", "field_type": "Int16", "description": "Received signal strength indicator", - "measure": "dBm" + "measure": "dBm", + "units__name": "Decibel-mw" } diff --git a/collections/pm.metrictypes/Radio/RxPower.json b/collections/pm.metrictypes/Radio/RxPower.json index 1be7098462b6bf897b99d9598096174a232e5654..062acb0a530234c16b30b6867ea745889235a6df 100644 --- a/collections/pm.metrictypes/Radio/RxPower.json +++ b/collections/pm.metrictypes/Radio/RxPower.json @@ -6,5 +6,6 @@ "field_name": "rx_power", "field_type": "Float32", "description": "Signal Rx Power on transmitter", - "measure": "dBm" + "measure": "dBm", + "units__name": "Decibel-mw" } diff --git a/collections/pm.metrictypes/Radio/TxPower.json b/collections/pm.metrictypes/Radio/TxPower.json index 8a337288c8867e5428afff5e7c83e2368b7d3e9e..b4383c2f9ba6186a407864460a8f733aa9cc96ca 100644 --- a/collections/pm.metrictypes/Radio/TxPower.json +++ b/collections/pm.metrictypes/Radio/TxPower.json @@ -6,5 +6,6 @@ "field_name": "tx_power", "field_type": "Int32", "description": "Signal Tx Power on transmitter", - "measure": "dBm" + "measure": "dBm", + "units__name": "Decibel-mw" } diff --git a/collections/pm.metrictypes/SLA/ICMP_RTT.json b/collections/pm.metrictypes/SLA/ICMP_RTT.json index f3b793327a3be69a582167bca53a6c1f9bf1fa95..7db049307c685157f84c224fbe1c3a9c60f6f8ab 100644 --- a/collections/pm.metrictypes/SLA/ICMP_RTT.json +++ b/collections/pm.metrictypes/SLA/ICMP_RTT.json @@ -6,5 +6,6 @@ "field_name": "icmp_rtt", "field_type": "UInt32", "description": "Measured round trip time for ICMP packets in microseconds", - "measure": "μs" + "measure": "μs", + "units__name": "microSecond" } diff --git a/collections/pm.metrictypes/SLA/JITTER.json b/collections/pm.metrictypes/SLA/JITTER.json index 92d31c517d42571f67e40d433b115a6d4276a27f..0b2969a8f07dfdcde93fcc99227bf2845be090fe 100644 --- a/collections/pm.metrictypes/SLA/JITTER.json +++ b/collections/pm.metrictypes/SLA/JITTER.json @@ -6,5 +6,6 @@ "field_name": "jitter", "field_type": "Int32", "description": "Measured deviation of round trip time in microseconds", - "measure": "μs" + "measure": "μs", + "units__name": "microSecond" } diff --git a/collections/pm.metrictypes/SLA/LOSS.json b/collections/pm.metrictypes/SLA/LOSS.json index 1cb4b6af1ddde631605de8805d3c0a3086ae4db2..65c7ad872596b4f6643d8451e22eef887cc66247 100644 --- a/collections/pm.metrictypes/SLA/LOSS.json +++ b/collections/pm.metrictypes/SLA/LOSS.json @@ -6,5 +6,6 @@ "field_name": "loss", "field_type": "UInt32", "description": "Actual number of lost packets", - "measure": "int" + "measure": "int", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/SLA/UDP_RTT.json b/collections/pm.metrictypes/SLA/UDP_RTT.json index 3f530b7cc50ddf4fff016094d37a313be5a7e38e..ad9534cab542422483071cd743fbce82ac7856fa 100644 --- a/collections/pm.metrictypes/SLA/UDP_RTT.json +++ b/collections/pm.metrictypes/SLA/UDP_RTT.json @@ -6,5 +6,6 @@ "field_name": "udp_rtt", "field_type": "UInt32", "description": "Measured round trip time for UDP packets in microseconds", - "measure": "μs" + "measure": "μs", + "units__name": "microSecond" } diff --git a/collections/pm.metrictypes/Sensor/Status.json b/collections/pm.metrictypes/Sensor/Status.json index 5c6f3b613c99b6b0a66b52a41da0a65c39229b55..106e5b686aef93144a8222246a5309405d77151f 100644 --- a/collections/pm.metrictypes/Sensor/Status.json +++ b/collections/pm.metrictypes/Sensor/Status.json @@ -6,5 +6,6 @@ "field_name": "status", "field_type": "UInt8", "description": "Sensor status value", - "measure": "c" + "measure": "c", + "units__name": "StatusEnum" } diff --git a/collections/pm.metrictypes/Sensor/Value.json b/collections/pm.metrictypes/Sensor/Value.json index 65c31aa4525d453675b4fb29e5ffc54ee67405d5..13c1f4ab5ec9194148f8b07394c176704ff0f526 100644 --- a/collections/pm.metrictypes/Sensor/Value.json +++ b/collections/pm.metrictypes/Sensor/Value.json @@ -6,5 +6,6 @@ "field_name": "value", "field_type": "Float32", "description": "Numeric value of the sensor", - "measure": "c" + "measure": "c", + "units__name": "Scalar" } diff --git a/collections/pm.metrictypes/Sensor/Value_Delta.json b/collections/pm.metrictypes/Sensor/Value_Delta.json index ada14bc2243a494a5c5e1905a50fef76e9cf741e..84eb45d1fefe90227fe9bda50146e33c37c155c6 100644 --- a/collections/pm.metrictypes/Sensor/Value_Delta.json +++ b/collections/pm.metrictypes/Sensor/Value_Delta.json @@ -6,5 +6,6 @@ "field_name": "value_delta", "field_type": "Float32", "description": "For counters, the difference between the current and previous values", - "measure": "c" + "measure": "c", + "units__name": "Scalar" } diff --git a/collections/pm.metrictypes/Sensor/Value_Raw.json b/collections/pm.metrictypes/Sensor/Value_Raw.json index 1474982733400d164e6c7ba8f76fbd7d72cdb2f2..a9c8c4181d414469240c0bc8be8cd4fb73c1eebf 100644 --- a/collections/pm.metrictypes/Sensor/Value_Raw.json +++ b/collections/pm.metrictypes/Sensor/Value_Raw.json @@ -6,5 +6,6 @@ "field_name": "value_raw", "field_type": "Float32", "description": "Numeric value of the sensor before normalization", - "measure": "c" + "measure": "c", + "units__name": "Scalar" } diff --git a/collections/pm.metrictypes/Subscribers/IPoE.json b/collections/pm.metrictypes/Subscribers/IPoE.json index 00535bead75f2d69a1652e2adf4b1e89cd485d73..5f20a2eab36216be69e61b37c7169e891ef4b8ca 100644 --- a/collections/pm.metrictypes/Subscribers/IPoE.json +++ b/collections/pm.metrictypes/Subscribers/IPoE.json @@ -6,5 +6,6 @@ "field_name": "ipoe", "field_type": "UInt32", "description": "Total active IPoE sessions on the box", - "measure": "sessions" + "measure": "sessions", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Subscribers/L2TP.json b/collections/pm.metrictypes/Subscribers/L2TP.json index 2d62f1e7b73d0c1b2d51bf5dfe8969696f4f75aa..4a33496cf77b08a05000d28abb3c1744f44eab81 100644 --- a/collections/pm.metrictypes/Subscribers/L2TP.json +++ b/collections/pm.metrictypes/Subscribers/L2TP.json @@ -6,5 +6,6 @@ "field_name": "l2tp", "field_type": "UInt32", "description": "Total active L2TP sessions on the box", - "measure": "sessions" + "measure": "sessions", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Subscribers/PPP.json b/collections/pm.metrictypes/Subscribers/PPP.json index ace009156847790766abfc03ac0ab9b477af8155..b3e038f42a8adf81640fc4b476cd5c3a6fe95b5c 100644 --- a/collections/pm.metrictypes/Subscribers/PPP.json +++ b/collections/pm.metrictypes/Subscribers/PPP.json @@ -6,5 +6,6 @@ "field_name": "ppp", "field_type": "UInt32", "description": "Total active PPP sessions on the box", - "measure": "sessions" + "measure": "sessions", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Subscribers/PPPoE.json b/collections/pm.metrictypes/Subscribers/PPPoE.json index 5bc517c4573bbb2fefea78cb70b8e566bfcc2fcc..72a80c247f796f8d3d8ab262d955056d754b160a 100644 --- a/collections/pm.metrictypes/Subscribers/PPPoE.json +++ b/collections/pm.metrictypes/Subscribers/PPPoE.json @@ -6,5 +6,6 @@ "field_name": "pppoe", "field_type": "UInt32", "description": "Total active PPPoE sessions on the box", - "measure": "sessions" + "measure": "sessions", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Subscribers/PPTP.json b/collections/pm.metrictypes/Subscribers/PPTP.json index f3df224726f73736bead463292327c18ea8d01a8..fb59c210d5335cb61cad1cb11199632259116b4a 100644 --- a/collections/pm.metrictypes/Subscribers/PPTP.json +++ b/collections/pm.metrictypes/Subscribers/PPTP.json @@ -6,5 +6,6 @@ "field_name": "pptp", "field_type": "UInt32", "description": "Total active PPTP sessions on the box", - "measure": "sessions" + "measure": "sessions", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Subscribers/Summary.json b/collections/pm.metrictypes/Subscribers/Summary.json index 4972b00a438560ebbe3bfe20b11296461be814e3..05642dea4ab9e619dc1531e4da0f3aee4207049a 100644 --- a/collections/pm.metrictypes/Subscribers/Summary.json +++ b/collections/pm.metrictypes/Subscribers/Summary.json @@ -6,5 +6,6 @@ "field_name": "summary", "field_type": "UInt32", "description": "Total active sessions on the box", - "measure": "sessions" + "measure": "sessions", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Telephony/SIP/Register_Contacts_Active.json b/collections/pm.metrictypes/Telephony/SIP/Register_Contacts_Active.json index d98b7a666c2451f75307ca88c851a6bade60eb64..e2b19951cd305cbf1654bff92c10d03880197626 100644 --- a/collections/pm.metrictypes/Telephony/SIP/Register_Contacts_Active.json +++ b/collections/pm.metrictypes/Telephony/SIP/Register_Contacts_Active.json @@ -6,5 +6,6 @@ "field_name": "sip_register_contacts_active", "field_type": "UInt64", "description": "The number of SIP Contacts register on local device (not on all cluster, if available).", - "measure": "C" + "measure": "C", + "units__name": "Units" } diff --git a/collections/pm.metrictypes/Telephony/SIP/Sessions_Active.json b/collections/pm.metrictypes/Telephony/SIP/Sessions_Active.json index 6b62fcf428ccac71180d8515a818d0b9249c9093..094157751b3c54b778fbf1d766dd06516f25e2d1 100644 --- a/collections/pm.metrictypes/Telephony/SIP/Sessions_Active.json +++ b/collections/pm.metrictypes/Telephony/SIP/Sessions_Active.json @@ -6,5 +6,6 @@ "field_name": "sip_sessions_active", "field_type": "UInt64", "description": "The total number of active SIP sessions.", - "measure": "C" + "measure": "C", + "units__name": "Units" } diff --git a/pm/models/measurementunits.py b/pm/models/measurementunits.py index f42f512dca4f61d60655b7c4a78ac64646c33723..0954b703603ed38a1980d5d2025b263c438b47e0 100644 --- a/pm/models/measurementunits.py +++ b/pm/models/measurementunits.py @@ -13,12 +13,14 @@ from typing import Optional # Third-party modules from mongoengine.document import Document, EmbeddedDocument from mongoengine.fields import StringField, IntField, UUIDField, ListField, EmbeddedDocumentField +from mongoengine.errors import ValidationError import cachetools # NOC modules from noc.core.model.decorator import on_delete_check from noc.core.prettyjson import to_json from noc.core.text import quote_safe_path +from noc.core.expr import get_fn DEFAULT_UNITS_NAME = "Unknown" @@ -44,6 +46,18 @@ class AltUnit(EmbeddedDocument): def __str__(self): return self.name + def clean(self): + if self.from_primary: + try: + get_fn(self.from_primary) + except SyntaxError: + raise ValidationError("Syntx Error on from_primary exression") + if self.to_primary: + try: + get_fn(self.to_primary) + except SyntaxError: + raise ValidationError("Syntx Error on to_primary exression") + @property def json_data(self): return { @@ -68,7 +82,9 @@ class EnumValue(EmbeddedDocument): return {"key": self.key, "value": self.value} -@on_delete_check(check=[("inv.Sensor", "units"), ("inv.SensorProfile", "units")]) +@on_delete_check( + check=[("inv.Sensor", "units"), ("inv.SensorProfile", "units"), ("pm.MetricType", "units")] +) class MeasurementUnits(Document): meta = { "collection": "measurementunits", diff --git a/pm/models/metrictype.py b/pm/models/metrictype.py index fe3bf33234bf30f6be75173e696c4bd3592db914..a3190e6c14b8bbe4a1417a802624c8c7b7b0dd81 100644 --- a/pm/models/metrictype.py +++ b/pm/models/metrictype.py @@ -17,6 +17,7 @@ import cachetools # NOC Modules from .metricscope import MetricScope +from .measurementunits import MeasurementUnits from noc.inv.models.capability import Capability from noc.core.mongo.fields import PlainReferenceField from noc.main.models.doccategory import category @@ -68,6 +69,7 @@ class MetricType(Document): ) # Text description description = StringField(required=False) + units = PlainReferenceField(MeasurementUnits) # Measure name, like 'kbit/s' # Compatible to Grafana measure = StringField() @@ -96,6 +98,7 @@ class MetricType(Document): "field_type": self.field_type, "description": self.description, "measure": self.measure, + "units__name": self.units.name, } if self.required_capability: r["required_capability__name"] = self.required_capability.name @@ -113,6 +116,7 @@ class MetricType(Document): "field_type", "description", "measure", + "units__name", "vector_tag", ], ) diff --git a/ui/web/pm/metrictype/Application.js b/ui/web/pm/metrictype/Application.js index 8fbd21323f2a11ab06d6233b1b0e90d696fc73c1..d922c0527d91dde7325af099358ae91f24df1bf3 100644 --- a/ui/web/pm/metrictype/Application.js +++ b/ui/web/pm/metrictype/Application.js @@ -11,7 +11,8 @@ Ext.define("NOC.pm.metrictype.Application", { requires: [ "NOC.core.JSONPreview", "NOC.pm.metrictype.Model", - "NOC.pm.metricscope.LookupField" + "NOC.pm.metricscope.LookupField", + "NOC.pm.measurementunits.LookupField" ], model: "NOC.pm.metrictype.Model", search: true, @@ -107,6 +108,12 @@ Ext.define("NOC.pm.metrictype.Application", { fieldLabel: __("Measure"), allowBlank: false, uiStyle: "medium" + }, + { + name: "units", + xtype: "pm.measurementunits.LookupField", + fieldLabel: __("Metric Measurement Units"), + allowBlank: true } ], formToolbar: [ diff --git a/ui/web/pm/metrictype/Model.js b/ui/web/pm/metrictype/Model.js index 4059dc93afb2aaa0f1ccb57bacd627b8fec08e13..51a571df49158dbb59a641de3f2192e21fb5cd0e 100644 --- a/ui/web/pm/metrictype/Model.js +++ b/ui/web/pm/metrictype/Model.js @@ -48,6 +48,15 @@ Ext.define("NOC.pm.metrictype.Model", { name: "field_type", type: "string" }, + { + name: "units", + type: "string" + }, + { + name: "units__label", + type: "string", + persist: false + }, { name: "is_builtin", type: "boolean",