Commit Graph

10375 Commits

Author SHA1 Message Date
Neil Lathwood
b8cdadaf04 Merge pull request #3148 from ekoyle/alert_template_transport
Alert template transport
2016-03-17 20:58:43 +00:00
Neil Lathwood
d20b1c657f Merge pull request #3262 from murrant/fix-icon-update 2016-03-17 18:49:50 +00:00
Tony Murray
a20c14b66b Fix icon reset issue when os != icon. 2016-03-17 11:36:59 -05:00
Daniel Preussker
c7fbf4d5b3 Merge pull request #3254 from barhom/juniper-ex2500
Added support for Juniper EX2500
2016-03-17 08:51:44 +00:00
Daniel Preussker
78e3ab08b7 Merge pull request #3248 from laf/pulse-fix
Fixed pulse sessions and users rrdupdate
2016-03-17 08:02:38 +00:00
Daniel Preussker
8643d5ccb8 Merge pull request #3260 from paulgear/clarify-validate
Minor clarifications
2016-03-17 08:01:52 +00:00
Paul Gear
1a3213b81f Minor clarifications 2016-03-17 10:18:16 +10:00
Eldon Koyle
36818d6c59 Use double-quotes in template example and warn about single-quotes 2016-03-16 11:26:19 -06:00
Tony Murray
271e767077 Merge pull request #3250 from laf/issue-3236
Split out the icon check and update from os
2016-03-16 10:59:09 -05:00
Ibrahim Tachijian
282fb891d0 Added support for Juniper EX2500 2016-03-16 16:08:50 +01:00
Daniel Preussker
57339c4221 Merge pull request #3221 from ekoyle/add_web_html_email_option
Add web config option for HTML emails
2016-03-16 14:44:51 +00:00
Neil Lathwood
c9fabd4654 Merge pull request #3246 from Rosiak/issue-3245
Deliberant WiFi Discovery
2016-03-16 11:50:46 +00:00
Paul Gear
f90e7baa31 Merge pull request #3252 from laf/issue-3131
Updated alerts query to retrieve sysName for function use
2016-03-16 11:07:13 +10:00
laf
4cbeb18af5 Updated alerts query to retrieve sysName for function use 2016-03-16 00:56:58 +00:00
Neil Lathwood
150ee45452 Merge pull request #3240 from richardlawley/issue-1967
Add Interface at bill create screen
2016-03-15 23:23:01 +00:00
laf
772c9177f6 Split out the icon check and update from os 2016-03-15 23:08:17 +00:00
Eldon Koyle
6a53bcf688 Add web config option for HTML emails 2016-03-15 16:55:27 -06:00
laf
dd22eaa022 Fixed pulse sessions and users rrdupdate 2016-03-15 22:26:27 +00:00
Neil Lathwood
5566163eeb Merge pull request #3156 from richardlawley/billing-perf-2 2016-03-15 21:00:44 +00:00
Rosiak
d1afac48bd Add os to text 2016-03-15 18:22:19 +01:00
Rosiak
29fd3fb569 Initial Commit 2016-03-15 18:11:09 +01:00
Neil Lathwood
2d2f56c3dc Merge pull request #3224 from Rosiak/issue-3029
Basic Develop Ineo Printer Support
2016-03-15 10:01:33 +00:00
Paul Gear
d54fd994b6 Merge pull request #3241 from librenms/murrant-update-docs
./daily.sh as librenms user
2016-03-15 07:35:32 +10:00
Tony Murray
d3a4e03b2c ./daily.sh as librenms user
Add hint to encourage running ./daily.sh as the user librenms user.

We could also add this:
`runuser -l librenms -c ./daily.sh`
or this
`su - librenms -c ./daily.sh`
2016-03-14 15:10:24 -05:00
Richard Lawley
b2c015b58c Add Interface at bill create screen 2016-03-14 19:18:53 +00:00
Rosiak
d33c54ea9e Add discovery file 2016-03-13 22:15:13 +01:00
Neil Lathwood
2bbbd13f2c Merge pull request #3231 from Rosiak/issue-3147
dBm Disco Fix
2016-03-13 21:04:49 +00:00
Neil Lathwood
f32b7680ff Merge pull request #3230 from Rosiak/issue-3229
check_valid_sensors - Correction
2016-03-13 20:55:03 +00:00
Neil Lathwood
f80a4a3434 Merge pull request #3228 from Rosiak/convert-drac-state-disco
Convert old drac state disco to new
2016-03-13 20:53:40 +00:00
Neil Lathwood
4b473f8025 Merge pull request #3227 from Rosiak/valid-state-bug
Valid State Sensor Bugfix
2016-03-13 20:50:16 +00:00
Neil Lathwood
b9c14e62ab Merge pull request #3226 from Rosiak/issue-1365
Juniper Alarm State Monitoring
2016-03-13 20:48:39 +00:00
Neil Lathwood
dbf7d30538 Merge pull request #3219 from richardlawley/increase-alert-suggestions
Increase rule suggestions to 20
2016-03-13 20:11:00 +00:00
Neil Lathwood
f79979f3f6 Merge pull request #3216 from richardlawley/billing-search
Implement Billing Search
2016-03-13 20:09:32 +00:00
Neil Lathwood
240ffe55af Merge pull request #3178 from Ultra2D/api-ldap
API access when using LDAP authentication
2016-03-13 20:06:35 +00:00
Rosiak
c948efae24 dBm Disco Fix
#3147
2016-03-12 23:45:00 +01:00
Rosiak
f1bb532d30 check_valid_sensors - Correction
#3229
2016-03-12 23:27:21 +01:00
Rosiak
2fe97b4a7d Convert old drac state disco to new 2016-03-12 22:55:36 +01:00
Rosiak
77ec4c23a9 Valid State Sensor Bugfix
Be able to remove sensors when they become invalid.
2016-03-12 22:50:56 +01:00
Rosiak
4852179973 Juniper Alarm State Monitoring
#1365
2016-03-12 21:47:48 +01:00
Rosiak
9b4eb5c497 Basic Develop Ineo Printer Support
#3029
2016-03-11 23:40:44 +01:00
Søren Rosiak
8d1008968b Merge pull request #3223 from Rosiak/issue-3078 2016-03-11 23:20:46 +01:00
Rosiak
9776f56aa1 Add Canon pic
#3078
2016-03-11 23:11:24 +01:00
Richard Lawley
b89fa295a5 Increase rule suggestions to 20 2016-03-11 08:51:24 +00:00
Neil Lathwood
2e802d89e9 Merge pull request #3215 from barhom/agreement
I agree to the conditions of the Contributor Agreement
2016-03-10 20:04:12 +00:00
Richard Lawley
c35afb1e1c Implement Billing Search 2016-03-10 18:11:39 +00:00
Ibrahim Tachijian
34bb987301 I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2016-03-10 17:58:19 +01:00
Ultra2D
12a3b305ed API access when using LDAP authorization 2016-03-10 14:48:01 +01:00
Neil Lathwood
d996a7af3c Merge pull request #3195 from richardlawley/issue-3151
Historical Billing Graphs use correct values for 95th line
2016-03-10 12:50:09 +00:00
Neil Lathwood
195f820343 Merge pull request #3203 from murrant/syslog-issue-3199
Fix cisco syslog parsing when logging timestamp is enabled
2016-03-10 12:49:37 +00:00
Neil Lathwood
29c0e81075 Merge pull request #3213 from Rosiak/issue-3196
Dell NOS Disco - N4032F
2016-03-10 09:24:17 +00:00