ace10a0b92
Merge branch 'bugfix/vagrant-user-not-in-group-icinga-cmd-4366' of ssh://git.icinga.org/icinga2-web
...
fixes #4366
2013-07-23 17:03:04 +02:00
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
3242156301
Vagrant: Use configuration version 2
...
refs #4449
2013-07-23 16:26:14 +02:00
1511cc4662
Command mask: Add documentation
...
refs #4355
2013-07-23 14:48:17 +02:00
f7369969cf
Command mask: Fix api doc builder
...
refs #4355
2013-07-23 14:48:17 +02:00
51615766b3
Command masks: Fix test runner
2013-07-23 14:48:17 +02:00
6e3e3c358b
Command masks: Add test
...
refs #4355
2013-07-23 14:47:40 +02:00
3676c95afc
Command masks: Fix doc issues
2013-07-23 14:47:40 +02:00
89e7fa6b2d
Command masks: Add validator and change validation flow
...
refs #4355
2013-07-23 14:47:40 +02:00
e9c9c9de87
Command masks: Fix lazy initialization of forms
...
refs #4355
2013-07-23 14:47:40 +02:00
c6ebe85782
Command masks: Implement list over all implemented commands [WIP]
...
refs #4355
2013-07-23 14:47:40 +02:00
03f4a8eceb
Command masks: Implement missing forms [WIP]
...
Fixes phpcs issues, missing features, fix controller using
new config interface.
refs #4355
2013-07-23 14:47:40 +02:00
0de38c25eb
Command masks: Refactor and implement masks
...
refs #4355
2013-07-23 14:47:40 +02:00
dccb2189bd
Vagrant: Add vagrant user to group icinga-cmd
...
The vagrant user is now allowed to interact with both the icinga
pipe and the livestatus socket.
refs #4366
2013-07-23 14:46:57 +02:00
d5b8a850ea
Forms: New form system
...
Move new form parts arround and add new LoginForm.
refs #4355
2013-07-23 14:46:26 +02:00
dc878de275
Forms: Move class to the right place
...
Drop some methods we do not need anymore (all model related).
refs #4355
2013-07-23 14:46:25 +02:00
2469e3652c
Forms: Drop old form class
2013-07-23 14:46:25 +02:00
576124a827
Forms: Move Icinga\Form to Icinga\Web\Form
2013-07-23 14:46:25 +02:00
b351cf61a7
Refactor Form-builder [WIP]
...
Refactor Form-builder so that it is an abstract extension class of
Zend_Form.
refs #4355
2013-07-23 14:46:25 +02:00
b3c1a7a1ed
Implement command to add/delete comments
...
refs #4355
2013-07-23 14:46:25 +02:00
56b8b398c2
Add Number functionality to Icinga\Form\SendCommand
2013-07-23 14:46:25 +02:00
f102f75eb9
Implement command to delay notifications
...
Added command and mask to delay notifications
for hosts/services.
refs #4355
2013-07-23 14:46:25 +02:00
72efe7e8a0
Implement command to send custom notifications
...
Added command and mask to send custom
notifications for hosts/services.
refs #4355
2013-07-23 14:46:25 +02:00
087e4dfe90
Add choice functionality to Icinga\Form\SendCommand
2013-07-23 14:46:25 +02:00
101a1f093f
Implement command to submit passive check results
...
Added command and mask to submit passive check
results for hosts/services.
refs #4355
2013-07-23 14:46:25 +02:00
23e15e3f54
Add textbox functionality to Icinga\Form\SendCommand
2013-07-23 14:46:25 +02:00
23f19da02b
Implement acknowledgement commands for hosts/services
...
Added "placeacknowledgement" and "deleteacknowledgement" actions.
refs #4355
2013-07-23 14:46:24 +02:00
9b858b9a82
Implement start/stop obsessing hosts/services
...
Added action and mask to start/stop obsessing
over hosts and services.
refs #4355
2013-07-23 14:46:24 +02:00
3f88e3322b
Implement enable/disable passive checks for hosts/services
...
Added action and mask to enable/disable passive checks for
hosts and services.
refs #4355
2013-07-23 14:46:24 +02:00
1138afd5fb
Implement enable/disable flap detection for hosts/services
...
Added action and mask for enabling/disabling flap detection
for hosts and services.
refs #4355
2013-07-23 14:46:24 +02:00
fe0d000a02
Implement enable/disable event handling for hosts/services
...
Added action and mask for enabling/disabling event handling
of hosts and services.
refs #4355
2013-07-23 14:46:24 +02:00
1c7a90e79f
Implement enable/disable notifications for hosts/services
...
Added action and mask for enabling/disabling notifications
of hosts and services.
refs #4355
2013-07-23 14:46:24 +02:00
387811c4a2
Implement enable/disable active checks for hosts/services
...
Added action and mask for enabling/disabling active checks
of hosts and services.
refs #4355
2013-07-23 14:46:24 +02:00
4b8643dc56
Add a date and time form-element.
...
Added a date and time form-element which are implemented based on the
new "date" and "time" input-types introduced with html5. If those are not
available two bootstrap javascript-modules will be enabled.
refs #4355
2013-07-23 14:46:24 +02:00
15ab7f188a
Implement schedule host/service check action
...
Refactored existing schedule action and fixed selectCommandTargets.
refs #4355
2013-07-23 14:46:24 +02:00
aa241865b4
Replace custom formNote element with the one from Zend
...
Replaced custom form element "Note" as
Zend already provides such an element.
2013-07-23 14:46:24 +02:00
abda65f4bd
Refactor command controller and implement restart action.
...
Refactored existing command controller so that it reflects the
correct coding style, rewritten the icinga restart command and
added a very simple form for it.
refs #4355
2013-07-23 14:46:24 +02:00
1492245788
Service detail view: Template fixes
...
refs #4181
2013-07-23 14:03:32 +02:00
8d3ff94696
Remove php strict errors
...
refs #4448
2013-07-23 12:18:27 +02:00
6ea048d4ef
Merge branch 'feature/test-fixtures-4417'
...
fixes #4417
2013-07-23 11:11:01 +02:00
e47f3b2cdf
Merge branch 'feature/vagrant-update-Icinga2-4385'
...
fixes #4385
2013-07-23 11:02:57 +02:00
3912b7bc83
Merge branch 'bugfix/vagrant-caching-issues-on-vboxsf-4384'
2013-07-22 18:31:34 +02:00
5f79ee221c
Add testing.md for controller tests
2013-07-22 18:23:45 +02:00
008d51034d
Vagrant: Add missing manifest finalize.sh
...
refs #4385
2013-07-22 17:24:56 +02:00
4ededd5179
Add servicegroup and icon image to service overview
...
Add icon images for hosts and services, notes and action url
for hosts
refs #4181
2013-07-22 17:10:43 +02:00
5d50fa03c1
Merge branch 'feature/host-overview--4179'
...
fixes #4179
2013-07-22 17:02:21 +02:00
a98e88c45e
Merge branch 'feature/service-overview-4178'
...
fixes #4178
fixes #4179
2013-07-22 16:45:39 +02:00
a0839ea0da
Add service detail view
...
refs #4181
2013-07-22 16:03:36 +02:00
69400ce671
Vagrant: Update Icinga to 1.9.3 and Icinga 2 to 0.0.2
...
refs #4385
2013-07-22 14:48:05 +02:00
07f7e7ef23
Fix interface changes of statusdat in tests
...
The StatusDat tests didn't run as they were outdated, now a
newer version is added
refs #4178
refs #4179
2013-07-22 13:47:09 +02:00
Jannis Moßhammer
Eric Lippmann
Marius Hein
Johannes Meyer