Commit Graph

1831 Commits

Author SHA1 Message Date
Neil Lathwood fa8027b525 Merge pull request #3065 from adaniels21487/issue-3038
CBQoS not displaying policies
2016-02-23 10:58:50 +00:00
Aaron Daniels f18fa9e455 - Pre-Init the $options array.
In some scenarios $options was already set with a previous filter.
- Remove RRD file checking, test for existance of components instead.
2016-02-23 17:16:51 +10:00
f0o dcbe31fe6b Added last-check on services 2016-02-22 08:38:51 +00:00
Neil Lathwood 46a17eabf0 Merge pull request #2957 from Rosiak/issue-2557
Make Global Search Limit Configurable
2016-02-20 10:30:48 +00:00
Daniel Preussker 731e43bc66 Revert "[WIP] Sanity!" 2016-02-17 13:59:58 +00:00
Neil Lathwood 633ac101eb Merge pull request #2979 from f0o/sanity
[WIP] Sanity!
2016-02-16 21:44:10 +00:00
Rosiak 1c630b0b8d Move function to WebUI
Based on Neil’s suggestion.
2016-02-13 21:09:45 +01:00
Tony Murray f824fd123e Always define $config_total. Default is 1. 2016-02-12 14:44:32 -06:00
Tony Murray 564146dc8c Fix inverted diff. 2016-02-12 14:40:04 -06:00
Tony Murray 31897758e5 Restore $config['oxidized']['features']['versioning']. 2016-02-12 14:27:55 -06:00
Tony Murray cc344bf3c3 Use Oxidized's built in diffing capability. Drops the need for xdiff and one http call. 2016-02-12 14:21:55 -06:00
Tony Murray 28216f67b0 Merge branch 'master' into config_diff 2016-02-12 10:36:18 -06:00
Tony Murray aa9d4798dc Remove $config['oxidized']['features']['versioning']. I did not update the schema to remove the entry from the config table.
Update the documentation a bit.

Issue #2812
2016-02-12 10:23:49 -06:00
Daniel Preussker e064d7ddff Merge pull request #2988 from laf/issue-2947
Added show/hide line numbers button to show config page
2016-02-12 08:12:41 +00:00
laf 6b7030c082 Added show/hide line numbers button to show config page 2016-02-11 23:19:56 +00:00
laf 4aaf4d8a7b Added missing from email settings field 2016-02-11 22:11:07 +00:00
Neil Lathwood a9e81c2bfb Merge pull request #2955 from arjitc/patch-24
Merge launch, SSH, telnet and settings into 1 dropdown
2016-02-11 21:43:26 +00:00
Tony Murray 9a2d22df0a Remove array_column() use, it requires php 5.5 2016-02-10 19:24:13 -06:00
Tony Murray 0e8ea8b6b2 Mark displayed diffs. 2016-02-10 17:16:59 -06:00
Tony Murray b5106f4e17 Generate and display diffs between versions. Clicking show diff generates a diff between the shown version and the selected version. 2016-02-10 14:51:40 -06:00
Neil Lathwood fa783dc07e Merge pull request #2841 from adaniels21487/issue-2665
Cisco OTV
2016-02-10 19:49:59 +00:00
f0o c767a26732 more bulk sanity 2016-02-10 16:02:13 +00:00
f0o f606369309 Bulk cosmetic fixes 2016-02-10 15:40:50 +00:00
Neil Lathwood 29f3dac9be Merge pull request #2972 from murrant/issue-2883
Deal with 0 value for sensor data better.
2016-02-09 21:11:26 +00:00
Tony Murray e3ec42c06d Deal with 0 value for sensor data better.
Issue #2883
2016-02-09 14:20:36 -06:00
Neil Lathwood 3704ff2c67 Merge pull request #2964 from ohrensessel/correct-quotes
Fix usage of single quotes, double quotes needed
2016-02-09 20:10:51 +00:00
Neil Lathwood 5f0c150d42 Merge pull request #2946 from murrant/oxidized_group_versions
Fix oxidized versioning + groups
2016-02-09 19:25:22 +00:00
ohrensessel b016763007 Fix usage of single quotes, double quotes needed 2016-02-09 13:27:10 +01:00
Arjit Chaudhary 9cd0820445 use bootstraps own pull-right so that the dropdown draws inside the page width 2016-02-08 22:55:18 +05:30
Arjit Chaudhary 729a0d6a62 Merge launch, SSH, telnet and settings into 1 dropdown
Screenshot: http://i.imgur.com/vV30EKQ.png
2016-02-08 22:51:09 +05:30
Tony Murray 89f596fdbb Fix oxidized versioning + groups
Consilidate config fetching rather than having two fetches with the first always failing when the device has a group.
2016-02-05 15:23:05 -06:00
Mark Schouten be225148ca There was one more include that screwed up the Ceph graphs 2016-02-05 14:50:27 +01:00
Neil Lathwood 0602c6a3ed Merge pull request #2915 from adaniels21487/issue-2914
BGP Pages call overlib directly not honouring $config['web_mouseover']
2016-02-02 22:06:57 +00:00
Aaron Daniels 4ebc2b1f33 - Modified code to use graph generation functions instead of calling overlib directly.
The graph generation functions check for the status of 'web_mouseover'.
2016-02-03 06:41:20 +10:00
Mark Schouten 4150b86205 Make ceph.inc.php compatible with the new graph_array-method, which gets reset after each include. 2016-02-02 11:05:59 +01:00
Mike Rostermund ac572e1558 Sort sensors by OID to more logically group sensors on device overview 2016-01-30 23:02:09 +01: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 57a7549446 Merge pull request #2764 from vitalisator/stp
Add STP port polling and device information
2016-01-28 19:08:09 +00:00
vitalisator 0e66ddf088 some bugfixing 2016-01-28 13:07:33 +01:00
Aaron Daniels d96e2216a7 - Changed upper case variables to lower case. 2016-01-28 07:04:12 +10: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 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
vitalisator dc933184f0 stp-ports bootgrid 1 2016-01-24 18:50:10 +01:00
vitalisator b476c5bf99 add STP Ports 2016-01-24 18:45:19 +01:00
João Galaghar dd345b679c Update notifications.inc.php 2016-01-23 23:45:34 +00:00