4485 Commits

Author SHA1 Message Date
Thomas Gelf
12b57c6d95 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
	modules/monitoring/library/Monitoring/Controller.php
2014-05-20 23:15:11 +00:00
Thomas Gelf
79f3b32474 monitoring/viewscripts: avoid errors in comments
PHP code may cause errors even if sitting in HTML comments. Also fixed a
HTML nesting error in list/servicematrix and reduced indentation.
2014-05-20 22:26:21 +00:00
Thomas Gelf
8b28bdc82a Monitoring\Object: small fix for strange private's 2014-05-20 22:22:48 +00:00
Thomas Gelf
a7b8e0023d Monitoring\Object: explictely define columns
Define the colums we use instead of fetching "everything" status view
provides. Without this performance degrades with every new feature.
2014-05-20 22:19:26 +00:00
Thomas Gelf
76c1aa73c8 Monitoring\Controller: remove obsolete namespaces 2014-05-20 22:13:39 +00:00
Michael Friedrich
d155c7a3fc Fix checks for empty check source attribute
refs ##5814
2014-05-20 23:46:33 +02:00
Michael Friedrich
ef2ac077c8 Fix typo in flapping note 2014-05-20 23:45:48 +02:00
Thomas Gelf
941ff2a980 monitoring/show: remove CheckSource helper
It isn't doing anything but escape, so we can safely skip it.
2014-05-20 20:39:02 +00:00
Thomas Gelf
31fa794440 monitoring/ido: implement IDO version support
We want to make use of new IDO features without breaking compatibility.
This is a quickfix as otherwise we would currently break everything
below 1.10. Code contains a few TODOs as this needs improvement.
2014-05-20 20:36:39 +00:00
Michael Friedrich
9fbdb65a4b Add check source to host/service details
refs #5814
2014-05-20 20:07:09 +02:00
Thomas Gelf
cff577fb83 ShowController: don't show a random service
When you chose a host and clicked on "Services" the GUI used to show
a random (the first) service. Made no sense, should work as expected
right now.
2014-05-20 13:57:28 +00:00
Thomas Gelf
8f77ce607e show/services: don't navigate to the right
When using list/services for show/services (services for a single host)
we us an ugly PREG-based hack fixing the base link target. This got
broken by the multiselect feature, now it's working again. We need a
better solution for this.
2014-05-20 13:53:36 +00:00
Thomas Gelf
33e326a232 list/services: ignore broken service image hacks
People used to configure something like "dot.png'> <img ..." as their
service image icon. Those hacks will no longer work as we correctly
escape everything. This fix hinders Icingaweb from even trying to load
them.
2014-05-20 13:31:13 +00:00
Thomas Gelf
e6d80ae1f6 IDO Queries: performance quickfixes
Will be obsoleted by the new filter implementation, but for now it
helps a little bit
2014-05-20 13:27:58 +00:00
Thomas Gelf
339460fee4 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-05-09 16:29:54 +00:00
Thomas Gelf
6523af711c Monitoring_ListController: autorefresh matrix...
...and notification views

