Commit Graph

3313 Commits

Author SHA1 Message Date
Marius Hein 849eee2cf2 Command masks: Review changes [WIP]
refs #4355
2013-07-23 17:09:06 +02:00
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 6e3e3c358b Command masks: Add test
refs #4355
2013-07-23 14:47:40 +02:00
Marius Hein 3676c95afc Command masks: Fix doc issues 2013-07-23 14:47:40 +02:00
Marius Hein 89e7fa6b2d Command masks: Add validator and change validation flow
refs #4355
2013-07-23 14:47:40 +02:00
Marius Hein c6ebe85782 Command masks: Implement list over all implemented commands [WIP]
refs #4355
2013-07-23 14:47:40 +02:00
Marius Hein 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
Marius Hein 0de38c25eb Command masks: Refactor and implement masks
refs #4355
2013-07-23 14:47:40 +02:00
Johannes Meyer b3c1a7a1ed Implement command to add/delete comments
refs #4355
2013-07-23 14:46:25 +02:00
Johannes Meyer 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
Johannes Meyer 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
Johannes Meyer 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
Johannes Meyer 23f19da02b Implement acknowledgement commands for hosts/services
Added "placeacknowledgement" and "deleteacknowledgement" actions.

refs #4355
2013-07-23 14:46:24 +02:00
Johannes Meyer 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
Johannes Meyer 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
Johannes Meyer 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
Johannes Meyer 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
Johannes Meyer 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
Johannes Meyer 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
Johannes Meyer 15ab7f188a Implement schedule host/service check action
Refactored existing schedule action and fixed selectCommandTargets.

refs #4355
2013-07-23 14:46:24 +02:00
Johannes Meyer 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
Marius Hein 1492245788 Service detail view: Template fixes
refs #4181
2013-07-23 14:03:32 +02:00
Marius Hein 8d3ff94696 Remove php strict errors
refs #4448
2013-07-23 12:18:27 +02:00
Jannis Moßhammer 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
Marius Hein 5d50fa03c1 Merge branch 'feature/host-overview--4179'
fixes #4179
2013-07-22 17:02:21 +02:00
Jannis Moßhammer a0839ea0da Add service detail view
refs #4181
2013-07-22 16:03:36 +02:00
Jannis Moßhammer 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 597797c2ab Removed custom query code from host action method, fix open problems
In the next sprint, the request contains all information needed to
limit/filter/sort the resultset, so only an applyRequest should be enough

refs #4179
2013-07-19 18:04:13 +02:00
Jannis Moßhammer 5e4adcfea2 Add Service overview and fixes for Statusdat
The service overview required a few fixes for issues that
occured because the StatusDat Query class now inherits from
Data/AbstractQuery.

refs #4178
2013-07-19 17:45:51 +02:00
Jannis Moßhammer 340554a58c Rename wrong filename
refs #4417
2013-07-19 12:00:42 +02:00
Jannis Moßhammer 5827cb37cb Fix statusdat tests and implementation
After moving StatusDat to monitoring/Backends and changing the
inheritance to Library/Icinga/Data, a few changes must be reflected in the tests:
- Move tests to monitoring module
- Change $this->backend references in StatusDat Queries to $this->ds
- Added LibraryLoader to ease requiring of libaries (to be discussed)

refs #4417
refs #4179
2013-07-19 11:36:05 +02:00
Jannis Moßhammer cea7cdbcaf Move Statusdat to backend, remove old backend from library
Except for statusdat, the library/Icinga/Backend classes were unused

refs #4417
refs #4179
2013-07-18 17:20:12 +02:00
Jannis Moßhammer 281d27255b Add documentation for testlib 2013-07-18 17:15:32 +02:00
Jannis Moßhammer 8cc3139f17 Testfixture insertion fixes
refs #4417
2013-07-18 14:53:47 +02:00
Jannis Mosshammer c36cbd3cb8 Add StatusDat support for testfixtures
refs #4417
2013-07-17 13:19:03 +02:00
Jannis Moßhammer c0b5aa962d Add optional datetime format for fixtures
This allows to use the same insertionStrategy class for MySQL
and PgSQL, as they only differ in the datetime format.

refs #4417
2013-07-16 16:37:16 +02:00
Jannis Moßhammer 0e6de0718e Test fixtures for PgSQL and MySQL
WIP commit that adds the test fixture code for
MySQL and PgSQL. MonitoringController can be used as the base
class for controller tests and resolves dependencies required
for testing icinga2web controllers. Hopefully we don't need
that much require-foo in the future, as more dependencies should
move into the request class

refs #4417
2013-07-16 16:20:25 +02:00
Jannis Moßhammer 2f79879a2e Add preliminary subquery based comment and service problem fetch
The serviceproblems and host comment indicator are currently fetched
using subqueries (as this doesn't affect the group by).

refs #4179
2013-07-16 16:16:56 +02:00
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 5489c2fa2e Update license header
refs #4407
2013-07-15 12:26:10 +02:00
Marius Hein 6742696e09 Autoloader: Rename module namespace 2013-07-15 12:16:14 +02:00
Marius Hein 316893ad2c Add new autoloader implementation
New namespace implementation created to load application code
like forms with this autoloader. Consumpting services can register
their own, multiple namespaces. Overlapping namespaces matched
by closest name.

refs #4407
2013-07-12 16:11:03 +02:00
Jannis Moßhammer 820ed8f7a8 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179 2013-07-12 16:02:00 +02:00
Jannis Moßhammer 9c962cb075 Update monitoringproperties to use check_latency instead of latency
refs #4179
2013-07-12 15:57: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 51755209b6 Adapt usage of config class
refs #4354
2013-07-12 15:43:23 +02:00
Jannis Moßhammer 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
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
Jannis Moßhammer 7116cfd60a Host list markup and less changes (WIP)
Modified the host list markup to reflect host information.
Comments are currently missing as well as behaviour and final styling.
The styling part is not really part of the ticket, as we decided
not to style or add additional markup, but as the work
has been done in sprint 1.0-4 it makes no sense to
throw it away at this time

refs #4179
2013-07-12 14:14:32 +02:00
Jannis Moßhammer 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
Marius Hein b9711aecc2 Host detail view: Add tests for properties
Add tests for the property view helper.

refs #4182
2013-07-08 16:12:47 +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 e817b9b790 Host detail view
Add downtime sub component.

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein 6b37fcf24f Host detail view
Add commands to detail view

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein e05f46c587 Host detail view
Command widgets [WIP]

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
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 6eade9c023 Fix use of already replaced class Icinga\Web\Session
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