Skip to content

Commit

Permalink
Merge pull request #37 from unpoller/superq/fixup_interval
Browse files Browse the repository at this point in the history 
Fix use of interval variable in rate functions
  • Loading branch information
@platinummonkey
platinummonkey committed May 9, 2024
2 parents 1b972ae + c063faa commit a5ecc05
Show file tree
Hide file tree
Showing 6 changed files with 344 additions and 344 deletions.
538 changes: 269 additions & 269 deletions v2.0.0/UniFi-Poller_ Client DPI - Prometheus.json
View file

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions v2.0.0/UniFi-Poller_ Client Insights - Prometheus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1281,14 +1281,14 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{name!~\".*camera.*|.*cam(era)?$\", name=~\"$Wireless\", site_name=~\"$Site\", ap_name=~\"$AP\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{name!~\".*camera.*|.*cam(era)?$\", name=~\"$Wireless\", site_name=~\"$Site\", ap_name=~\"$AP\"}[$__rate_interval]))",
"instant": false,
"interval": "$Smooth",
"legendFormat": "{{name}} {{mac}} Tx",
"refId": "B"
},
{
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{name!~\".*camera.*|.*cam(era)?$\", name=~\"$Wireless\", site_name=~\"$Site\", ap_name=~\"$AP\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{name!~\".*camera.*|.*cam(era)?$\", name=~\"$Wireless\", site_name=~\"$Site\", ap_name=~\"$AP\"}[$__rate_interval]))",
"instant": false,
"interval": "$Smooth",
"legendFormat": "{{name}} {{mac}} Rx",
Expand Down Expand Up @@ -1396,13 +1396,13 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{name!~\".*camera.*|.*cam(era)?$\", name=~\"$Wired\", site_name=~\"$Site\", sw_name=~\"$Switch\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{name!~\".*camera.*|.*cam(era)?$\", name=~\"$Wired\", site_name=~\"$Site\", sw_name=~\"$Switch\"}[$__rate_interval]))",
"interval": "$Smooth",
"legendFormat": "{{name}} {{mac}} Tx",
"refId": "A"
},
{
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{name!~\".*camera.*|.*cam(era)?$\", name=~\"$Wired\", site_name=~\"$Site\", sw_name=~\"$Switch\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{name!~\".*camera.*|.*cam(era)?$\", name=~\"$Wired\", site_name=~\"$Site\", sw_name=~\"$Switch\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"intervalFactor": 1,
Expand Down Expand Up @@ -1511,28 +1511,28 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{name=~\"^amazon.*\", name=~\"$Wireless\", site_name=~\"$Site\", ap_name=~\"$AP\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{name=~\"^amazon.*\", name=~\"$Wireless\", site_name=~\"$Site\", ap_name=~\"$AP\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "w {{name}} {{mac}} Tx",
"refId": "A"
},
{
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{name=~\"^amazon.*\", name=~\"$Wireless\", site_name=~\"$Site\", ap_name=~\"$AP\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{name=~\"^amazon.*\", name=~\"$Wireless\", site_name=~\"$Site\", ap_name=~\"$AP\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "w {{name}} {{mac}} Rx",
"refId": "B"
},
{
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{name=~\"^amazon.*\", name=~\"$Wired\", site_name=~\"$Site\", sw_name=~\"$Switch\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{name=~\"^amazon.*\", name=~\"$Wired\", site_name=~\"$Site\", sw_name=~\"$Switch\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "e {{name}} {{mac}} Tx",
"refId": "C"
},
{
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{name=~\"^amazon.*\", name=~\"$Wired\", site_name=~\"$Site\", sw_name=~\"$Switch\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{name=~\"^amazon.*\", name=~\"$Wired\", site_name=~\"$Site\", sw_name=~\"$Switch\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "e {{name}} {{mac}} Rx",
Expand Down Expand Up @@ -1640,29 +1640,29 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{ap_name=~\"$AP\", name=~\".*camera.*|.*cam$\", site_name=~\"$Site\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{ap_name=~\"$AP\", name=~\".*camera.*|.*cam$\", site_name=~\"$Site\"}[$__rate_interval]))",
"hide": false,
"instant": false,
"interval": "$Smooth",
"legendFormat": "w {{name}} {{mac}} Tx",
"refId": "A"
},
{
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{ap_name=~\"$AP\", name=~\".*camera.*|.*cam$\", site_name=~\"$Site\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{ap_name=~\"$AP\", name=~\".*camera.*|.*cam$\", site_name=~\"$Site\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "w {{name}} {{mac}} Rx",
"refId": "B"
},
{
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{sw_name=~\"$Switch\", name=~\".*camera.*|.*cam$\", site_name=~\"$Site\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_bytes_total{sw_name=~\"$Switch\", name=~\".*camera.*|.*cam$\", site_name=~\"$Site\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "e {{name}} {{mac}} Tx",
"refId": "C"
},
{
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{sw_name=~\"$Switch\", name=~\".*camera.*|.*cam$\", site_name=~\"$Site\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_receive_bytes_total{sw_name=~\"$Switch\", name=~\".*camera.*|.*cam$\", site_name=~\"$Site\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "e {{name}} {{mac}} Rx",
Expand Down Expand Up @@ -2180,7 +2180,7 @@
"steppedLine": false,
"targets": [
{
"expr": "avg by ($Identifier) (rate(unpoller_client_wifi_attempts_transmit_total{ap_name=~\"$AP\", site_name=~\"$Site\", name=~\"$Wireless\"}[$__interval]))",
"expr": "avg by ($Identifier) (rate(unpoller_client_wifi_attempts_transmit_total{ap_name=~\"$AP\", site_name=~\"$Site\", name=~\"$Wireless\"}[$__rate_interval]))",
"interval": "$Smooth",
"legendFormat": "{{name}} {{mac}}",
"refId": "A"
Expand Down Expand Up @@ -2388,7 +2388,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_retries_total{ap_name=~\"$AP\", site_name=~\"$Site\", name=~\"$Wireless\"}[$__interval]))",
"expr": "sum by ($Identifier) (rate(unpoller_client_transmit_retries_total{ap_name=~\"$AP\", site_name=~\"$Site\", name=~\"$Wireless\"}[$__rate_interval]))",
"interval": "$Smooth",
"legendFormat": "{{name}} {{mac}}",
"refId": "A"
Expand Down Expand Up @@ -3214,5 +3214,5 @@
"timezone": "browser",
"title": "UniFi-Poller: Client Insights - Prometheus",
"uid": "jMfvAjxWz",
"version": 30
}
"version": 31
}
10 changes: 5 additions & 5 deletions v2.0.0/UniFi-Poller_ Network Sites - Prometheus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1189,13 +1189,13 @@
"steppedLine": false,
"targets": [
{
"expr": "rate(unpoller_site_remote_user_transmit_bytes_total{site_name=~\"$Site\"}[$__interval])",
"expr": "rate(unpoller_site_remote_user_transmit_bytes_total{site_name=~\"$Site\"}[$__rate_interval])",
"interval": "$Smooth",
"legendFormat": "VPN Users Tx",
"refId": "A"
},
{
"expr": "rate(unpoller_site_remote_user_receive_bytes_total{site_name=~\"$Site\"}[$__interval])",
"expr": "rate(unpoller_site_remote_user_receive_bytes_total{site_name=~\"$Site\"}[$__rate_interval])",
"interval": "$Smooth",
"legendFormat": "VPN Users Rx",
"refId": "B"
Expand Down Expand Up @@ -1306,14 +1306,14 @@
"steppedLine": false,
"targets": [
{
"expr": "sum by (category) (rate(unpoller_site_dpi_receive_bytes{site_name=~\"$Site\"}[$__interval]))",
"expr": "sum by (category) (rate(unpoller_site_dpi_receive_bytes{site_name=~\"$Site\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "{{category}} Rx",
"refId": "A"
},
{
"expr": "sum by (category) (rate(unpoller_site_dpi_transmit_bytes{site_name=~\"$Site\"}[$__interval]))",
"expr": "sum by (category) (rate(unpoller_site_dpi_transmit_bytes{site_name=~\"$Site\"}[$__rate_interval]))",
"hide": false,
"interval": "$Smooth",
"legendFormat": "{{category}} Tx",
Expand Down Expand Up @@ -1518,5 +1518,5 @@
"timezone": "browser",
"title": "UniFi-Poller: Network Sites - Prometheus",
"uid": "9WaGWZaZk",
"version": 9
"version": 10
}
42 changes: 21 additions & 21 deletions v2.0.0/UniFi-Poller_ UAP Insights - Prometheus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3024,14 +3024,14 @@
"steppedLine": false,
"targets": [
{
"expr": "sum (rate(unpoller_device_vap_transmit_packets_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_transmit_packets_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"hide": false,
"interval": "$Smooth",
"legendFormat": "{{name}} Out",
"refId": "A"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_packets_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_packets_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} In",
"refId": "B"
Expand Down Expand Up @@ -3143,13 +3143,13 @@
"steppedLine": false,
"targets": [
{
"expr": "sum (rate(unpoller_device_vap_transmit_packets_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_transmit_packets_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Out",
"refId": "A"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_packets_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_packets_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} In",
"refId": "B"
Expand Down Expand Up @@ -3261,49 +3261,49 @@
"steppedLine": false,
"targets": [
{
"expr": "sum (rate(unpoller_device_vap_receive_dropped_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_dropped_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Drops Rx",
"refId": "A"
},
{
"expr": "sum (rate(unpoller_device_vap_transmit_dropped_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_transmit_dropped_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Drops Tx",
"refId": "B"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_errors_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_errors_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Errors Rx",
"refId": "C"
},
{
"expr": "sum (rate(unpoller_device_vap_transmit_errors_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_transmit_errors_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Errors Tx",
"refId": "D"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_crypts_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_crypts_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Crypts Rx",
"refId": "E"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_frags_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_frags_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Frags Rx",
"refId": "F"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_nwids_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_nwids_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Nwids Rx",
"refId": "G"
},
{
"expr": "sum (rate(unpoller_device_vap_transmit_retries_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_transmit_retries_total{radio=\"na\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Retries Tx",
"refId": "H"
Expand Down Expand Up @@ -3416,49 +3416,49 @@
"steppedLine": false,
"targets": [
{
"expr": "sum (rate(unpoller_device_vap_receive_dropped_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_dropped_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Drops Rx",
"refId": "A"
},
{
"expr": "sum (rate(unpoller_device_vap_transmit_dropped_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_transmit_dropped_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Drops Tx",
"refId": "B"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_errors_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_errors_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Errors Rx",
"refId": "C"
},
{
"expr": "sum (rate(unpoller_device_vap_transmit_errors_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_transmit_errors_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Errors Tx",
"refId": "D"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_crypts_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_crypts_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Crypts Rx",
"refId": "E"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_frags_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_frags_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Frags Rx",
"refId": "F"
},
{
"expr": "sum (rate(unpoller_device_vap_receive_nwids_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_receive_nwids_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Nwids Rx",
"refId": "G"
},
{
"expr": "sum (rate(unpoller_device_vap_transmit_retries_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__interval])) by (name)",
"expr": "sum (rate(unpoller_device_vap_transmit_retries_total{radio=\"ng\",site_name=~\"$Site\",name=~\"$AP\"}[$__rate_interval])) by (name)",
"interval": "$Smooth",
"legendFormat": "{{name}} Retries Tx",
"refId": "H"
Expand Down Expand Up @@ -3676,5 +3676,5 @@
"timezone": "browser",
"title": "UniFi-Poller: UAP Insights - Prometheus",
"uid": "g5wFWqxZk",
"version": 24
"version": 25
}
Loading

0 comments on commit a5ecc05

Please sign in to comment.