Commit Graph

235 Commits

Author SHA1 Message Date
Johannes Meyer 03c8de5d7b ContactgroupQuery: Provide case-insensitive filter column `service_host'
refs #8613
2015-04-10 12:20:28 +02:00
Johannes Meyer 31a05a3ec0 DataView\Contactgroup: Add missing query columns 2015-04-10 12:19:19 +02:00
Johannes Meyer a51b93ebfb DataView\Contactgroup: Do not permit querying case-insensitive columns
refs #8163
2015-04-10 12:17:52 +02:00
Johannes Meyer 3d7e418032 ContactQuery: Provide case insensitive filter column `service_host'
refs #8613
2015-04-10 09:50:26 +02:00
Johannes Meyer 6d03b2fe8f DataView\Contact: Add missing filter columns
refs #8613
2015-04-10 09:49:47 +02:00
Johannes Meyer f00adc2138 ContactQuery: Provide ci query columns for aliases and email addresses
refs #8613
2015-04-10 09:45:23 +02:00
Johannes Meyer 9e79419eb1 EventHistoryQuery: Provide `hostgroup_name' as alternative to `hostgroup'
This can't be queried though until #7274 has been resolved.

refs #8613
2015-04-09 14:44:10 +02:00
Johannes Meyer ec67c28629 DataView\EventHistory: Do not permit `host' and `service' to be queried
refs #8613
2015-04-09 14:41:10 +02:00
Johannes Meyer 2c38ccda5c EventHistoryQuery: Drop column `service_host_name'
refs #8613
2015-04-09 14:19:31 +02:00
Johannes Meyer bc6a086ff8 DataView\Comment: Do not permit `comment_author' to be queried
refs #8163
2015-04-09 13:08:49 +02:00
Johannes Meyer 21c76010d4 CommentQuery: Add `comment_author_name' as additional query column
refs #8613
2015-04-09 13:06:38 +02:00
Johannes Meyer 8ed1c8eeb6 DataView\Comment: Add `service_host_name' as allowed query column
refs #8613
2015-04-09 12:56:31 +02:00
Johannes Meyer 002b820835 CommentQuery: Provide `service_host' additionally to `service_host_name'
refs #8613
2015-04-09 12:55:57 +02:00
Johannes Meyer 480f5516d6 DataView\Comment: Do not permit querying `host' and `service'
refs #8613
2015-04-09 12:53:28 +02:00
Johannes Meyer cb95f53dba CommentQuery: Fetch and display object names with their initial collation
i.e. `host_name' instead of `comment_host' alias `host'
and `service_description' instead of `comment_service' alias `service'.

refs #8613
2015-04-09 12:49:06 +02:00
Johannes Meyer f7550f55c1 Permit to filter hosts and services by hostgroup_name and servicegroup_name
refs #8613
2015-04-09 11:41:56 +02:00
Johannes Meyer c56c5655bd Do not permit querying columns with changed collation and a valid alternative
refs #8613
2015-04-08 14:51:04 +02:00
Eric Lippmann f1cdc8c904 Sort host and service overview by display_name by default
refs #8716
2015-03-13 17:19:56 +01:00
Eric Lippmann dbb5aba737 Sort by host_display_name too when sorting by host_severity
refs #8716
2015-03-13 17:14:14 +01:00
Eric Lippmann 03d85ac6ae Sort by service_display_name too when sorting by service_severity
refs #8716
2015-03-13 17:13:52 +01: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 e17f9d7ebe Sort host overview by severity by default ...
... as indicated by the sort control.
2015-03-13 17:08:36 +01:00
Eric Lippmann 132ae9e44c Use {@inheritdoc} in the Comment data view ...
... instead of duplicating method documentation.

