Daniel Preussker
|
d89525f3dd
|
Merge pull request #1209 from SaaldjorMike/fix-storage
Fixed entry count on storage page
|
2015-06-08 14:03:43 +00:00 |
|
Neil Lathwood
|
21d2846212
|
Merge pull request #1211 from vitalisator/issue-1206
Added Basic Support für Enterasys Devices
|
2015-06-08 14:39:37 +01:00 |
|
vitalisator
|
267f07e1b2
|
Added Basic Support für Enterasys Devices
|
2015-06-08 14:27:33 +02:00 |
|
Mike Rostermund
|
ed86171d0a
|
Fixed entry count on storage page
|
2015-06-08 13:14:39 +02:00 |
|
Daniel Preussker
|
f3cebbcfba
|
Merge pull request #1208 from SaaldjorMike/fix-bills
Fixed percentagebar on /bills/
|
2015-06-08 10:56:36 +00:00 |
|
Mike Rostermund
|
3489476ad6
|
Fixed percentagebar on /bills/
|
2015-06-08 12:52:38 +02:00 |
|
Neil Lathwood
|
aa6ffa137b
|
Merge pull request #1207 from SaaldjorMike/typo1
Fixed typo in changelog
|
2015-06-08 11:05:46 +01:00 |
|
Mike Rostermund
|
8fc70931ae
|
Fixed typo in changelog
|
2015-06-08 12:02:49 +02:00 |
|
Neil Lathwood
|
70c9d13544
|
Merge pull request #1205 from SaaldjorMike/syslog-name
Fix heading of syslog table for devices
|
2015-06-07 21:32:33 +01:00 |
|
Mike Rostermund
|
516bc43234
|
Fix heading of syslog table for devices
|
2015-06-07 22:07:36 +02:00 |
|
f0o
|
c64345bd5d
|
Merge branch 'laf-issue-laf-110-new'
|
2015-06-07 10:44:47 +00:00 |
|
f0o
|
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 |
|
Daniel Preussker
|
d121fed936
|
Merge pull request #1202 from paulgear/minor-tidies
Minor tidies
|
2015-06-07 07:32:04 +00:00 |
|
Daniel Preussker
|
a80e4cd87b
|
Merge pull request #1203 from librenms/f0o-hotfix-1
Fix fatal in scripts/shoutcast.php
|
2015-06-06 17:55:54 +00:00 |
|
Daniel Preussker
|
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 |
|
Paul Gear
|
49833273e7
|
Make comment reflect code
|
2015-06-06 07:50:23 +10:00 |
|
Paul Gear
|
c149b0f47c
|
Remove unused os type
|
2015-06-06 07:47:14 +10:00 |
|
Paul Gear
|
418416457b
|
Make source layout consistent with all the other aruba files
|
2015-06-06 07:46:16 +10:00 |
|
Paul Gear
|
c27cb9d803
|
Source tree has files with spaces in their names now
|
2015-06-06 07:45:36 +10:00 |
|
Daniel Preussker
|
960da3c8b8
|
Merge pull request #1194 from neokjames/master
Issued alerts add to the eventlog
|
2015-06-05 08:38:35 +00:00 |
|
James Campbell
|
f56c8c4425
|
Fixed indentation
|
2015-06-04 22:15:22 +10:00 |
|
James Campbell
|
45d7ff0a73
|
Added log_event for issued alerts
|
2015-06-04 22:13:45 +10:00 |
|
James Campbell
|
719c2bc63e
|
Testing log_event for issued alerts
|
2015-06-04 21:55:26 +10:00 |
|
Neil Lathwood
|
ae2f7eb98f
|
Merge pull request #1193 from SaaldjorMike/syslog-style
|
2015-06-04 11:41:01 +01:00 |
|
Mike Rostermund
|
cdd597a17e
|
Fixed same height for input fields on /syslog/
|
2015-06-04 12:27:49 +02:00 |
|
Neil Lathwood
|
b71ae21054
|
Merge pull request #1191 from SaaldjorMike/syslog-perms
|
2015-06-04 10:25:31 +01:00 |
|
Mike Rostermund
|
61d77e72c5
|
Hide link to syslog for device if syslog is disabled.
|
2015-06-04 09:19:48 +02:00 |
|
Neil Lathwood
|
455c619290
|
Merge pull request #1192 from Rosiak/mempool-bootgrid
Convert memory page to use bootgrid
|
2015-06-04 00:56:47 +01:00 |
|
Rosiak
|
250b58ea8b
|
Minor corrections to memory bootgrid
|
2015-06-04 00:08:53 +02:00 |
|
Rosiak
|
f9322a29c6
|
Convert memory page to use bootgrid
|
2015-06-03 23:39:54 +02:00 |
|
Neil Lathwood
|
a903cd4fb1
|
Merge pull request #1190 from neokjames/master
Improved Pushover transport code
|
2015-06-03 16:32:22 +01:00 |
|
James Campbell
|
d99eca8137
|
Merge remote-tracking branch 'upstream/master'
|
2015-06-03 21:55:20 +10:00 |
|
James Campbell
|
00ace9ff76
|
I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.
|
2015-06-03 21:42:01 +10:00 |
|
James Campbell
|
676812b87e
|
Updated indentation and moved some code
|
2015-06-03 21:32:57 +10:00 |
|
James Campbell
|
d191f34601
|
Improved Pushover transport code
|
2015-06-03 21:03:27 +10:00 |
|
Neil Lathwood
|
651edbe976
|
Merge pull request #1188 from Rosiak/master
Convert processors page to use bootgrid
|
2015-06-02 23:59:53 +01:00 |
|
Paul Gear
|
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 |
|
Rosiak
|
054bf3ae20
|
Convert processors page to use bootgrid
- Based on @laf code from the storage page
|
2015-06-02 22:15:36 +02:00 |
|
Neil Lathwood
|
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 |
|
Neil Lathwood
|
caee69574b
|
Merge pull request #1187 from Rosiak/master
Minor name changes
|
2015-06-02 19:09:39 +01:00 |
|
Rosiak
|
903649dbce
|
Minor name changes
- Capitalise alert
- Change health page menu to match the category
|
2015-06-02 19:42:08 +02:00 |
|
Mike Rostermund
|
bf97bad184
|
Fixed link for the dBm graphs from other Health-pages
|
2015-06-02 19:06:15 +02:00 |
|
laf
|
ffce63968f
|
Fixed negative values for storage: http://munin-monitoring.org/ticket/1371
|
2015-06-02 17:36:10 +01:00 |
|
Neil Lathwood
|
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 |
|
Mike Rostermund
|
0bd6a9736e
|
Only unshift first time.
|
2015-06-02 13:55:53 +02:00 |
|
Daniel Preussker
|
9ea274e9a4
|
Merge pull request #1180 from neokjames/master
Added transport for Pushover alerting
|
2015-06-02 06:43:45 +00:00 |
|
James Campbell
|
d3a55b42f4
|
Revert "Added logo to login page"
This reverts commit c5ed14fb91.
|
2015-06-02 12:26:56 +10:00 |
|
James Campbell
|
c5ed14fb91
|
Added logo to login page
|
2015-06-02 12:25:23 +10:00 |
|
James Campbell
|
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 |
|
Neil Lathwood
|
2781a22de5
|
Merge pull request #1052 from f0o/obsolete-old-alerting
Disable Legacy-Alerting by default
|
2015-06-01 15:18:07 +01:00 |
|