Commit Graph

3984 Commits

Author SHA1 Message Date
Paul Gear 05d998c1f8 Merge remote-tracking branch 'laf/issue-laf-90'
Conflicts:
	html/api_v0.php
	html/includes/api_functions.inc.php
2014-12-01 20:27:50 +00:00
Paul Gear 3e9b670179 Merge pull request #355 from laf/issue-laf-89
Added new API route for retrieving available device graphs
2014-12-01 19:40:43 +00:00
laf 0a7a1a0ef6 Added docs for the route 2014-11-30 17:11:08 +00:00
laf 1a3f5504d0 Added new API route to obtain available ports for a device 2014-11-30 15:45:10 +00:00
laf 4d7b4ef432 Added new route for retrieving available device graphs 2014-11-29 15:43:19 +00:00
Neil Lathwood f25311587a Merge pull request #354 from laf/master
Removed check for image/png content-type
2014-11-29 14:37:19 +00:00
Neil Lathwood 744f3d81c9 Removed check for image/png content-type
14:08 <lafwood> blahdeblah: Quick question about the portgroups api route, you added a check for image/png
14:09 <lafwood> I'm not sure that's what that function is meant for. Event sending -H "Accept: image/png" on a curl request fails. I think this is for checking if you send an image to the api rather than what's to be output
14:27 <lafwood> Sending -H "Content-type: image/png" works but this for defining what content-type the request will send.
14:29 <lafwood> I think the curl request needs to send an Accept and then the API check for this, I'll put a PR through to remove the current code until it can be looked at in more detail.
2014-11-29 14:29:58 +00:00
Neil Lathwood b71f4db4e3 Merge pull request #353 from sbadia/markdown-flavored
Use markdown syntax on agent and billing documentation
2014-11-28 20:49:35 +00:00
Sebastien Badia f1ac916229 doc: Update markdown flavored syntax (using linguist) 2014-11-28 01:30:59 +01:00
Sebastien Badia 7a070e2a9f doc: Clean whitespaces in documentation 2014-11-28 01:25:45 +01:00
Paul Gear c4c419a706 Merge branch 'issue-laf-85'
Conflicts:
	html/api_v0.php
	html/pages/api-docs.inc.php
