Jannis Mosshammer
e8204f4755
Merge branch 'feature/service-detail-view-4181' of ssh://git.icinga.org/icinga2-web
...
Conflicts:
library/Icinga/Application/Logger.php
library/Icinga/Application/Web.php
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/Authentication/Credentials.php
library/Icinga/Authentication/Manager.php
library/Icinga/Authentication/PhpSession.php
library/Icinga/Authentication/Session.php
library/Icinga/Authentication/User.php
library/Icinga/Authentication/UserBackend.php
library/Icinga/Backend/AbstractBackend.php
library/Icinga/Backend/DataView/ObjectRemappingView.php
library/Icinga/Backend/Query.php
library/Icinga/Backend/Statusdat/DataView/StatusdatHostView.php
library/Icinga/Backend/Statusdat/HostgroupsummaryQuery.php
library/Icinga/Backend/Statusdat/HostlistQuery.php
library/Icinga/Backend/Statusdat/ServicegroupsummaryQuery.php
library/Icinga/Backend/Statusdat/ServicelistQuery.php
library/Icinga/Exception/ConfigurationError.php
library/Icinga/Exception/MissingParameterException.php
library/Icinga/Exception/NotImplementedError.php
library/Icinga/Exception/ProgrammingError.php
library/Icinga/Exception/SystemPermissionException.php
library/Icinga/Protocol/AbstractQuery.php
library/Icinga/Protocol/Commandpipe/Acknowledgement.php
library/Icinga/Protocol/Commandpipe/CommandPipe.php
library/Icinga/Protocol/Commandpipe/Comment.php
library/Icinga/Protocol/Commandpipe/Downtime.php
library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
library/Icinga/Protocol/Commandpipe/IComment.php
library/Icinga/Protocol/Commandpipe/PropertyModifier.php
library/Icinga/Protocol/Ldap/Connection.php
library/Icinga/Protocol/Ldap/Exception.php
library/Icinga/Protocol/Ldap/LdapUtils.php
library/Icinga/Protocol/Ldap/Node.php
library/Icinga/Protocol/Ldap/Query.php
library/Icinga/Protocol/Ldap/Root.php
library/Icinga/Protocol/Statusdat/Exception/ParsingException.php
library/Icinga/Protocol/Statusdat/IReader.php
library/Icinga/Protocol/Statusdat/ObjectContainer.php
library/Icinga/Protocol/Statusdat/Parser.php
library/Icinga/Protocol/Statusdat/Query.php
library/Icinga/Protocol/Statusdat/Query/Expression.php
library/Icinga/Protocol/Statusdat/Query/Group.php
library/Icinga/Protocol/Statusdat/Query/IQueryPart.php
library/Icinga/Protocol/Statusdat/Reader.php
library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php
library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php
library/Icinga/Web/ActionController.php
library/Icinga/Web/Form.php
library/Icinga/Web/Hook/Configuration/ConfigurationTab.php
library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php
library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php
library/Icinga/Web/Hook/Grapher.php
library/Icinga/Web/Hook/Toptray.php
library/Icinga/Web/ModuleActionController.php
library/Icinga/Web/Notification.php
library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
library/Icinga/Web/Widget.php
modules/monitoring/application/views/helpers/MonitoringCommands.php
modules/monitoring/application/views/helpers/MonitoringFlags.php
modules/monitoring/application/views/helpers/MonitoringProperties.php
modules/monitoring/application/views/scripts/show/components/comments.phtml
modules/monitoring/application/views/scripts/show/components/downtime.phtml
modules/monitoring/application/views/scripts/show/components/flags.phtml
modules/monitoring/application/views/scripts/show/components/properties.phtml
modules/monitoring/application/views/scripts/show/header.phtml
modules/monitoring/application/views/scripts/show/host.phtml
modules/monitoring/application/views/scripts/show/service.phtml
modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
modules/monitoring/library/Monitoring/Backend/Statusdat.php
modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php
modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
modules/monitoring/library/Monitoring/Command/Meta.php
modules/monitoring/library/Monitoring/View/DowntimeView.php
modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php
modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php
modules/monitoring/test/php/library/Command/MetaTest.php
2013-07-23 16:33:07 +02:00
Marius Hein
1492245788
Service detail view: Template fixes
...
refs #4181
2013-07-23 14:03:32 +02:00
Jannis Moßhammer
a0839ea0da
Add service detail view
...
refs #4181
2013-07-22 16:03:36 +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
Jannis Moßhammer
30040eaa1b
Add Host detail to hostoverview
...
This is merge to prevent the host-overview nad
host-detail branch from diverging too much
refs #4179
Conflicts:
application/views/helpers/TimeSince.php
modules/monitoring/application/controllers/ShowController.php
modules/monitoring/application/views/scripts/show/components/comments.phtml
modules/monitoring/application/views/scripts/show/header.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
public/css/base.less
public/css/components/details.less
2013-07-12 15:12:26 +02:00
Eric Lippmann
d871b3c287
Update the monitoring module
2013-07-12 14:33:17 +02:00
Marius Hein
e817b9b790
Host detail view
...
Add downtime sub component.
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
Marius Hein
a0f96379a9
Host detail view
...
Fix psr, adapt output for layouting, add fields to adapt original
views from icinga.
refs #4182
2013-07-02 16:00:41 +02:00
Eric Lippmann
df7a3a4cbe
Fix PHP short open tags, DO NOT use <? ...
...
refs #4301
2013-06-28 09:13:08 +02:00
Eric Lippmann
1e9fa28433
Add the monitoring module from the incubator
2013-06-28 09:11:12 +02:00