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
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
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
dac9b7be4b
Fix mixedPagination property typo, Statusloader libraries missing and getter for Abstractquery
...
refs #4178
2013-07-19 17:48:24 +02:00
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
340554a58c
Rename wrong filename
...
refs #4417
2013-07-19 12:00:42 +02:00
76a3ef86c1
Fix QueryAdapter and SlidingWithBorderTest, remove --strict
...
QueryAdapter and SlidingWithBorder used the statusdat backend and
must therefore be modified.
The --strict parameter stores controller tests because of the 1s timeout
and offers now advantages for us at this time.
refs #4417
2013-07-19 11:36:11 +02:00
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
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
281d27255b
Add documentation for testlib
2013-07-18 17:15:32 +02:00
8cc3139f17
Testfixture insertion fixes
...
refs #4417
2013-07-18 14:53:47 +02:00
c36cbd3cb8
Add StatusDat support for testfixtures
...
refs #4417
2013-07-17 13:19:03 +02:00
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
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
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
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
2609c8765b
Merge branch 'feature/autoload-application-code-4407' of ssh://git.icinga.org/icinga2-web
2013-07-15 13:42:16 +02:00
e83526be08
Make form folder optional
...
When the form folder didn't exist, an exception was thrown that
froze the frontend without any error message. Now it is tested
whether the form folder in a module is available and only registered
in the auotoloader if so.
refs #4407
2013-07-15 13:37:43 +02:00
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
51be3bafad
Merge branch 'bugfix/history-api-encoding-4408'
...
fixes #4408
2013-07-15 13:16:58 +02:00
e0f0e1fc13
Fix history api URI encoding
...
The history API encoded components multiple times, e.g. causing a [ to
be converted to %5B in the first link, then to %255B on the second link,
%25255B on the third, etc.
refs #4408
2013-07-15 13:03:12 +02:00
bec7049785
Merge branch 'bugfix/history-api-encoding-4408' into feature/host-overview--4179
2013-07-15 12:41:07 +02:00
5489c2fa2e
Update license header
...
refs #4407
2013-07-15 12:26:10 +02:00
6742696e09
Autoloader: Rename module namespace
2013-07-15 12:16:14 +02:00
e049d8f3c4
Autoload: Fix test before rename namespaces
...
Drop builder test, it is not needed anymore. Skip all notification
tests. Test includes bootstrapping and throw errors with ldap auth.
refs #4407
2013-07-15 11:20:12 +02:00
e27c73fe15
Autoloader: Move builder to new location [WIP]
...
refs #4407
2013-07-15 11:07:22 +02:00
2895b116ad
Add module enablement configuration to gitignore
...
refs #4407
2013-07-12 16:13:19 +02:00
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
820ed8f7a8
Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179
2013-07-12 16:02:00 +02:00
9c962cb075
Update monitoringproperties to use check_latency instead of latency
...
refs #4179
2013-07-12 15:57:14 +02:00
4592e7bd65
Merge branch 'feature/application-and-module-config-4354'
...
fixes #4354
2013-07-12 15:56:43 +02:00
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
6eefa2bacb
Use require_once instead of require in ConfigTest
...
refs #4354
2013-07-12 15:52:35 +02:00
2fffb892d3
Enable registerMenuEntries for modules since this works now
...
refs #4354
2013-07-12 15:44:55 +02:00
51755209b6
Adapt usage of config class
...
refs #4354
2013-07-12 15:43:23 +02:00
8c6f2a07ae
Remove magic retrieval of configuration files
...
This change leads to expected exceptions when bootstrapping the
application since the \Icinga\Application\Config class was
refactored but its usage not.
refs #4354
refs #4353
2013-07-12 15:41:35 +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
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
Jannis Mosshammer
Marius Hein
Eric Lippmann