c64345bd5d
Merge branch 'laf-issue-laf-110-new'
2015-06-07 10:44:47 +00:00
2467b11290
Merge branch 'issue-laf-110-new' of git://github.com/laf/librenms into laf-issue-laf-110-new
...
Conflicts:
html/pages/health/mempool.inc.php
includes/defaults.inc.php
2015-06-07 10:44:39 +00:00
d121fed936
Merge pull request #1202 from paulgear/minor-tidies
...
Minor tidies
2015-06-07 07:32:04 +00:00
a80e4cd87b
Merge pull request #1203 from librenms/f0o-hotfix-1
...
Fix fatal in scripts/shoutcast.php
2015-06-06 17:55:54 +00:00
0a9d8c92c3
Fix fatal in scripts/shoutcast.php
...
[lint] PHP Fatal error: Call-time pass-by-reference has been removed in /var/lib/jenkins/jobs/librenms/workspace/scripts/shoutcast.php on line 43
2015-06-06 17:55:40 +00:00
49833273e7
Make comment reflect code
2015-06-06 07:50:23 +10:00
c149b0f47c
Remove unused os type
2015-06-06 07:47:14 +10:00
418416457b
Make source layout consistent with all the other aruba files
2015-06-06 07:46:16 +10:00
c27cb9d803
Source tree has files with spaces in their names now
2015-06-06 07:45:36 +10:00
960da3c8b8
Merge pull request #1194 from neokjames/master
...
Issued alerts add to the eventlog
2015-06-05 08:38:35 +00:00
f56c8c4425
Fixed indentation
2015-06-04 22:15:22 +10:00
45d7ff0a73
Added log_event for issued alerts
2015-06-04 22:13:45 +10:00
719c2bc63e
Testing log_event for issued alerts
2015-06-04 21:55:26 +10:00
ae2f7eb98f
Merge pull request #1193 from SaaldjorMike/syslog-style
2015-06-04 11:41:01 +01:00
cdd597a17e
Fixed same height for input fields on /syslog/
2015-06-04 12:27:49 +02:00
b71ae21054
Merge pull request #1191 from SaaldjorMike/syslog-perms
2015-06-04 10:25:31 +01:00
61d77e72c5
Hide link to syslog for device if syslog is disabled.
2015-06-04 09:19:48 +02:00
455c619290
Merge pull request #1192 from Rosiak/mempool-bootgrid
...
Convert memory page to use bootgrid
2015-06-04 00:56:47 +01:00
250b58ea8b
Minor corrections to memory bootgrid
2015-06-04 00:08:53 +02:00
f9322a29c6
Convert memory page to use bootgrid
2015-06-03 23:39:54 +02:00
a903cd4fb1
Merge pull request #1190 from neokjames/master
...
Improved Pushover transport code
2015-06-03 16:32:22 +01:00
702b75c0b7
Updates
2015-06-03 15:41:10 +01:00
d99eca8137
Merge remote-tracking branch 'upstream/master'
2015-06-03 21:55:20 +10:00
00ace9ff76
I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.
2015-06-03 21:42:01 +10:00
676812b87e
Updated indentation and moved some code
2015-06-03 21:32:57 +10:00
d191f34601
Improved Pushover transport code
2015-06-03 21:03:27 +10:00
651edbe976
Merge pull request #1188 from Rosiak/master
...
Convert processors page to use bootgrid
2015-06-02 23:59:53 +01:00
5410d38807
Merge pull request #1185 from laf/issue-1183
...
Fixed negative values for storage: http://munin-monitoring.org/ticket/1371
2015-06-03 08:30:36 +10:00
054bf3ae20
Convert processors page to use bootgrid
...
- Based on @laf code from the storage page
2015-06-02 22:15:36 +02:00
8e7cfda944
Merge pull request #1186 from SaaldjorMike/dbm-link
...
Fixed link for the dBm graphs from other Health-pages
2015-06-02 19:22:05 +01:00
caee69574b
Merge pull request #1187 from Rosiak/master
...
Minor name changes
2015-06-02 19:09:39 +01:00
903649dbce
Minor name changes
...
- Capitalise alert
- Change health page menu to match the category
2015-06-02 19:42:08 +02:00
bf97bad184
Fixed link for the dBm graphs from other Health-pages
2015-06-02 19:06:15 +02:00
ffce63968f
Fixed negative values for storage: http://munin-monitoring.org/ticket/1371
2015-06-02 17:36:10 +01:00
1ca02fb3c5
Fix scrut issue
2015-06-02 17:07:47 +01:00
e270db10e4
Merge pull request #1181 from SaaldjorMike/fix-services-list-with-state
...
Fixed issue with services list.
2015-06-02 17:01:17 +01:00
b9dabae7d8
Updated BGP polling for Cisco to support CISCO-BGP4-MIB better
2015-06-02 16:32:39 +01:00
0bd6a9736e
Only unshift first time.
2015-06-02 13:55:53 +02:00
9ea274e9a4
Merge pull request #1180 from neokjames/master
...
Added transport for Pushover alerting
2015-06-02 06:43:45 +00:00
d3a55b42f4
Revert "Added logo to login page"
...
This reverts commit c5ed14fb91185d2458382d217eb911d4ace51df1.
2015-06-02 12:26:56 +10:00
c5ed14fb91
Added logo to login page
2015-06-02 12:25:23 +10:00
cabcc04877
Created Pushover transport, requires testing
...
Moved print_r references to top for debug
Modified Pushover transport, testing required
Pushover transport, fixed syntax issue
Pushover transport, fixed another syntax issue
Pushover transport, added debug
Pushover transport, updated message code
Pushover transport, debug
Pushover transport, testing new code
Pushover transport, adding more parameters
and adding debug parameters
Pushover transport, added severity level support
Pushover transport, modified severity level code
Pushover transport, updated severity code
Pushover transport, debugging severity level
Pushover transport, more debugging
Pushover transport, debugging sound
Pushover transport, fixed sound syntax issue
Pushover transport, debugging sound API
Pushover transport, adjusted sound code
Updated contributors file to add myself
Updated Alerting doc to include Pushover
Pushover transport, modified code
Pushover transport, fixed syntax error
Pushover transport, removed debug code
Ready for deployment
Pushover transport, updated copyright
2015-06-02 10:48:12 +10:00
4bb63bf7f0
Updated remaining MyIsam tables to innodb
2015-06-01 21:56:22 +01:00
d24ca84b76
Forcing scrut run
2015-06-01 21:37:26 +01:00
2781a22de5
Merge pull request #1052 from f0o/obsolete-old-alerting
...
Disable Legacy-Alerting by default
2015-06-01 15:18:07 +01:00
cd7e3a1168
Merge pull request #1175 from SaaldjorMike/capitalise-words
...
Capitalised a few words when deleting device groups
2015-06-01 13:32:22 +01:00
a3e4e66c6a
Capitalised a few words when deleting device groups
2015-06-01 13:59:22 +02:00
34f9b20324
Merge pull request #1171 from neokjames/master
...
Syslog.md update to reflect syslog-ng 3.5.1
2015-05-31 21:56:18 +01:00
8a774cd5a6
Adjust formatting
...
as requested by @laf
2015-06-01 06:44:58 +10:00
7e96118c94
Syslog.md update to reflect syslog-ng 3.5.1
...
Updated configuration in documentation to suit syslog-ng 3.5.1 (tested
in Ubuntu LTS 14.04 Server)
Added line to add to config.php to enable Syslog functionality
2015-06-01 06:42:32 +10:00
