57 Commits

Author SHA1 Message Date
Johannes Meyer
7662545c2a SimpleQuery: Provide a getter for the current iterator position
refs #8615
2015-08-06 09:39:23 +02:00
Johannes Meyer
9a0e47a3e1 SimpleQuery: Add method hasResult()
refs #9632
2015-08-03 14:49:33 +02:00
Johannes Meyer
99c69cc461 SimpleQuery: Add support for peek aheads
refs #9661
2015-07-31 13:51:39 +02:00
Johannes Meyer
1f6bc8ea47 DataView: Implement interface SortRules
refs #6644
2015-07-28 11:41:25 +02:00
Johannes Meyer
cfd43f251e Revert "Sortable: Allow to check for a particular sort rule"
This reverts commit ae21baa41e55e50774b4e7d42e24686bf231c25f.
2015-06-26 15:13:46 +02:00
Johannes Meyer
ae21baa41e Sortable: Allow to check for a particular sort rule 2015-06-26 14:54:15 +02:00
Johannes Meyer
98b01207cf Show intersecting ok-states as well in the default servicegrid view
fixes #9360
2015-06-24 14:37:07 +02:00
Johannes Meyer
265725447d Merge branch 'master' into feature/user-and-group-management-8826 2015-05-22 10:06:31 +02:00
Eric Lippmann
47f21eebaa Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'
fixes #8241
2015-05-21 14:05:49 +02:00
Eric Lippmann
82f9425b90 Revert "Make ascending sort by host or service severity initiatable"
This reverts commit 386d4db851aed056652d892d539de35b403c5062.

The commit introduced the bug that changing the sort direction no longer changed the sort direction :)