2014-11-25 21:47:56 +10:00
Paul Gear 9930670119 Tidy API entry points & doc; error if something other than image/png is asked for from portgroup graphs 2014-11-25 21:45:15 +10:00
Neil Lathwood d9e142a3f5 Merge pull request #349 from laf/issue-laf-85
Added new route to display graphs for peering,transit and core
2014-11-25 09:30:18 +00:00
laf c1e8916318 Incorrect function being called 2014-11-25 09:15:53 +00:00
laf c980c467d8 Update api route to portgroups 2014-11-24 04:10:21 +00:00
Neil Lathwood ab2b1e25cc Merge pull request #352 from paulgear/master
Basic recognition of EdgeOS
2014-11-23 22:19:10 +00:00
Paul Gear 935e51d3c8 Merge remote-tracking branch 'laf/issue-laf-85' into issue-laf-85 2014-11-23 19:19:58 +10:00
Paul Gear 1f9e19929b Merge branch 'master' of git://github.com/librenms/librenms 2014-11-23 12:37:47 +10:00
Neil Lathwood c96b9f5ee0 Merge pull request #351 from paulgear/vyos-support
Basic recognition of VyOS
2014-11-22 15:42:09 +00:00
Paul Gear 06780f1003 Testing EdgeOS support 2014-11-22 20:23:02 +10:00
Paul Gear 5196e0c6a4 Seemingly tested VyOS support 2014-11-22 18:36:05 +10:00
Paul Gear e60245b4f2 More testing of VyOS support 2014-11-22 18:11:56 +10:00
Paul Gear f254bc465f Resize VyOS image 2014-11-22 17:52:23 +10:00
Paul Gear 198cf9ac08 Testing VyOS support 2014-11-22 17:47:32 +10:00
laf 213ba09f9f Fixed some scrutinizer issues 2014-11-12 23:19:57 +00:00
laf 3522f66f69 Added new route to display graphs for peering,transit and core 2014-11-12 23:05:47 +00:00
Paul Gear 62532e652f Add pagination at top 2014-11-12 20:56:14 +10:00
Paul Gear a8341c7608 Stylistic fixes 2014-11-12 20:55:49 +10:00
Paul Gear b705233a0c Merge PR#336: Updated eventlog page to use paged results 2014-11-12 20:54:59 +10:00
Paul Gear 3460031135 Stylistic fixes 2014-11-12 19:42:44 +10:00
Paul Gear d39956454c Merge Neil's changes for 'Updated edit snmp device section to show relevant v1,v2c or v3 options #317' 2014-11-12 19:31:30 +10:00
Paul Gear 91c2a5a628 Merge pull request #311 from laf/issue-laf-50
Updated scripts to remove observium name + use new version of check_mk
2014-11-12 19:27:11 +10:00
Paul Gear e77c4ce61b Merge pull request #346 from laf/issue-laf-84
Added a preg_replace to get rid of snmp errors for bgp graphs
2014-11-12 19:14:25 +10:00
Paul Gear de52585796 Merge pull request #335 from laf/issue-laf-74
Added bgp peers route to display all bgp peers
2014-11-12 19:13:12 +10:00
Paul Gear 3f29197f4b Merge pull request #334 from laf/issue-laf-73
Fixed BGP session count to exclude sessions that no longer have a device associated
2014-11-12 19:10:16 +10:00
Neil Lathwood 47e52d9eb1 Merge pull request #347 from toyowheelin/issue-131
issue-131
2014-11-07 17:21:57 +00:00
Greg 6361e183e0 This is a workaround to show d-link port channel devices. Thanks to lafwood for this. 2014-11-07 08:50:59 -08:00
laf 3f2b39550f Added a preg_replace to get rid of snmp errors 2014-11-06 21:12:42 +00:00
Neil Lathwood 638ea2fa64 Merge pull request #345 from f0o/patch-2
Update INSTALL_RHEL.md
2014-11-06 08:01:00 +00:00
Daniel Preussker 590053d126 Update INSTALL_RHEL.md
Added nginx+php-fpm instructions
2014-11-06 07:57:12 +00:00
Neil Lathwood 296bc95de0 Merge pull request #344 from laf/issue-laf-83
Added more js libraries to scrutinizer exclude
2014-11-03 19:13:44 +00:00
Neil Lathwood 4e035751ba Merge pull request #343 from elbuit/issue-341
Add option to clean old perf_times table entries #341
2014-11-03 18:50:22 +00:00
laf 322df1b571 Added more js libraries to scrutinizer exclude 2014-11-03 18:40:06 +00:00
Toni Cunyat 5b6ae9f988 Add option to clean old perf_times table entries #341 2014-11-03 18:25:45 +01:00
Neil Lathwood 30256d60cb Merge pull request #340 from elbuit/issue-338
Alcatel-Lucent OmniSwich (Aruba rebranded) is detected like AOS device ...
2014-11-03 16:29:51 +00:00
Neil Lathwood d780fc060a Merge pull request #342 from elbuit/master
I agree to the conditions of the Contributor Agreement contained in doc/...
2014-11-03 16:26:18 +00:00
Toni Cunyat d1bea37236 I agree to the conditions of the Contributor Agreement contained in doc/CONTRIBUTING.md 2014-11-03 16:55:01 +01:00
Toni Cunyat eefb5eb974 Alcatel-Lucent OmniSwich (Aruba rebranded) is detected like AOS device #338 2014-11-03 16:40:20 +01:00
laf fca7252a74 updated sql queries 2014-11-02 20:31:26 +00:00
laf f2a66b1ea8 updated incorrectly named variable reference 2014-11-02 20:28:43 +00:00