From 9279c845f656fb1bbcdaa0643cc664b328cf2c67 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Tue, 8 May 2018 15:42:52 -0500 Subject: [PATCH] feature: Added wireless sensors to about and stats.librenms.org (#8676) --- html/pages/about.inc.php | 47 +++++++++++++----------- includes/callback.php | 79 ++++++++++++++++++++-------------------- 2 files changed, 66 insertions(+), 60 deletions(-) diff --git a/html/pages/about.inc.php b/html/pages/about.inc.php index 1c5da1e621..684e9cf116 100644 --- a/html/pages/about.inc.php +++ b/html/pages/about.inc.php @@ -47,29 +47,30 @@ along with this program. If not, see htt

Statistics

Sensors$stat_sensors + Wireless Sensors$stat_wireless + + Toner$stat_toner + diff --git a/includes/callback.php b/includes/callback.php index 74c75ab22b..281de70988 100644 --- a/includes/callback.php +++ b/includes/callback.php @@ -22,45 +22,46 @@ if ($enabled == 1) { $version = version_info(); $queries = array( - 'alert_rules' => 'SELECT COUNT(`severity`) AS `total`,`severity` FROM `alert_rules` WHERE `disabled`=0 GROUP BY `severity`', - 'alert_templates' => 'SELECT COUNT(`id`) AS `total` FROM `alert_templates`', - 'api_tokens' => 'SELECT COUNT(`id`) AS `total` FROM `api_tokens` WHERE `disabled`=0', - 'applications' => 'SELECT COUNT(`app_type`) AS `total`,`app_type` FROM `applications` GROUP BY `app_type`', - 'bgppeer_state' => 'SELECT COUNT(`bgpPeerState`) AS `total`,`bgpPeerState` FROM `bgpPeers` GROUP BY `bgpPeerState`', - 'bgppeer_status' => 'SELECT COUNT(`bgpPeerAdminStatus`) AS `total`,`bgpPeerAdminStatus` FROM `bgpPeers` GROUP BY `bgpPeerAdminStatus`', - 'bills' => 'SELECT COUNT(`bill_type`) AS `total`,`bill_type` FROM `bills` GROUP BY `bill_type`', - 'cef' => 'SELECT COUNT(`device_id`) AS `total` FROM `cef_switching`', - 'cisco_asa' => 'SELECT COUNT(`oid`) AS `total`,`oid` FROM `ciscoASA` WHERE `disabled` = 0 GROUP BY `oid`', - 'mempool' => 'SELECT COUNT(`mempool_descr`) AS `total`,`mempool_descr` FROM `mempools` GROUP BY `mempool_descr`', - 'dbschema' => 'SELECT COUNT(`version`) AS `total`, `version` FROM `dbSchema`', - 'snmp_version' => 'SELECT COUNT(`snmpver`) AS `total`,`snmpver` FROM `devices` GROUP BY `snmpver`', - 'os' => 'SELECT COUNT(`os`) AS `total`,`os` FROM `devices` GROUP BY `os`', - 'type' => 'SELECT COUNT(`type`) AS `total`,`type` FROM `devices` GROUP BY `type`', - 'hardware' => 'SELECT COUNT(`device_id`) AS `total`, `hardware` FROM `devices` GROUP BY `hardware`', - 'ipsec' => 'SELECT COUNT(`device_id`) AS `total` FROM `ipsec_tunnels`', - 'ipv4_addresses' => 'SELECT COUNT(`ipv4_address_id`) AS `total` FROM `ipv4_addresses`', - 'ipv4_macaddress' => 'SELECT COUNT(`port_id`) AS `total` FROM ipv4_mac', - 'ipv4_networks' => 'SELECT COUNT(`ipv4_network_id`) AS `total` FROM ipv4_networks', - 'ipv6_addresses' => 'SELECT COUNT(`ipv6_address_id`) AS `total` FROM `ipv6_addresses`', - 'ipv6_networks' => 'SELECT COUNT(`ipv6_network_id`) AS `total` FROM `ipv6_networks`', - 'xdp' => 'SELECT COUNT(`id`) AS `total`,`protocol` FROM `links` GROUP BY `protocol`', - 'ospf' => 'SELECT COUNT(`device_id`) AS `total`,`ospfVersionNumber` FROM `ospf_instances` GROUP BY `ospfVersionNumber`', - 'ospf_links' => 'SELECT COUNT(`device_id`) AS `total`,`ospfIfType` FROM `ospf_ports` GROUP BY `ospfIfType`', - 'arch' => 'SELECT COUNT(`pkg_id`) AS `total`,`arch` FROM `packages` GROUP BY `arch`', - 'pollers' => 'SELECT COUNT(`id`) AS `total` FROM `pollers`', - 'port_type' => 'SELECT COUNT(`port_id`) AS `total`,`ifType` FROM `ports` GROUP BY `ifType`', - 'port_ifspeed' => 'SELECT COUNT(`ifSpeed`) AS `total`,ROUND(`ifSpeed`/1000/1000) FROM `ports` GROUP BY `ifSpeed`', - 'port_vlans' => 'SELECT COUNT(`device_id`) AS `total`,`state` FROM `ports_vlans` GROUP BY `state`', - 'processes' => 'SELECT COUNT(`device_id`) AS `total` FROM `processes`', - 'processors' => 'SELECT COUNT(`processor_id`) AS `total`,`processor_type` FROM `processors` GROUP BY `processor_type`', - 'pseudowires' => 'SELECT COUNT(`pseudowire_id`) AS `total` FROM `pseudowires`', - 'sensors' => 'SELECT COUNT(`sensor_id`) AS `total`,`sensor_class` FROM `sensors` GROUP BY `sensor_class`', - 'storage' => 'SELECT COUNT(`storage_id`) AS `total`,`storage_type` FROM `storage` GROUP BY `storage_type`', - 'toner' => 'SELECT COUNT(`toner_id`) AS `total`,`toner_type` FROM `toner` GROUP BY `toner_type`', - 'vlans' => 'SELECT COUNT(`vlan_id`) AS `total`,`vlan_type` FROM `vlans` GROUP BY `vlan_type`', - 'vminfo' => 'SELECT COUNT(`id`) AS `total`,`vm_type` FROM `vminfo` GROUP BY `vm_type`', - 'vmware' => 'SELECT COUNT(`id`) AS `total` FROM `vminfo`', - 'vrfs' => 'SELECT COUNT(`vrf_id`) AS `total` FROM `vrfs`', + 'alert_rules' => 'SELECT COUNT(*) AS `total`,`severity` FROM `alert_rules` WHERE `disabled`=0 GROUP BY `severity`', + 'alert_templates' => 'SELECT COUNT(*) AS `total` FROM `alert_templates`', + 'api_tokens' => 'SELECT COUNT(*) AS `total` FROM `api_tokens` WHERE `disabled`=0', + 'applications' => 'SELECT COUNT(*) AS `total`,`app_type` FROM `applications` GROUP BY `app_type`', + 'bgppeer_state' => 'SELECT COUNT(*) AS `total`,`bgpPeerState` FROM `bgpPeers` GROUP BY `bgpPeerState`', + 'bgppeer_status' => 'SELECT COUNT(*) AS `total`,`bgpPeerAdminStatus` FROM `bgpPeers` GROUP BY `bgpPeerAdminStatus`', + 'bills' => 'SELECT COUNT(*) AS `total`,`bill_type` FROM `bills` GROUP BY `bill_type`', + 'cef' => 'SELECT COUNT(*) AS `total` FROM `cef_switching`', + 'cisco_asa' => 'SELECT COUNT(*) AS `total`,`oid` FROM `ciscoASA` WHERE `disabled` = 0 GROUP BY `oid`', + 'mempool' => 'SELECT COUNT(*) AS `total`,`mempool_descr` FROM `mempools` GROUP BY `mempool_descr`', + 'dbschema' => 'SELECT COUNT(*) AS `total`, `version` FROM `dbSchema`', + 'snmp_version' => 'SELECT COUNT(*) AS `total`,`snmpver` FROM `devices` GROUP BY `snmpver`', + 'os' => 'SELECT COUNT(*) AS `total`,`os` FROM `devices` GROUP BY `os`', + 'type' => 'SELECT COUNT(*) AS `total`,`type` FROM `devices` GROUP BY `type`', + 'hardware' => 'SELECT COUNT(*) AS `total`, `hardware` FROM `devices` GROUP BY `hardware`', + 'ipsec' => 'SELECT COUNT(*) AS `total` FROM `ipsec_tunnels`', + 'ipv4_addresses' => 'SELECT COUNT(*) AS `total` FROM `ipv4_addresses`', + 'ipv4_macaddress' => 'SELECT COUNT(*) AS `total` FROM ipv4_mac', + 'ipv4_networks' => 'SELECT COUNT(*) AS `total` FROM ipv4_networks', + 'ipv6_addresses' => 'SELECT COUNT(*) AS `total` FROM `ipv6_addresses`', + 'ipv6_networks' => 'SELECT COUNT(*) AS `total` FROM `ipv6_networks`', + 'xdp' => 'SELECT COUNT(*) AS `total`,`protocol` FROM `links` GROUP BY `protocol`', + 'ospf' => 'SELECT COUNT(*) AS `total`,`ospfVersionNumber` FROM `ospf_instances` GROUP BY `ospfVersionNumber`', + 'ospf_links' => 'SELECT COUNT(*) AS `total`,`ospfIfType` FROM `ospf_ports` GROUP BY `ospfIfType`', + 'arch' => 'SELECT COUNT(*) AS `total`,`arch` FROM `packages` GROUP BY `arch`', + 'pollers' => 'SELECT COUNT(*) AS `total` FROM `pollers`', + 'port_type' => 'SELECT COUNT(*) AS `total`,`ifType` FROM `ports` GROUP BY `ifType`', + 'port_ifspeed' => 'SELECT COUNT(*) AS `total`,ROUND(`ifSpeed`/1000/1000) FROM `ports` GROUP BY `ifSpeed`', + 'port_vlans' => 'SELECT COUNT(*) AS `total`,`state` FROM `ports_vlans` GROUP BY `state`', + 'processes' => 'SELECT COUNT(*) AS `total` FROM `processes`', + 'processors' => 'SELECT COUNT(*) AS `total`,`processor_type` FROM `processors` GROUP BY `processor_type`', + 'pseudowires' => 'SELECT COUNT(*) AS `total` FROM `pseudowires`', + 'sensors' => 'SELECT COUNT(*) AS `total`,`sensor_class` FROM `sensors` GROUP BY `sensor_class`', + 'wireless' => 'SELECT COUNT(*) AS `total`,`sensor_class` FROM `wireless_sensors` GROUP BY `sensor_class`', + 'storage' => 'SELECT COUNT(*) AS `total`,`storage_type` FROM `storage` GROUP BY `storage_type`', + 'toner' => 'SELECT COUNT(*) AS `total`,`toner_type` FROM `toner` GROUP BY `toner_type`', + 'vlans' => 'SELECT COUNT(*) AS `total`,`vlan_type` FROM `vlans` GROUP BY `vlan_type`', + 'vminfo' => 'SELECT COUNT(*) AS `total`,`vm_type` FROM `vminfo` GROUP BY `vm_type`', + 'vmware' => 'SELECT COUNT(*) AS `total` FROM `vminfo`', + 'vrfs' => 'SELECT COUNT(*) AS `total` FROM `vrfs`', 'mysql_version' => 'SELECT 1 AS `total`, @@version AS `version`', );