Commit Graph

9805 Commits

Author SHA1 Message Date
laf
725fbd2c08 Another fix 2016-01-30 10:10:16 +00:00
laf
f4820dad90 Fixed code to run with php 5.3 2016-01-30 10:05:46 +00:00
Neil Lathwood
b72c1282d9 Merge pull request #2797 from BarbarossaTM/issue-386-v2
Ability to use ifIndex,ifName and ifDescr to create and update port rrd files
2016-01-29 13:05:03 +00:00
Neil Lathwood
7c79d62baf Merge pull request #2840 from adaniels21487/issue-1851
Cisco CBQOS
2016-01-29 10:21:34 +00:00
Neil Lathwood
aea87a4088 Merge pull request #2882 from Rosiak/master
Eaton Basics
2016-01-29 09:54:15 +00:00
Neil Lathwood
2733ee578e Merge pull request #2884 from QuxLabs/issue-2877
Added custom titles to graph widget
2016-01-29 09:54:00 +00:00
Daniel Preussker
fe6d37f273 Added custom titles to graph widget 2016-01-29 07:47:48 +00:00
Rosiak
e7e035305b Eaton Basics 2016-01-28 23:11:11 +01:00
Daniel Preussker
cc8a2cec17 Merge pull request #2880 from librenms/revert-2850-dup-alerts
Revert "Removes duplicate alerts from table alerts"
2016-01-28 19:10:09 +00:00
Daniel Preussker
d6cb01ef86 Revert "Removes duplicate alerts from table alerts" 2016-01-28 20:09:59 +01:00
Daniel Preussker
0235399d80 Merge pull request #2850 from mmarchand/dup-alerts
Removes duplicate alerts from table alerts
2016-01-28 19:09:20 +00:00
Neil Lathwood
57a7549446 Merge pull request #2764 from vitalisator/stp
Add STP port polling and device information
2016-01-28 19:08:09 +00:00
Mike Rostermund
163609ae73 Merge pull request #2864 from laf/issue-2847
Updated global rules
2016-01-28 15:36:02 +01:00
vitalisator
ff71629f34 remove logfie() 2016-01-28 15:10:51 +01:00
vitalisator
bcc253cccf fix sorting 2016-01-28 15:09:05 +01:00
vitalisator
5ab9051f4f remove conflict 2016-01-28 14:25:36 +01:00
vitalisator
0e66ddf088 some bugfixing 2016-01-28 13:07:33 +01:00
Neil Lathwood
e00a35c2ff Merge pull request #2867 from paulgear/master
Update per-module poller performance collection
2016-01-28 09:41:09 +00:00
Neil Lathwood
060bd55da8 Merge pull request #2868 from jbwiv/master
Added service description to option drop down for editing and deletin…
2016-01-27 18:52:22 +00:00
jbwiv
01c7a7e56c I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-01-27 13:33:14 -05:00
jbwiv
6b97135ec8 Removing unnecessary '(if populated)' text 2016-01-27 13:28:45 -05:00
jbwiv
a7cfc66cd6 Added service description to option drop down for editing and deleting services to make it easier to distinguish between services. 2016-01-26 17:17:19 -05:00
Aaron Daniels
e54e22b56e - Changed upper case variables to lower case. 2016-01-26 23:31:07 +10:00
Maximilian Wilhelm
63f18a86d4 Dear Scrutinizer, please check my code. Thank you. 2016-01-26 14:06:53 +01:00
Maximilian Wilhelm
8c704f7bdf Allow editing port association mode of a device.
Add a select box to the device SNMP edit page in the WebUI to update
  the port association mode of a device.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-01-26 13:50:00 +01:00
Maximilian Wilhelm
2ae99e50f5 Add support for setting port association mode when adding a host.
This adds a '-p' switch to addhost.php and a select box to the WebUI to
  set the port association mode for newly added devices.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-01-26 13:49:57 +01:00
