Commit Graph

4198 Commits

Author SHA1 Message Date
laf
807fc9a3ba Alerts gui commit 2014-12-16 20:03:19 +00:00
f0o
aeccdbb942 Cleanup for Scrutinizer 2014-12-15 14:33:31 +00:00
f0o
7d3fd3a29a Added field name into SQL-Table alert_templates 2014-12-15 14:25:03 +00:00
f0o
c0e1d9cbc5 Added Alerting 2014-12-15 11:10:26 +00:00
Neil Lathwood
dbf407746c Merge pull request #364 from laf/issue-laf-93
Fixed API route order to resolve get_port_graphs working
2014-12-12 20:20:58 +00:00
laf
a152f3566e Fixed API route order to resolve get_port_graphs working 2014-12-12 19:35:49 +00:00
Paul Gear
d9e35ff2c2 Merge pull request #360 from laf/issue-358
Added new API route for billing information
2014-12-06 18:54:05 +00:00
Paul Gear
6bf87f5958 Merge pull request #359 from laf/issue-laf-92
Fixed bill display issues when calculating CDR
2014-12-06 18:38:09 +00:00
laf
1bcc078853 Fixed formatting update 2014-12-02 23:44:23 +00:00
laf
1108ef7939 Added new api route for billing 2014-12-02 23:43:11 +00:00
laf
d9a5d11782 More fixes to CDR and Quota values 2014-12-02 21:38:32 +00:00
laf
13712b1aed Fixed bill display issues when calculating CDR 2014-12-02 21:16:08 +00:00
Paul Gear
9b609c5869 Merge pull request #357 from laf/issue-laf-91
Fixed global search box bootstrap code
2014-12-01 20:35:41 +00:00
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
e4e2cfe3cf Fixed global search box bootstrap code 2014-11-30 17:49:52 +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