mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2969 from librenms/revert-2935-pblasquez-location_map_regex

Browse Source 
Revert "Added location_map_regex"
This commit is contained in:
Daniel Preussker
2016-02-09 19:01:03 +00:00
parent 3b19af910b 1110836662
commit 4cc523aeb0
4 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.md
View File

@@ -83,7 +83,6 @@ LibreNMS contributors:
- Maximilian Wilhelm <max@rfc2324.org> (BarbarossaTM)
- Jameson Finney <jameson.finney@gmail.com> (JamesonFinney)
- John Wells <john.wells@greatworx.com> (jbwiv)
- Paul Blasquez <pblasquez@gmail.com> (pblasquez)
[1]: http://observium.org/ "Observium web site"
Observium was written by:

7
doc/Support/Configuration.md
View File

@@ -379,15 +379,10 @@ NFSen integration support.
#### Location mapping
Exact Matching:
```php
$config['location_map']['Under the Sink'] = "Under The Sink, The Office, London, UK";
```
Regex Matching:
```php
$config['location_map']['/Sink/'] = "Under The Sink, The Office, London, UK";
```
The above are examples, these will rewrite device snmp locations so you don't need to configure full location within snmp.
The above is an example, this will rewrite basic snmp locations so you don't need to configure full location within snmp.
#### Interfaces to be ignored

2
includes/polling/core.inc.php
View File

@@ -85,7 +85,7 @@ $poll_device['sysLocation'] = str_replace('"', '', $poll_device['sysLocation']);
$poll_device['sysLocation'] = trim($poll_device['sysLocation'], '\\');
// Rewrite sysLocation if there is a mapping array (database too?)
if (!empty($poll_device['sysLocation']) && (is_array($config['location_map']) || is_array($config['location_map_regex']))) {
if (!empty($poll_device['sysLocation']) && is_array($config['location_map'])) {
$poll_device['sysLocation'] = rewrite_location($poll_device['sysLocation']);
}

9
includes/rewrites.php
View File

@@ -5,15 +5,6 @@ function rewrite_location($location) {
// FIXME -- also check the database for rewrites?
global $config, $debug;
if (is_array($config['location_map_regex'])) {
foreach ($config['location_map_regex'] as $reg => $val) {
if (preg_match($reg, $location)) {
$location = $val;
continue;
}
}
}
if (isset($config['location_map'][$location])) {
$location = $config['location_map'][$location];
}