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
c10752a05a
Add host_* prefix to fields for hostoverview
...
A few fields didn't have the host_ prefix (as in the host-detail branch).
This is fixed with this commit
refs #4179
2013-07-12 15:14:55 +02:00
d871b3c287
Update the monitoring module
2013-07-12 14:33:17 +02:00
8598743cc1
Modified ListController hostfields
...
This is a preliminary change to get the required fields, although
the views and queries will heavily change during the sprint, so
it's work in progress
refs #4179
2013-07-12 14:01:31 +02:00
1e9fa28433
Add the monitoring module from the incubator
2013-06-28 09:11:12 +02:00
Jannis Moßhammer
Eric Lippmann