mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
3e35ee0e7d
- Fix location so it is a regular database relation (this allows multiple devices to be accurately linked to one location and saves api calls) - Parse coordinates from the location more consistently - Add settings to webui - ~~Used [PHP Geocoder](http://geocoder-php.org/), which has lots of backends and is well tested. (also includes reverse and geoip)~~ - Google Maps, Bing, Mapquest, and OpenStreetMap supported initially. - Default to OpenStreetMap, which doesn't require a key. They will liberally hand out bans if you exceed 1 query per second though. - All other Geocoding APIs require an API key. (Google requires a credit card on file, but seems to be the most accurate) - Update all (I think) sql queries to handle the new structure - Remove final vestiges of override_sysLocation as a device attribute - Update existing device groups and rules in DB - Tested all APIs with good/bad location, no/bad/good key, and no connection. - Cannot fix advanced queries that use location This blocks #8868 DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert.
81 lines
3.5 KiB
YAML
81 lines
3.5 KiB
YAML
applications:
|
|
applications:
|
|
excluded_fields: [device_id, app_id, timestamp]
|
|
application_metrics:
|
|
excluded_fields: [app_id]
|
|
joins:
|
|
- { custom: 'INNER JOIN (SELECT app_id, app_type FROM applications WHERE `device_id`=?) I USING (app_id)', select: ['app_type'] }
|
|
custom_where: ''
|
|
order_by: metric
|
|
arp-table:
|
|
ipv4_mac:
|
|
excluded_fields: [device_id, port_id]
|
|
order_by: ipv4_mac.context_name, ipv4_mac.ipv4_address, ipv4_mac.mac_address
|
|
bgp-peers:
|
|
bgpPeers:
|
|
excluded_fields: [device_id, bgpPeer_id]
|
|
joins:
|
|
- { left: bgpPeers.device_id, right: devices.device_id, select: [bgpLocalAs] }
|
|
bgpPeers_cbgp:
|
|
excluded_fields: [device_id]
|
|
fdb-table:
|
|
ports_fdb:
|
|
excluded_fields: [device_id, ports_fdb_id, port_id, vlan_id]
|
|
joins:
|
|
- { left: ports_fdb.port_id, right: ports.port_id, select: [ifIndex] }
|
|
- { left: ports_fdb.vlan_id, right: vlans.vlan_id, select: [vlan_vlan] }
|
|
order_by: ports.ifIndex, vlans.vlan_vlan, ports_fdb.mac_address
|
|
mempools:
|
|
mempools:
|
|
excluded_fields: [device_id, mempool_id]
|
|
ports:
|
|
ports:
|
|
excluded_fields: [device_id, port_id, poll_time, poll_period, ifVrf]
|
|
joins:
|
|
- { left: ports.port_id, right: ports_statistics.port_id }
|
|
order_by: ports.ifIndex, ports.ifDescr, ports.ifName
|
|
os:
|
|
devices:
|
|
included_fields: [sysName, sysObjectID, sysDescr, sysContact, version, hardware, features, location, os, type, serial, icon]
|
|
joins:
|
|
- { left: devices.location_id, right: locations.id, select: [location] }
|
|
processors:
|
|
processors:
|
|
excluded_fields: [device_id, processor_id]
|
|
sensors:
|
|
sensors:
|
|
excluded_fields: [device_id, sensor_id, state_translation_id, state_index_id, sensors_to_state_translations_id, lastupdate]
|
|
joins:
|
|
- { left: sensors.sensor_id, right: sensors_to_state_indexes.sensor_id }
|
|
- { left: sensors_to_state_indexes.state_index_id, right: state_indexes.state_index_id }
|
|
order_by: sensors.sensor_class, sensors.sensor_type, sensors.sensor_index
|
|
state_indexes:
|
|
excluded_fields: [device_id, sensor_id, state_translation_id, state_index_id, state_lastupdated]
|
|
joins:
|
|
- { left: state_indexes.state_index_id, right: state_translations.state_index_id }
|
|
- { custom: 'INNER JOIN ( SELECT i.state_index_id FROM `sensors_to_state_indexes` i LEFT JOIN `sensors` s ON (i.`sensor_id` = s.`sensor_id`) WHERE `device_id`=? GROUP BY i.state_index_id) d ON d.state_index_id = state_indexes.state_index_id' }
|
|
order_by: state_indexes.state_name, state_translations.state_value
|
|
custom_where: ''
|
|
storage:
|
|
storage:
|
|
excluded_fields: [device_id, storage_id]
|
|
toner:
|
|
toner:
|
|
excluded_fields: [device_id, toner_id]
|
|
order_by: toner_oid, toner_index
|
|
vlans:
|
|
vlans:
|
|
excluded_fields: [vlan_id, device_id]
|
|
order_by: vlan_domain, vlan_vlan
|
|
ports_vlans:
|
|
excluded_fields: [port_vlan_id, device_id, port_id]
|
|
order_by: vlan, baseport
|
|
vrf:
|
|
vrfs:
|
|
excluded_fields: [vrf_id, device_id]
|
|
joins:
|
|
- { custom: "JOIN (SELECT ifVrf, GROUP_CONCAT(ifIndex ORDER BY ifIndex ASC SEPARATOR ',') as ifIndices FROM ports GROUP BY ifVrf) p ON p.ifVrf = vrfs.vrf_id", select: ["p.ifIndices"] }
|
|
wireless:
|
|
wireless_sensors:
|
|
excluded_fields: [device_id, sensor_id, access_point_id, lastupdate]
|