fixes #6152
2014-05-09 16:01:47 +00:00
Thomas Gelf
d93c060e6a Upgrade htmlpurifier to 4.6.0
refs #6165
2014-05-09 10:41:20 +00:00
Thomas Gelf
e04ca8c29a Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-05-07 15:53:48 +00:00
Matthias Jentsch
d0c56126b8 Fix inline pie reload.
refs #6124
2014-05-07 17:03:27 +02: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
bc4783099a Monitoring/ListController: Sort `hostStatus' view from request params
The `hostAction()' lacked ordering because the action no longer uses `HostStatusView::fromRequest()'.
2014-05-07 10:25:48 +02: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
068e07109b Monitoring/ListController: Operate on the `hostStatus' view instead of the query
The monitoring module's ListController should only operate on data views instead of queries.
Thus the applyRestrictions() method now expects a data view instead of a query. Further since
filters are subject to change the applyRestrictions() method now does nothing.

The `hostsAction()' no longer uses `DataView::fromRequest()' but selects the data view from
a monitoring backend. `DataView::fromRequest()' orders the underlying query which must be reworked
in the current scenario.
2014-05-07 09:40:23 +02:00
Eric Lippmann
cfdb695c94 Monitoring/ListController: Remove variable activeRowHref from view
The variable grapher activeRowHref is not being used anywhere.
2014-05-07 09:29:58 +02:00
Eric Lippmann
3afcf277bd Monitoring/ListController: Remove variable grapher from view
The variable grapher retrieved as first available grapher hook is not being
used anywhere.
2014-05-07 09:27:42 +02:00
Eric Lippmann
d87788b9c1 Merge branch 'master' into feature/query-interfaces-6018
Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
2014-05-06 18:45:12 +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
c23e0c3782 Remove createBackend() method from the base controller
Refering to d389d8e we'll use Backend::createBackend() for accessing monitoring backends.
2014-05-06 18:24:42 +02:00
Thomas Gelf
d389d8e0f0 Re-establish Backend::createBackend
This partially reverts fcf7f7d6. The original intention was to have
no library code reading config. Moving code snippets to another lib
doesn't solve this. We need quick & easy access to a monitoring
backend, on CLI, in other modules and so forth. Duplicating so much
code again and again is not an option.

I prefer the former way of doing things unless we find a better
solution.
2014-05-06 18:23:22 +02:00
Johannes Meyer
0627d954ac Fix usages of Icinga\Module\Monitoring\Plugin\*
refs #5973
2014-05-05 16:16:45 +02:00
Johannes Meyer
3d88e720c4 Rewrite perfdata plugin classes
refs #5973
2014-05-05 16:15:49 +02:00
Johannes Meyer
d4502575d3 Fix filter test location 2014-05-05 16:15:26 +02:00
Gunnar Beutner
b7f4fa4a29 Fix deprecation warning in Perfdata.php
fixes #6076
2014-04-29 12:00:34 +02:00
Johannes Meyer
e2ba172a8e Make dashboard components using the ini writer class
fixes #5524
2014-04-29 11:30:53 +02:00
Johannes Meyer
290fe9eeb5 Rewrite test for Icinga\Web\Hook
refs #6011
2014-04-28 14:06:40 +02:00
Johannes Meyer
1db9b1ede4 Move non-factory functions from DateTimeFactory to Icinga\Util\Format 2014-04-28 14:06:39 +02:00
Matthias Jentsch
c641988233 Preserve multiselection during refresh
refs #5765
2014-04-28 09:48:06 +02:00
Matthias Jentsch
b791883fa8 Fix configuration checkboxes and colors in piecharts
refs #5765
2014-04-28 09:48:06 +02:00
Matthias Jentsch
b16c6efa05 Add PieChart to display hosts and services, improve layout and fix flag
checkboxes

refs #5765
2014-04-28 09:48:06 +02:00
Matthias Jentsch
081b5072a6 Fix layout of MultiController views
refs #5765
2014-04-28 09:48:06 +02:00
Matthias Jentsch
cb630d45ad Fix issues issues with javascript multiselection
refs #5765
2014-04-28 09:48:05 +02:00
Matthias Jentsch
3b2bb3c4fc Move functions to perform single, multi and range-selection into the ui module
refs #5765
2014-04-28 09:48:05 +02:00
Matthias Jentsch
6d303f1c42 Add abillity for multi and range-selection to events.js
Add the abillity to select multiple rows, with a multi-selection using the
CTRL-key or a range-selection using the shift-key. Also fix several issues in
the Multi-Controller of the Backend.

refs #5765
2014-04-28 09:48:05 +02:00
Thomas Gelf
f741bc01f3 We need stricter control over Monitoring Object queries
* fromRequest-generated ones are sometimes buggy and sometimes slow
* this is just a temporary quickfix for the worst problems
2014-04-17 16:41:10 +00:00
Thomas Gelf
cf7aaaed8e Better sort default for service status 2014-04-17 16:25:32 +00:00
Thomas Gelf
54175f98bf Fix wrong contactgroup service column and make better use of MySQL indexes 2014-04-17 16:14:57 +00:00
Eric Lippmann
fcf7f7d6dc Replace Backend::createBackend() with Monitoring/Controller::createBackend()
Library code should not read configuration files. The new createBackend() method
from Monitoring/Controller takes care of reading backend configuration and error
handling. The Backend constructor now requires a resource instance.
2014-04-17 15:53:23 +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
Eric Lippmann
62e044d888 IdoQuery: Move resolveColumns() to the columns() function
Since the BaseQuery no longer allows passing the columns to select via
its the constructor, the columns are resolved when set by the
columns() function.
2014-04-16 10:06:44 +02:00
Eric Lippmann
eeadc17a6e StatusQuery: Rename baseQuery to select 2014-04-15 18:12:56 +02:00