diff --git a/metrics.json b/metrics.json index 4a17e2c..d85801e 100644 --- a/metrics.json +++ b/metrics.json @@ -4,79 +4,88 @@ "action": "GetTotalPacketsReceived", "result": "TotalPacketsReceived", "promDesc": { - "fqName": "gateway_wan_traffic", - "help": "traffic on gateway WAN interface", + "fqName": "gateway_raffic", + "help": "traffic on gateway interface", "varLabels": [ "gateway" ], "fixedLabels": { - "direction" : "Received", - "unit": "Packets" - } + "direction": "Received", + "unit": "Packets", + "interface": "WAN" + } }, - "promType": "GaugeValue" + "promType": "CounterValue" }, { "service": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1", "action": "GetTotalPacketsSent", "result": "TotalPacketsSent", "promDesc": { - "fqName": "gateway_wan_traffic", - "help": "traffic on gateway WAN interface", + "fqName": "gateway_traffic", + "help": "traffic on gateway interface", "varLabels": [ "gateway" ], "fixedLabels": { - "direction" : "Sent", - "unit": "Packets" - } + "direction": "Sent", + "unit": "Packets", + "interface": "WAN" + } }, - "promType": "GaugeValue" + "promType": "CounterValue" }, { "service": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1", "action": "GetAddonInfos", "result": "TotalBytesReceived", "promDesc": { - "fqName": "gateway_wan_traffic", - "help": "traffic on gateway WAN interface", + "fqName": "gateway_traffic", + "help": "traffic on gateway interface", "varLabels": [ "gateway" ], "fixedLabels": { - "direction" : "Received", - "unit": "Bytes" - } + "direction": "Received", + "unit": "Bytes", + "interface": "WAN" + } }, - "promType": "GaugeValue" + "promType": "CounterValue" }, { "service": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1", "action": "GetAddonInfos", "result": "TotalBytesSent", "promDesc": { - "fqName": "gateway_wan_traffic", - "help": "traffic on gateway WAN interface", + "fqName": "gateway_traffic", + "help": "traffic on gateway interface", "varLabels": [ "gateway" ], "fixedLabels": { - "direction" : "Sent", - "unit": "Bytes" - } + "direction": "Sent", + "unit": "Bytes", + "interface": "WAN" + } }, - "promType": "GaugeValue" - }, + "promType": "CounterValue" + }, { "service": "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1", "action": "GetAddonInfos", "result": "ByteSendRate", "promDesc": { - "fqName": "gateway_wan_bytes_send_rate", - "help": "byte send rate on gateway WAN interface", + "fqName": "gateway_traffic_rate", + "help": "traffic rate on gateway interface", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "direction": "Sent", + "unit": "Bytes", + "interface": "WAN" + } }, "promType": "GaugeValue" }, @@ -85,11 +94,16 @@ "action": "GetAddonInfos", "result": "ByteReceiveRate", "promDesc": { - "fqName": "gateway_wan_bytes_receive_rate", - "help": "byte receive rate on gateway WAN interface", + "fqName": "gateway_traffic_rate", + "help": "traffic rate on gateway interface", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "direction": "Received", + "unit": "Bytes", + "interface": "WAN" + } }, "promType": "GaugeValue" }, @@ -98,11 +112,15 @@ "action": "GetCommonLinkProperties", "result": "Layer1UpstreamMaxBitRate", "promDesc": { - "fqName": "gateway_wan_layer1_upstream_max_bitrate", - "help": "Layer1 upstream max bitrate", + "fqName": "gateway_max_bitrate", + "help": "max bitrate on gateway interface", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "direction": "Up", + "interface": "WAN" + } }, "promType": "GaugeValue", "cacheEntryTTL": 60 @@ -112,11 +130,15 @@ "action": "GetCommonLinkProperties", "result": "Layer1DownstreamMaxBitRate", "promDesc": { - "fqName": "gateway_wan_layer1_downstream_max_bitrate", - "help": "Layer1 downstream max bitrate", + "fqName": "gateway_max_bitrate", + "help": "max bitrate on gateway interface", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "direction": "Down", + "interface": "WAN" + } }, "promType": "GaugeValue", "cacheEntryTTL": 60 @@ -127,14 +149,18 @@ "result": "PhysicalLinkStatus", "okValue": "Up", "promDesc": { - "fqName": "gateway_wan_layer1_link_status", - "help": "Status of physical link (Up = 1)", + "fqName": "gateway_connection_status", + "help": "Connection status (Connected = 1)", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "connection": "Physical Link", + "interface": "WAN" + } }, "promType": "GaugeValue", - "cacheEntryTTL": 60 + "cacheEntryTTL": 60 }, { "service": "urn:schemas-upnp-org:service:WANIPConnection:1", @@ -142,25 +168,33 @@ "result": "ConnectionStatus", "okValue": "Connected", "promDesc": { - "fqName": "gateway_wan_connection_status", - "help": "WAN connection status (Connected = 1)", + "fqName": "gateway_connection_status", + "help": "Connection status (Connected = 1)", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "connection": "IP", + "interface": "WAN" + } }, "promType": "GaugeValue", - "cacheEntryTTL": 60 + "cacheEntryTTL": 60 }, { "service": "urn:schemas-upnp-org:service:WANIPConnection:1", "action": "GetStatusInfo", "result": "Uptime", "promDesc": { - "fqName": "gateway_wan_connection_uptime_seconds", - "help": "WAN connection uptime", + "fqName": "gateway_connection_uptime_seconds", + "help": "Connection uptime", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "connection": "IP", + "interface": "WAN" + } }, "promType": "GaugeValue" }, @@ -170,14 +204,18 @@ "result": "ConnectionStatus", "okValue": "Connected", "promDesc": { - "fqName": "gateway_ppp_connection_status", - "help": "WAN PPP connection status (Connected = 1)", + "fqName": "gateway_wan_connection_status", + "help": "WAN Connection status (Connected = 1)", "varLabels": [ "gateway", "ConnectionType", "ExternalIPAddress", "MACAddress" - ] + ], + "fixedLabels": { + "connection": "PPP", + "interface": "WAN" + } }, "promType": "GaugeValue" }, @@ -186,14 +224,15 @@ "action": "GetInfo", "result": "Uptime", "promDesc": { - "fqName": "gateway_ppp_connection_uptime_seconds", - "help": "WAN PPP connection uptime", + "fqName": "gateway_connection_uptime_seconds", + "help": "Connection uptime", "varLabels": [ - "gateway", - "ConnectionType", - "ExternalIPAddress", - "MACAddress" - ] + "gateway" + ], + "fixedLabels": { + "connection": "PPP", + "interface": "WAN" + } }, "promType": "GaugeValue" }, @@ -202,14 +241,16 @@ "action": "GetInfo", "result": "UpstreamMaxBitRate", "promDesc": { - "fqName": "gateway_ppp_connection_upstream_maxbitrate", - "help": "WAN PPP connection upstream max bitrate", + "fqName": "gateway_connection_max_bitrate", + "help": "connection max bitrate", "varLabels": [ - "gateway", - "ConnectionType", - "ExternalIPAddress", - "MACAddress" - ] + "gateway" + ], + "fixedLabels": { + "direction": "Up", + "connection": "PPP", + "interface": "WAN" + } }, "promType": "GaugeValue" }, @@ -218,14 +259,16 @@ "action": "GetInfo", "result": "DownstreamMaxBitRate", "promDesc": { - "fqName": "gateway_ppp_connection_downstream_maxbitrate", - "help": "WAN PPP connection downstream max bitrate", + "fqName": "gateway_connection_max_bitrate", + "help": "connection max bitrate", "varLabels": [ - "gateway", - "ConnectionType", - "ExternalIPAddress", - "MACAddress" - ] + "gateway" + ], + "fixedLabels": { + "direction": "Down", + "connection": "PPP", + "interface": "WAN" + } }, "promType": "GaugeValue" }, @@ -238,7 +281,10 @@ "help": "current WLAN connections", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "wlan": "2.4 GHz" + } }, "promType": "GaugeValue" }, @@ -247,11 +293,14 @@ "action": "GetTotalAssociations", "result": "TotalAssociations", "promDesc": { - "fqName": "gateway_wlan2_current_connections", - "help": "current WLAN2 connections", + "fqName": "gateway_wlan_current_connections", + "help": "current WLAN connections", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "wlan": "5 Ghz" + } }, "promType": "GaugeValue" }, @@ -292,11 +341,16 @@ "action": "GetStatistics", "result": "Stats.BytesSent", "promDesc": { - "fqName": "gateway_lan_bytes_sent", - "help": "bytes sent on gateway LAN interface", + "fqName": "gateway_traffic", + "help": "traffic on gateway interface", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "direction": "Sent", + "unit": "Bytes", + "interface": "LAN" + } }, "promType": "CounterValue" }, @@ -305,22 +359,27 @@ "action": "GetStatistics", "result": "Stats.BytesReceived", "promDesc": { - "fqName": "gateway_lan_bytes_received", - "help": "bytes received on gateway LAN interface", + "fqName": "gateway_traffic", + "help": "traffic on gateway interface", "varLabels": [ "gateway" - ] + ], + "fixedLabels": { + "direction": "Received", + "unit": "Bytes", + "interface": "LAN" + } }, "promType": "CounterValue" }, { "service": "urn:dslforum-org:service:Hosts:1", "action": "GetGenericHostEntry", - "actionArgument": { - "name": "NewIndex", + "actionArgument": { + "name": "NewIndex", "isIndex": true, - "providerAction": "GetHostNumberOfEntries", - "value": "HostNumberOfEntries" + "providerAction": "GetHostNumberOfEntries", + "value": "HostNumberOfEntries" }, "result": "Active", "promDesc": { @@ -340,11 +399,11 @@ { "service": "urn:dslforum-org:service:X_AVM-DE_Dect:1", "action": "GetGenericDectEntry", - "actionArgument": { - "name": "NewIndex", + "actionArgument": { + "name": "NewIndex", "isIndex": true, - "providerAction": "GetNumberOfDectEntries", - "value": "NumberOfEntries" + "providerAction": "GetNumberOfDectEntries", + "value": "NumberOfEntries" }, "result": "Active", "promDesc": { @@ -360,4 +419,4 @@ "promType": "GaugeValue", "cacheEntryTTL": 120 } -] +] \ No newline at end of file