Commit Graph

4310 Commits

Author SHA1 Message Date
mchasteen
4013ca3a5a Fixed some formatting for generic sensors. 2015-03-03 17:06:49 -07:00
Neil Lathwood
fe9f1abd39 Merge pull request #541 from Rosiak/master
Print alert state and a matching glyphic
2015-03-03 20:15:27 +00:00
Søren Rosiak
dbf0107827 Update print-alerts.inc.php
- Changed using lafwoods suggested changes.
2015-03-03 19:25:20 +01:00
Rosiak
d0997d09d4 Print alert state and a matching glyphic
- Print alert state on default front page and on alert-log page.
Prints the state and a matching glyphicon.
2015-03-03 18:48:40 +01:00
Neil Lathwood
7c1b6f4fbc Merge pull request #540 from laf/issue-laf-138
Bug fix to make devices search box work again!
2015-03-03 15:19:42 +00:00
laf
1ed27b1acb Bug fix to make devices search box work again! 2015-03-03 15:07:56 +00:00
Neil Lathwood
549513662a Merge pull request #539 from laf/issue-laf-137
Updated .gitignore to remove .ircbot.alert
2015-03-03 15:07:55 +00:00
Neil Lathwood
7b31e98bfe Updated .gitignore to remove .ircbot.alert 2015-03-03 14:17:55 +00:00
Neil Lathwood
800bd80fc4 Merge pull request #538 from Rosiak/master
Add ifAlias to graph view.
2015-03-02 17:51:53 +00:00
Rosiak
e1a5dd0110 Add ifAlias to graph view.
- Small visual improvement
2015-03-02 18:32:36 +01:00
Daniel Preussker
5c5203a0c1 Merge pull request #537 from laf/issue-laf-136
Removing closing ?> in config.php.default
2015-03-02 18:31:58 +01:00
laf
9441295f41 Removing closing ?> in config.php.default 2015-03-02 17:30:43 +00:00
Neil Lathwood
93ba1c61f9 Merge pull request #536 from SaaldjorMike/ciscosb-4
Changed to use mib instead of hardcoded oid
2015-03-02 11:38:10 +00:00
Mike Rostermund
abfb335967 Changed to use mib instead of hardcoded oid 2015-03-02 03:08:56 -08:00
Daniel Preussker
608f340186 Merge pull request #535 from laf/issue-laf-134-2
Actually excluding from scrutinizer this time!
2015-03-01 19:55:30 +01:00
laf
909fcaa2a8 Actually excluding from scrutinizer this time! 2015-03-01 18:52:07 +00:00
Daniel Preussker
842feb7052 Merge pull request #534 from laf/issue-laf-135
Fixes bug that stops search box for ports and devices to be shown
2015-03-01 19:47:13 +01:00
laf
2c00d26a96 Fixed if statement to bring back port search bar 2015-03-01 18:42:52 +00:00
laf
8a932df6e8 Fixed if statement to bring back device search bar 2015-03-01 18:40:01 +00:00
Daniel Preussker
f4a34ba322 Merge pull request #532 from laf/issue-laf-133
Resolved a large number index issues and update Console_Color to V2
2015-03-01 19:31:08 +01:00
laf
c1ef9b6808 Resolved a large number index issues and update Console_Color to V2 2015-03-01 18:04:57 +00:00
Daniel Preussker
7dfbfd5c0e Merge pull request #529 from laf/docs-update
Docs update
2015-03-01 18:49:46 +01:00
Daniel Preussker
7b43810f34 Merge pull request #484 from laf/issue-483
Updated the way debug=yes in url works to make it visually more appealing
2015-03-01 18:46:47 +01:00
Daniel Preussker
ef691748d8 Merge pull request #527 from laf/issue-laf-130
Final tidy up of the date search box for graphs
2015-03-01 18:31:27 +01:00
Daniel Preussker
f2e5f0827d Merge pull request #530 from laf/issue-laf-132
Removed remains of qTip which is no longer needed / used
2015-03-01 18:29:40 +01:00
laf
15ac62c3dc Removed remains of qTip which is no longer needed / used 2015-03-01 15:28:18 +00:00
laf
a2366cad2d Updated docs including adding code standards doc 2015-03-01 13:57:31 +00:00
Neil Lathwood
e1722d7b60 Added code guidelines documentation 2015-03-01 13:56:31 +00:00
Daniel Preussker
ae12737628 Merge pull request #528 from laf/issue-laf-131
Added indexes to relevant tables
2015-03-01 13:42:55 +01:00
Daniel Preussker
cb9d3d1cbb Merge pull request #521 from laf/issue-463-2
Fixing mysql_strict issues / errors
2015-03-01 13:40:31 +01:00
laf
3d0e604a72 Added indexes to relevant tables 2015-03-01 12:28:10 +00:00
laf
7f823b6d49 Adding more updates found by f0o 2015-03-01 12:23:31 +00:00
laf
082ac6cc66 Final tidy up of the date search box for graphs 2015-03-01 11:57:35 +00:00
Neil Lathwood
c57ac2dfb7 Merge pull request #496 from paulgear/compact-controls
Vertically compact controls on main graph screen
2015-02-28 13:42:59 +00:00
Neil Lathwood
c63d6fda8d Merge pull request #525 from laf/issue-507
Added slack integration for alerting system
2015-02-28 12:07:36 +00:00
laf
c1c520d781 Removing POST / GET code as slack only uses POST 2015-02-28 11:45:30 +00:00
laf
54cff79acb Added docs for slack transport 2015-02-27 15:36:12 +00:00
laf
06bf9cd95e Removed debug line! 2015-02-27 15:26:13 +00:00
laf
92b069bff1 Final updates (hopefully) for slack transport 2015-02-27 15:23:14 +00:00
laf
4f48346d56 Added slack transport agent 2015-02-27 12:10:34 +00:00
Neil Lathwood
e2caf52429 Merge pull request #524 from laf/issue-laf-129
Fixed javascript event. issue - stopped Firefox working
2015-02-27 12:07:12 +00:00
Neil Lathwood
2f98d5f45a Merge pull request #523 from laf/issue-laf-128
Updated split regex to cover more advanced rules
2015-02-27 12:04:33 +00:00
laf
dae96388e8 Fixed javascript event. issue - stopped Firefox working 2015-02-27 11:57:43 +00:00
laf
78a9b33c4b Updated split regex to cover more advanced rules 2015-02-27 11:51:54 +00:00
Neil Lathwood
83922b10d9 Merge pull request #522 from laf/issue-520
Added .alerts.lock to .gitignore
2015-02-26 23:16:43 +00:00
Neil Lathwood
6e341a960f Added .alerts.lock to .gitignore 2015-02-26 23:15:17 +00:00
laf
e1b460320a Tidying up 2015-02-26 23:04:14 +00:00
laf
ba5eb4e51a Tidying up 2015-02-26 23:04:12 +00:00
laf
15cc00c27d Tidying up 2015-02-26 23:04:10 +00:00
laf
e0fbcb9268 test 2015-02-26 23:04:07 +00:00