Maximilian Wilhelm
4d78a0261e Update graph and port pages to use new RRD naming schema.
Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-01-26 13:49:54 +01:00
Maximilian Wilhelm
2c9df26bbf Update discovery and poller to allow stable interface mapping by ifName/ifDescr based port mapping.
By default libreNMS used the ifIndex to associate ports just found via SNMP
  with ports discoverd/polled before and stored in the database. On Linux boxes
  this is a problem as ifIndexes are rather likely to be unstable between reboots
  or (re)configuration of tunnel interfaces (think: GRE/OpenVPN/Tinc/...), bridges,
  Vlan interfaces, Bonding interfaces, etc.

  This patch adds a »port association mode« configuration option per device which
  allows to map discovered and known ports by their ifIndex, ifName, ifDescr, or
  maybe other means in the future.
  The default port association mode still is ifIndex for compatibility reasons.

  As port RRD files were stored by their ifIndex before, they are now identified
  by their unique and stable port_id to ensure a stable and unique mapping and
  allow future port association modes to be added without requireing any further
  internal changes. Existing RRD files are renamend accordingly in discovery and
  poller tools to ensure stability of port associations in both modules as we
  don't know which might run first after an update.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-01-26 13:49:30 +01:00
Paul Gear
99a76d4ea2 Update per-module poller performance collection
This makes the following changes:
- Record per-module performance data in the same measurement as overall poller-perf
- Add tags to distinguish modules
- Update rrd filenames
- Use stacked graph for poller modules
2016-01-26 20:20:42 +10:00
root
81ffa805c3 Merge remote-tracking branch 'librenms/master' into dup-alerts 2016-01-26 09:18:43 +01:00
root
a396608fae rename 2016-01-26 09:18:00 +01:00
Daniel Preussker
3e97875d77 Merge pull request #2787 from laf/anonymous-data
Added verbose debugging, normal debugging will now try and mask certain information
2016-01-26 08:09:05 +00:00
Vitali Kari
89f9e609b5 Merge pull request #1 from laf/stp
Updated stp branch
2016-01-26 08:32:22 +01:00
Daniel Preussker
3b6fb8c4c3 Merge pull request #2854 from laf/issue-2810
Added Lexmark printer support
2016-01-26 05:39:21 +00:00
Daniel Preussker
63fb8b560a Merge pull request #2861 from laf/issue-2843
Added link back to hardware node for VMs
2016-01-26 05:20:12 +00:00
Neil Lathwood
60603520df Updated stp branch 2016-01-26 01:40:08 +00:00
Mike Rostermund
e65fd24fff Merge pull request #2865 from laf/nagios-transport-fix
Fixed nagios transport
2016-01-26 01:01:55 +01:00
laf
26d96ba718 Fixed nagios transport 2016-01-25 23:58:38 +00:00
laf
87347bc8f8 Updated global rules 2016-01-25 23:47:00 +00:00
laf
6b72da4a00 Updated global rules 2016-01-25 23:45:46 +00:00
Mike Rostermund
273ffd0e68 Merge pull request #2863 from laf/docs-log
Updated install docs so users do not chown logs directory
2016-01-26 00:26:19 +01:00
laf
b7630667f4 Removed logs folder from being excluded from validate check 2016-01-25 23:17:02 +00:00
laf
24c14f2525 Updated install docs so users do not chown logs directory 2016-01-25 23:14:32 +00:00
laf
44ac0e9cf9 Added link back to hardware node for VMs 2016-01-25 22:04:12 +00:00
Neil Lathwood
6d026575ec Merge pull request #2860 from murrant/remove_ldap_success
Remove Success output from homepage when using AD Auth.
2016-01-25 19:33:25 +00:00
Tony Murray
b9448a61a8 Remove Success output from homepage when using AD Auth. 2016-01-25 13:10:51 -06:00
Mike Rostermund
858dbfbe79 Merge pull request #2858 from librenms/f0o-daily-typo
Typo in Daily
2016-01-25 15:15:30 +01:00
Daniel Preussker
ddfdbfac4d Typo in Daily 2016-01-25 14:14:08 +00:00
Daniel Preussker
557344a511 Merge pull request #2853 from laf/vminfo
Fixed silly sql build for vminfo table
2016-01-25 10:59:26 +00:00
laf
9b1d2f31a1 Added Lexmark printer support 2016-01-24 23:57:24 +00:00