refs #8614
2015-03-11 12:57:43 +01:00
Eric Lippmann db99c323cc Add host and service name columns to the Downtime data view
refs #8614
2015-03-06 13:13:48 +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 338d067aba.
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 910065436b monitoring: Support hostgroup_alias and servicegroup_alias filter 2015-01-23 15:47:18 +01:00
Eric Lippmann 3055531e2d monitoring: Support sorting by host and service display name in the Comment data view
refs #7843
2015-01-21 16:15:09 +01:00
Eric Lippmann 94be58e121 monitoring: Support host and service display_name columns in the Comment data view
refs #7843
2015-01-21 16:09:36 +01:00
Eric Lippmann ad879b1ee6 monitoring: Select the host and service display_name columns in the Notification data view
refs #7843
2015-01-21 15:47:36 +01:00
Eric Lippmann 91b7c31cda monitoring: Support sorting downtimes by host and service display_name
refs #7843
2015-01-21 13:06:03 +01:00
Eric Lippmann 5862fc98a5 monitoring: Sort by 'downtime_scheduled_start' too when sorting by 'Is In Effect' 2015-01-21 12:58:46 +01:00
Eric Lippmann 5f0b809619 monitoring: Support host and service display_name columns in the Downtime data view
refs #7843
2015-01-21 12:52:58 +01:00
Eric Lippmann 3e702ac255 monitoring: Support host and service display_name in the EventHistory data view
refs #7843
2015-01-21 10:28:21 +01:00
Eric Lippmann c77996d5b9 monitoring: Sort the services overview by service severity by default 2015-01-21 09:37:45 +01:00
Eric Lippmann eb6591c176 Merge branch 'master' into bugfix/prefer-display_name-over-name1-name2-7843 2015-01-21 09:36:41 +01:00
Eric Lippmann 5df6828889 monitoring: Remove ununsed sort rule in the ServiceStatus 2015-01-21 09:31:38 +01:00
Eric Lippmann e602717bd9 monitoring: Sort by display_names instead of name1 and name2 by default in the services overview
refs #7843
2015-01-21 09:15:07 +01:00
Eric Lippmann 9e8c897d6f monitoring: Order a data view before dumping 2015-01-21 09:13:10 +01:00
Eric Lippmann ab7a5763a6 monitoring: Sort by host_display_name instead of name1 by default
refs #7843
2015-01-20 16:21:56 +01:00
Johannes Meyer e23a794844 There is no "highest" severity, just "some" severity 2014-11-20 12:49:10 +01:00
Johannes Meyer 2fdc1f4322 Sort the hostgroup- and servicegroupsummary by service severity 2014-11-20 09:48:47 +01:00
Matthias Jentsch 022d89254f Fix tab, navigation and menu names 2014-11-13 18:38:42 +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
Thomas Gelf 2782b0a744 Dataview\Customvar: add new is_json column
refs #7569
2014-11-06 16:13:17 +01:00
Marius Hein cd9e3693e4 Downtime: Add filter editor and preview
resolves #7445
2014-11-06 13:22:38 +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 4c23d98575 Merge branch 'master' into bugfix/monitoring-list-dup-entries-7057 2014-10-08 12:45:14 +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
Eric Lippmann 2126b8c341 monitoring: Fix link to an object's contact in the detail views 2014-10-07 13:21:28 +02:00
Alexander Fuhr a0122763a6 Fix Queries: Summaries, Host, Service 2014-10-06 11:37:33 +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
Eric Lippmann 5757a6f34b monitoring: Fix typo in the `Downtime' data view 2014-09-10 09:29:01 +02:00
Thomas Gelf 8fdf20fbf2 Groupsummary: remove invalid sort column discovery
This didn't result in a loop 'til now as it wasn't even used. The problem
here is that the same View is used for tow differend things, this makes no
sense. In the meantime removing that code fixes related problems.
2014-09-03 18:55:20 +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
Marius Hein 5e84ff4ac4 Show/Contact: Add notification history to view
refs #4804
2014-08-27 16:38:29 +02:00
Marius Hein 9465c3ffb6 Show/Contact: Add commands to view
Create a new command query and join contact information into.

refs #4804
2014-08-27 16:38:29 +02:00
Johannes Meyer 3573908071 Let downtime view look more list-like and fix downtime end calculation
refs #6637
2014-08-19 17:03:35 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Thomas Gelf ff9c29472e monitoring/status: re-introduce comments, problems
This re-introduces expensive columns been disabled time ago and adds
even more to it. We are now showing last comment, last ack comment and
service problem count on hosts in list views.

It still costs performance, but seems that we can stand it. I'd like
to add more like this to the host view.
2014-06-25 21:42:24 +02:00
Thomas Gelf d634889acb DataView: ignore case on sort dir
fixes #6573
2014-06-25 21:34:05 +02:00
Thomas Gelf a904ff51aa monitoring/eventhistory: improve query performance
This takes care of timestamp columns, modifies queries in a way not
depending on db functions, filters are passed through to subqueries
for better performance.
2014-06-20 19:14:34 +02:00
Thomas Gelf ecf84077e5 Ido\CommentQuery: add host/service shortcut column 2014-06-20 12:23:23 +02:00
Thomas Gelf 660f84b22f DataView\EventHistory: default sort by timestamp
It doesn't make much sense to sort history by "hostname" hardcoded to
service-only host columns. Default is now timestamp DESC, internally
this is mapped to raw_timestamp.
2014-06-17 12:51:13 +00:00
Thomas Gelf 93e2f36fc8 DataView: remove duplicate case handling 2014-06-17 12:46:41 +00:00
Thomas Gelf c77e178bc7 Monitoring\DataView: small changes
Nothing interesting here
2014-06-06 07:07:07 +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 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 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 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 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
Thomas Gelf cf7aaaed8e Better sort default for service status 2014-04-17 16:25:32 +00: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
Thomas Gelf ad432217b2 Fix downtime scheduled start/end sort error 2014-03-09 22:35:33 +01:00
Thomas Gelf bf66271e49 Still downtimes 2014-03-09 22:32:40 +01:00
Thomas Gelf 88859cb838 The next fat package: downtimes, everywhere 2014-03-09 21:58:01 +01:00
Thomas Gelf 2f61075260 More comment query cleanup and fix a typo 2014-03-09 20:05:59 +01:00
Thomas Gelf 2c3da5969a Great, sortControl is not alias-aware. Fix comment sort options 2014-03-09 19:39:32 +01:00
Thomas Gelf 63fd074a4f Comments are still messy, clean up and fix adding / removing them 2014-03-09 19:29:23 +01:00
Thomas Gelf a87925bbf6 Refactored notifications for object detail view 2014-03-08 21:02:22 +01:00
Thomas Gelf 740df4ccac Cleaning up object downtimes. What a mess... :( 2014-03-08 18:28:19 +01:00
Johannes Meyer e8a626e896 Change the way how boxed status information is presented to the user 2014-03-07 16:43:41 +01:00
Johannes Meyer 067fa02263 Split and merge status summary in tactical overview 2014-03-07 08:59:20 +01:00
Johannes Meyer 1b503fd187 Clean up StatusSummary query 2014-03-06 14:29:50 +01:00
Thomas Gelf 8ccd748310 Allow "better" join for comments 2014-03-04 12:57:40 +00:00
Thomas Gelf c2213e7b71 Merge branch 'feature/tactical-overview-3782' into feature/master-1 2014-03-04 10:26:51 +00:00
Johannes Meyer ba45d64891 Extend StatusSummaryQuery and its view
refs #3782
2014-03-03 09:03:07 +01:00
Alexander Klimov b8efe1a93c Collect some garbage in the source code 2014-02-28 08:48:34 +01:00
Alexander Klimov 0e0672e0c1 Add tactical overview (WIP)
refs #3782
2014-02-28 08:48:34 +01:00
Thomas Gelf 7ff4f55737 Quick & dirty proposal for new grouped history overviews 2014-02-21 14:05:28 +00:00
Thomas Gelf 8ef6cc79cc Allow to sort contact groups by alias name 2014-02-21 14:04:39 +00:00
Thomas Gelf 77dada8318 A few small backend changes 2014-02-21 14:03:49 +00:00
Thomas Gelf 249018808b Added missing columns to the groupsummary queries 2014-02-21 14:03:49 +00:00
Johannes Meyer c89f3b6140 Add filter functionality to eventhistory view and fix default order direction
refs #5589
2014-02-21 12:59:32 +01:00
Eric Lippmann ec42ddde12 Landing Page: Show unhandled host and service problems 2013-10-23 15:55:53 +02:00
Eric Lippmann ca1d50ae53 Rename Icinga 2 Web to Icinga Web 2 2013-10-23 15:11:06 +02:00
Eric Lippmann 46569bad32 Monitoring: Fix group and state summaries for IDO and Stadusdat 2013-10-22 15:11:07 +02:00
Eric Lippmann c5bed8ad00 Monitoring: Add host and service unhandled column; remove s from host- and servicegroups 2013-10-22 15:11:07 +02:00
Jannis Moßhammer cc5fa0a7b4 Fix suburls in grids not being recognized 2013-10-21 17:57:29 +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
Marius Hein 5a1a738ce7 Add form to configure objects
refs #4924
2013-10-20 13:15:11 +02:00
Eric Lippmann 652df9fd66 Monitoring/Downtimes: Wrap information in a two column view 2013-10-19 17:24:28 +02:00
Eric Lippmann 06158aa4ea Monitoring/Notifications: Wrap information in a two column view 2013-10-19 13:13:56 +02:00
Matthias Jentsch 8c416a51ce Add views and behaviour to MultiController
Add views for every possible action, fix some bugs in the JavaScript multi selection,
make selection hrefs in the list controllers unique to be able to handle the selection
properly

refs #3788
2013-10-18 16:44:02 +02:00
Marius Hein c805550662 Performance overview
resolves #4189
resolves #4136
2013-10-18 11:32:53 +02:00
Jannis Moßhammer 6095a71a8d CS Fixes
refs #4868
2013-10-17 21:40:02 +02:00
Jannis Moßhammer 7a7c10e8df Fix EventHistory Query and tests
refs #4868
2013-10-17 20:53:11 +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
Jannis Moßhammer 44be5e85da Refactoring and Query and IDO code,
the Monitoring/View code was completly dropped in favor of
the DataView implementations, as new Backends otherwise
would require to implement two seperate query logics

refs #3801
2013-10-17 19:54:58 +02:00
Jannis Moßhammer d33cec78de Semantic search implementation
- Only implemented for hosts as an example
- URL behaviour still has to be normalized

refs #4469
2013-10-17 19:52:52 +02:00
Jannis Moßhammer dac61eda19 Implement Filter to IDO Sql parser
refs #4469
2013-10-17 19:52:25 +02:00
Eric Lippmann bb8cad2a85 Add event history list view (WIP)
refs #4765
2013-10-17 16:18:34 +02:00
Marius Hein d6fd3350e0 Apply style to detail
refs #4869
2013-10-15 18:10:36 +02:00
Eric Lippmann a730713c0a Add sort control to hostgroup summary and fix sort rules for the generic group summary
refs #4185
2013-10-15 15:33:53 +02:00
Eric Lippmann 2291e73c4c Servicegroup Summary: Add sort control
refs #4185
2013-10-15 15:13:48 +02:00
Eric Lippmann 1f571589de Add yet hidden servicegroup summary w/ servicegroup overview rendered to detail
refs #4185
refs #4183
2013-10-15 15:13:48 +02:00
Eric Lippmann ca6c51aef7 Monitoring/DataView: Add static method fromParams to create a view from a parameters array
refs #4823
2013-10-14 12:57:26 +02:00
Marius Hein 1eef471bc2 Comment overview: Basic implementation
refs #4714
2013-10-09 09:35:32 +02:00
Matthias Jentsch 5d4533a6ad Add contact and contactgroup views
Create the new views, extend backend queries to fetch timeperiods and add
navigation bar entries

refs #4713
2013-10-09 09:32:21 +02:00
Eric Lippmann a42668edb8 Fix tests
refs #4663
2013-10-09 09:20:17 +02:00
Eric Lippmann 61bfcd495b Add more information to host and service list 2013-10-09 09:20:17 +02:00
Eric Lippmann c56771baa3 Monitoring: Fix list notifications 2013-10-09 09:20:17 +02:00
Eric Lippmann b89d61add3 Monitoring: Refactor data views (WIP)
refs #4663
2013-10-09 09:20:16 +02:00