refs #9059
2015-05-21 12:20:18 +02:00
Alexander A. Klimov
2ed1d6c66b Implement ::getSearchColumns()
refs #8241
2015-05-19 17:36:24 +02:00
Johannes Meyer
fb07f0b94c Merge branch 'master' into feature/user-and-group-management-8826
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +02:00
Johannes Meyer
4cedfce07f DataView: Fix that method getOffset() calls parent::hasOffset() 2015-05-19 13:57:20 +02:00
Johannes Meyer
a629adb448 DataView: Remove method paginate() 2015-05-19 13:57:20 +02:00
Johannes Meyer
f305a334d5 DbConnection: Drop param $columnIndex in fetchColumn(), it's unused 2015-05-19 09:48:20 +02:00
Johannes Meyer
0e0341f78a It's the connection which provides a cursor, not the query 2015-05-18 16:01:58 +02:00
Johannes Meyer
742dfcaf41 Revert "Fetchable: Add method fetch() which returns an iterator"
This reverts commit 7a6837de0e331e19d09a22a8565ab0ea2e11a0cf.
2015-05-18 15:17:22 +02:00
Johannes Meyer
7a6837de0e Fetchable: Add method fetch() which returns an iterator 2015-05-18 13:59:16 +02:00
Johannes Meyer
5faebb4a88 DataView: Implement interface IteratorAggregate
I'd like to foreach such.
2015-05-15 14:37:41 +02:00
Johannes Meyer
3770741ba5 DataView: Implement QueryInterface
An instance of DataView should implement the full interface, not only
parts of it.
2015-05-15 14:37:41 +02:00
Alexander A. Klimov
386d4db851 Make ascending sort by host or service severity initiatable
fixes #9059
2015-05-15 11:19:52 +02:00
Eric Lippmann
7ddd8d7ad2 Add support for order next to the column to DataView::getSortRules()
refs #8716
2015-03-13 17:12:16 +01:00
Eric Lippmann
6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann
5b4fab0750 Add license header
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
Eric Lippmann
5fa2e3cfdc Revert "Add license header"
This reverts commit 338d067aba41dd6e9178cebec5433eecd614196e.
2015-02-03 16:16:26 +01:00
Eric Lippmann
338d067aba Add license header
fixes #7788
2015-02-03 15:51:04 +01:00
Eric Lippmann
e086905384 monitoring: Deprecate DataView::addFilter() and DataView::setFilter()
The from now on deprecated interface Filterable has proven that it sucks in the DataView.
Because of requiring us to implement trillion stupid methods, only DataView::applyFilter()
does not forget to handle column validation. Thus only DataView::applyFilter() must be used in order
to apply filters.
For setFilter() a wrapping Filter::matchAny() for the IdoQuery (or the DbQuery or the SimpleQuery I didn't have a look)
is required for the filter to work properly.
The deprecation is just for the records. I guess we do not use the other methods.
2015-01-27 14:52:13 +01:00
Eric Lippmann
9e8c897d6f monitoring: Order a data view before dumping 2015-01-21 09:13:10 +01:00
Thomas Gelf
f24b0e2a4e MonitoringBackend: a few more places, doesn't hurt 2014-11-12 00:20:37 +01:00
Thomas Gelf
1557410b72 DataView: query instantiation is up to the backend
refs #7635
2014-11-11 15:49:27 +01:00
Alexander Klimov
ba12d7b46c Use mt() in the monitoring module instead of just t()
fixes #7330
2014-10-21 17:22:16 +02:00
Alexander Fuhr
afc97b1cac Fix the duplicate entries in monitoring list shows
refs #7057
refs #7344
fixes #7057
2014-10-08 12:30:08 +02:00
Alexander Fuhr
fcc56c9809 monitoring: Fix some of `DataView's PHPDoc 2014-10-07 16:09:19 +02:00
Alexander Fuhr
a9ae75b6b0 monitoring: Fix that sorting a data view is not possible if its sort
rules are empty
2014-10-07 16:05:20 +02:00
Alexander Fuhr
e96065e065 Implement validation for filter and sort columns 2014-10-06 11:32:15 +02:00
Eric Lippmann
2dd81d12ba monitoring: Add `DataView::count()' 2014-09-19 15:42:13 +02:00
Thomas Gelf
307787cfb7 DataView: use default sort order if none given
We should not be forced to order(null) to have the default order, that
should be the default in case order has not been called.

refs #6644
2014-09-02 12:54:38 +02:00
Johannes Meyer
3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Thomas Gelf
d634889acb DataView: ignore case on sort dir
fixes #6573
2014-06-25 21:34:05 +02:00
Thomas Gelf
93e2f36fc8 DataView: remove duplicate case handling 2014-06-17 12:46:41 +00:00
Thomas Gelf
1677193571 Monitoring: adjust Backend and DataView
Made them use the new filters and interfaces.

refs #6418
2014-06-06 07:05:21 +00:00
Thomas Gelf
820b6b7a8d Data\BaseQuery: rename to Data\SimpleQuery
BaseQuery should no longer be abstract but be usable as is as soon as
we stripped ResultSet-specific tasks. As "Base" suggests something that
must be extended, the name no longer fits. So this is SimpleQuery right
now.
2014-05-07 11:55:35 +00:00
Eric Lippmann
5b895ab038 Data views: Implement `Sortable' interface
Because the `ListController' should only operate on data views,
data views should be a proxy to their underlying queries.

The methods `DataView::fromRequest()' and `DataView::sort()' are from now on deprecated
because they are relaced by `$backend->select()->from($viewName)' and `DataView::order()' respectively.
2014-05-07 10:19:00 +02:00
Eric Lippmann
97d6feccb8 Data views: Expect a query instance instead of a backend 2014-05-06 18:34:01 +02:00
Eric Lippmann
e804f56d5f Data views: Rename getTableName() to getQueryName()
getQueryName is more obvious because the function returns
the name of the query the view should use for querying.
2014-04-17 13:59:11 +02:00
Johannes Meyer
71f4b6960b Add servicematrix view
refs #4180
2014-03-19 09:11:24 +01:00
Eric Lippmann
ca1d50ae53 Rename Icinga 2 Web to Icinga Web 2 2013-10-23 15:11:06 +02:00
Eric Lippmann
36e9cdb549 Monitoring/register: Add status summary to the top bar 2013-10-20 16:08:53 +02:00
Jannis Moßhammer
f350011028 Add Status.dat backend
refs #3801
2013-10-20 15:16:44 +02:00
Jannis Moßhammer
4a95ba3468 Change url handling to detail on hashtag, add service filter
The url is now
http://%mainUrl%#%anchor%!detail=%detailUrl%
which allows us to better support IE and prevents
the detail url from appearing on the server side.

refs #4868
2013-10-17 19:55:00 +02:00