Commit Graph
100 Commits
Author SHA1 Message Date
Paul Gear 42881d3124 Merge pull request #472 from laf/issue-laf-119
Added support for api demo account
2015-02-17 10:46:44 +10:00
Paul Gear f47b03d5d8 Merge pull request #471 from laf/issue-laf-118
Enable support for adding a demo user
2015-02-17 10:46:23 +10:00
Paul Gear d2bafde76c Merge pull request #452 from Rosiak/master
AUTHORS.md Agreement
2015-02-14 11:26:35 +10:00
Paul Gear 4bc8cdbca2 Merge branch 'master' of git://github.com/librenms/librenms 2015-02-12 09:40:34 +10:00
Paul Gear bd17de8eb7 Provide local junk dir; ignore contents 2015-02-06 08:59:42 +10:00
Paul Gear 78d7158d25 Merge pull request #441 from laf/issue-laf-41
Updated sub-menu to be icons
2015-02-04 08:47:40 +10:00
Paul Gear 93d7ddaf2a Merge pull request #440 from laf/issue-laf-41
Added a sub-menu on the device list page to enable quick access to features
2015-02-04 08:17:59 +10:00
Paul Gear cfa445b117 Merge pull request #436 from laf/issue-laf-33
Removed un-needed header redirect
2015-02-02 13:58:33 +10:00
Paul Gear 48facb15c9 Merge pull request #435 from laf/issue-laf-114
Added message box when devices haven't been polled for 15 minutes or more but marked as up still
2015-02-02 13:58:28 +10:00
Paul Gear 1c0cd78841 Move Observium welcome out of top level docs and update 2015-01-24 21:01:25 +10:00
Paul Gear 4352ec72c5 Fix link 2015-01-24 20:42:48 +10:00
Paul Gear 6f9fc954e8 Point to the correct location of AUTHORS.md 2015-01-24 20:42:21 +10:00
Paul Gear 061baf6f1c Remove individual contributor names from about page 2015-01-24 20:36:19 +10:00
Paul Gear 9c3621b3ef Update Contributing.md
Fix document title
2015-01-24 19:53:24 +10:00
Paul Gear 7e12067e61 Merge master; resolve doc/Extensions/Agent-Setup.md conflict 2015-01-22 20:40:27 +10:00
Paul Gear 220cb5e034 Merge branch 'laf-issue-99'
(Changed doc/General/Contributing.md to use Unix file format instead of
DOS.)
2015-01-22 20:37:39 +10:00
Paul Gear 68147d9b68 Merge branch 'issue-laf-99' of https://github.com/laf/librenms into laf-issue-99 2015-01-22 20:33:30 +10:00
Paul Gear e1579ba8c8 Merge pull request #414 from laf/issue-laf-107
Updated about page to tidy up
2015-01-22 19:57:01 +10:00
Paul Gear 6df50d0125 Merge pull request #389 from laf/issue-laf-101
Added option to disable footer in web interface
2015-01-22 19:56:13 +10:00
Paul Gear b37a408f62 Merge pull request #393 from laf/issue-laf-105
Added Hikvision support
2015-01-06 19:32:41 +10:00
Paul Gear 0070fdbfbf Merge pull request #391 from laf/issue-laf-102
Updated login page visually
2015-01-06 19:17:15 +10:00
Paul Gear 9d7bea4b06 Merge pull request #376 from laf/issue-laf-100
Updated location of API docs
2015-01-06 19:11:34 +10:00
Paul Gear e867d3f1df Merge branch 'alerting-dirty' of https://github.com/f0o/librenms into f0o-alerting-dirty 2014-12-21 12:56:29 +10:00
Paul Gear 56aa518608 Merge pull request #369 from laf/alert-api
API for alerting
2014-12-21 12:54:36 +10:00
Paul Gear 67052ed0c9 Merge pull request #367 from laf/alerts
GUI for alerts system
2014-12-21 12:53:58 +10: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
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
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
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
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
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
Paul Gear 2d4217995e Merge pull request #309 from laf/issue-laf-55
Removed --no-edit for git pull, not a valid command before git 1.7.10
2014-10-28 08:44:13 +10:00
Paul Gear 8ab0bcb324 Remove unused jqplot functions (was PR#306) 2014-10-28 08:39:19 +10:00
Paul Gear f7821198da Updated graphs page to use bootstrap datetimepicker PR#306
- Separated from removal of jqplot code
- Merge remote-tracking branch 'laf/issue-laf-52'

Conflicts:
	html/index.php
2014-10-28 08:37:49 +10:00
Paul Gear ce62a1d324 Merge pull request #329 from laf/issue-laf-76
Added link to changelog
2014-10-28 07:58:21 +10:00
Paul Gear 2fbdfe4cfd Integrate moment PR#308 2014-10-28 07:47:52 +10:00
Paul Gear 736888ee8a Integrate bootstrap datetimepicker PR#308 2014-10-28 07:46:08 +10:00
Paul Gear 99341e5a90 Documentation refresh with focus on contribution guidelines 2014-10-28 06:53:25 +10:00
Paul Gear 24e20bb847 Merge commit 'a07849b73a0c73c2bcee75d4e1649db239a8b93f' as 'html/js/moment' 2014-10-28 05:59:36 +10:00
Paul Gear a07849b73a Squashed 'html/js/moment/' content from commit d5ff2cf
git-subtree-dir: html/js/moment
git-subtree-split: d5ff2cfc0000010c37cc5ebe75a5905c943368e4
2014-10-28 05:59:36 +10:00
Paul Gear 75c4ce4edb Genericise Makefile and do not ignore it 2014-10-28 05:56:36 +10:00
Paul Gear 0d704de9b0 Merge commit 'cc43b3595b596d50b7891ad8cbf0830c5c92f609' as 'html/js/datetime' 2014-10-25 09:38:01 +10:00
Paul Gear cc43b3595b Squashed 'html/js/datetime/' content from commit 5b3fc61
git-subtree-dir: html/js/datetime
git-subtree-split: 5b3fc61571b126116aafbcd5cb1a7aefb41f9d42
2014-10-25 09:38:01 +10:00
Paul Gear f7892d0c5a A little note for later 2014-10-25 09:16:20 +10:00
Paul Gear b5136b444c Remove unused function; make it clearer that _json_format is not used in PHP 5.4 & later 2014-10-25 09:16:07 +10:00
Paul Gear 208ac0b104 Merge remote-tracking branch 'laf/issue-laf-47' 2014-10-25 08:49:28 +10:00
Paul Gear 0131e8e7c3 Fix example community string 2014-10-25 08:44:51 +10:00
Paul Gear 1a5544116f Use $() consistently; fail if dirname or cd fails 2014-10-25 08:41:53 +10:00
Paul Gear 70bb420fe7 Use consistent spacing 2014-10-25 08:40:42 +10:00
Paul Gear 5564a581da Merge pull request #328 from laf/issue-laf-72
Fixes the fact daily.sh does not run outside of the install directory
2014-10-24 08:38:51 +10:00
Paul Gear d8b0d8224a Merge pull request #324 from laf/issue-laf-69
Added additional text to email alerts that will show icmp or snmp when a down alert is generated
2014-10-22 22:03:48 +10:00
Paul Gear fd1d972640 Merge pull request #323 from laf/issue-laf-68
Added options for fping to retry and timeout
2014-10-22 22:02:56 +10:00
Paul Gear 5f08c36043 Merge pull request #321 from laf/issue-laf-66
Added stripslashes to fix formatting issues
2014-10-22 21:59:20 +10:00
Paul Gear a4be1a8501 Merge pull request #320 from laf/issue-laf-65
poll-device.php is no longer used / needed.
2014-10-22 21:58:45 +10:00
Paul Gear 39ed79c7e4 Merge pull request #318 from laf/issue-laf-64
Updated transport list to be generated from $config values
2014-10-22 21:58:07 +10:00
Paul Gear 69c3d926ff Merge pull request #315 from laf/issue-laf-58
Added the ability to call the api for a list of endpoints
2014-10-22 21:46:34 +10:00
Paul Gear 2832872c87 Merge pull request #314 from laf/issue-laf-60
Added names to all the relevant api routes
2014-10-22 21:42:30 +10:00
Paul Gear 15392ecf40 Merge pull request #313 from laf/issue-laf-61
Added a response code when things are ok - oops
2014-10-22 21:37:39 +10:00
Paul Gear 90c41ff650 Merge pull request #312 from laf/issue-laf-59
Removed trailing slash from v0 part of the uri
2014-10-22 21:37:17 +10:00
Paul Gear 9bf617b586 Merge pull request #310 from laf/issue-laf-54
Updated authToken response code to be 401
2014-10-22 21:34:21 +10:00
Paul Gear 71a3eb1c76 Merge pull request #301 from laf/issue-laf-46
Added authlog purge + improved efficiency of clearing out large syslog tables
2014-10-18 18:43:27 +10:00
Paul Gear b400ff839d Merge pull request #307 from laf/issue-laf-53
Updated adduser to check for existing user and use password hashing
2014-10-11 16:16:41 +10:00
Paul Gear 7b26b4d79f Merge pull request #305 from laf/issue-laf-51
Added a LIMIT 10 into all the front page boxes
2014-10-11 15:58:55 +10:00
Paul Gear 88fb66c774 Merge pull request #303 from laf/issue-laf-48
Updated addhost page to only show relevant snmp v1/v2c/v3 options
2014-10-07 20:13:38 +10:00
Paul Gear 5887009b63 Merge pull request #300 from laf/issue-laf-44
Added a route to the API that will get vlans for a given device
2014-10-07 19:56:01 +10:00
Paul Gear e6fe3bea4f Merge pull request #294 from laf/api
Added the ability to create tokens
2014-10-07 19:41:47 +10:00
Paul Gear 3d0c11bca4 Merge pull request #299 from laf/issue-laf-43
Added a new library to support on screen notification messages
2014-10-07 19:40:42 +10:00
Paul Gear d665a101ac Merge pull request #297 from laf/issue-laf-42
Fixed the placement of overlib popup images
2014-10-07 19:32:41 +10:00
Paul Gear b4cc92475d Merge pull request #295 from laf/issue-laf-37
Adding ping and poller graphs for devices
2014-10-07 19:31:21 +10:00
Paul Gear 5f9ebd1551 Fix MAC address change false positives 2014-09-28 11:07:30 +10:00
Paul Gear 0852cb34dd Merge pull request #291 from paulgear/master
API additions and updates; minor tidies
2014-09-28 11:06:22 +10:00
Paul Gear 11f475b405 Syntaxy fix 2014-09-28 09:56:33 +10:00
Paul Gear 1783958896 Revert "Don't exclude plugins from git"
This reverts commit a38b2f37c2.
2014-09-28 09:33:29 +10:00
Paul Gear 508e0b816d Fix Scrutinizer errors 2014-09-28 09:30:36 +10:00
Paul Gear 8a3117f0dc Rewrite ugly if-else one-liners as ternary operator 2014-09-28 09:30:18 +10:00
Paul Gear d6245fd6ba Correctly set error code for missing SNMP version 2014-09-27 18:34:23 +10:00
Paul Gear 82613f17ee keep scrutinizer from complaining about snmpver not being set for all execution paths 2014-09-27 18:27:45 +10:00
Paul Gear cb8afb0451 Remove obsolete function (already provided by getidbyname) 2014-09-27 16:35:31 +10:00
Paul Gear e48c1a6730 Use more accurate HTTP status code for device add 2014-09-27 16:34:43 +10:00
Paul Gear 9d4a9dfa30 Re-implement get_device using existing primitives 2014-09-27 16:34:36 +10:00
Paul Gear 48d3a43669 Tidy device deletion 2014-09-27 16:32:55 +10:00
Paul Gear 7a1d342348 Order devices by API entry point 2014-09-27 15:26:27 +10:00
Paul Gear 76f5ab87a9 Add function to get information about a single device 2014-09-27 15:25:43 +10:00