Jannis Moßhammer
c1860e7d5d
Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179
...
Conflicts:
modules/monitoring/application/controllers/ListController.php
modules/monitoring/application/controllers/ShowController.php
modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
2013-07-15 13:52:26 +02:00
Jannis Moßhammer
705127a95e
Make sql-queries more standard compliant
...
The connection now uses ONLY_FULL_GROUP_BY when connecting and
also forces ANSI SQL, this is reflected in the query codebase.
Also the comment count fields are added in this commit.
refs #4179
2013-07-15 13:21:48 +02:00
Marius Hein
6742696e09
Autoloader: Rename module namespace
2013-07-15 12:16:14 +02:00
Jannis Moßhammer
b045650a19
Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179
...
Conflicts:
application/layouts/scripts/layout.phtml
modules/monitoring/application/controllers/ListController.php
modules/monitoring/application/controllers/ShowController.php
modules/monitoring/application/views/scripts/list/hosts.phtml
modules/monitoring/application/views/scripts/show/components/comments.phtml
modules/monitoring/application/views/scripts/show/components/contacts.phtml
modules/monitoring/application/views/scripts/show/components/customvars.phtml
modules/monitoring/application/views/scripts/show/host.phtml
modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
2013-07-12 15:55:31 +02:00
Eric Lippmann
d871b3c287
Update the monitoring module
2013-07-12 14:33:17 +02:00
Marius Hein
1da7ea9c36
Host detail view: Add object properties
...
Add property component and helper which output all information
about an object (host or service).
refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
f455b32464
Host detail view
...
Add flags container to detail view
refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein
ffc1a2b43f
Host detail view
...
Fix psr, adapt output for layouting, add fields to adapt original
views from icinga.
refs #4182
2013-07-08 16:12:47 +02:00
Eric Lippmann
1e9fa28433
Add the monitoring module from the incubator
2013-06-28 09:11:12 +02:00