Commit Graph

996 Commits

Author SHA1 Message Date
Eric Lippmann a9680bfd68 monitoring: Add host comment data view
refs #9009
2015-05-29 15:34:38 +02:00
Eric Lippmann ebe8a409e3 monitoring: Add host comment query
refs #9009
2015-05-29 15:34:18 +02:00
Eric Lippmann bb97269c55 monitoring: Use the Hostdowntime data view in the HostList
refs #9009
2015-05-29 15:10:14 +02:00
Eric Lippmann f1bb064020 monitoring: Use the Servicedowntime data view in the ServiceList
refs #9009
2015-05-29 15:10:00 +02:00
Eric Lippmann 2cbadbf957 Revert "monitoring: Don't select host last ack, comment and downtime"
This reverts commit e240f7b955.

refs #7344
refs #9009
2015-05-29 15:09:21 +02:00
Eric Lippmann 0729973045 monitoring: Add last *comment columns to the host status queries 2015-05-29 15:07:06 +02:00
Eric Lippmann e71682ffb3 monitoring: Don't join downtimes in the servicestatus query
refs #9009
2015-05-29 13:20:01 +02:00
Eric Lippmann ba07077ca8 monitoring: Don't join downtimes in the hoststatus query
refs #9009
2015-05-29 13:13:28 +02:00
Eric Lippmann 6e94755c4c monitoring: Use host and service downtime query in the downtime query
refs #9009
2015-05-29 13:12:34 +02:00
Eric Lippmann b833a04110 monitoring: Add data view for service downtimes
refs #9009
2015-05-29 13:12:03 +02:00
Eric Lippmann 02cabf3a50 monitoring: Add query for service downtimes
refs #9009
2015-05-29 13:11:48 +02:00
Eric Lippmann 22a83b7388 monitoring: Add data view for host downtimes
refs #9009
2015-05-29 13:11:32 +02:00
Eric Lippmann 3e53426ece monitoring: Add query for host downtimes
refs #9009
2015-05-29 13:10:20 +02:00
Eric Lippmann 3a69e8185f monitoring: Add restrictable filter columns to the downtime data view
refs #9009
2015-05-29 11:44:34 +02:00
Eric Lippmann b1446fcb23 monitoring: Allow the hoststatus query to be filtered by restrictable columns
refs #9009
2015-05-29 11:43:41 +02:00
Eric Lippmann 4544653c2e monitoring: Don't apply restrictions in the downtime query
Restrictions should be applied from the controller.

refs #9009
2015-05-29 11:41:39 +02:00
Eric Lippmann 7793b61e4c monitoring: Combine restrictions w/ OR
If a user has more than one filter for the same restriction, the filters will be combined w/ or. The combined filters will then be applied w/ AND to the query.

refs #9009
2015-05-29 11:40:26 +02:00
Eric Lippmann 9f155ea99d monitoring: Don't show SSH command when transporting a command to a remote command file failed
refs #8006
2015-05-28 16:33:35 +02:00
Eric Lippmann a4a1a296d1 monitoring: Reduce error output when transporting a command to a local command file failed
refs #8006
2015-05-28 16:13:35 +02:00
Matthias Jentsch a66949162b Resolve macros when accessing getters on MonitoredObjects
refs #6392
2015-05-28 15:01:10 +02:00
Matthias Jentsch 37f58e55d8 Move macro resolcing functionality into separate class
Make macro resolving functionality available to all code, instead of depending on a view

resf #6392
2015-05-28 14:44:16 +02:00
Johannes Meyer 58d78f59f3 DbQuery: Initialize self::$select as early as possible
I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query...
2015-05-28 13:49:36 +02:00
Eric Lippmann 646cffd62d monitoring: Remove the services tab when showing host or service details
refs #7998
2015-05-28 12:22:57 +02:00
Matthias Jentsch 6c44f6a11a Deduplicate url-attribute parsing code
Use function to fetch all host links in MonitoredObject instead.
2015-05-28 10:47:44 +02:00
Eric Lippmann 0c1df335fc monitoring: Fix select columns for downtimes, again
refs #9009
refs #9319
2015-05-26 17:15:03 +02:00
Eric Lippmann 61565543ab monitoring: Fix downtime filter columns
refs #9009
refs #9319
2015-05-26 17:10:23 +02:00
Eric Lippmann bb9b9bc754 monitoring: Apply host and service restrictions to downtimes
refs #9009
refs #9319
2015-05-26 17:05:47 +02:00
Eric Lippmann 788481e2b1 monitoring: Add Servicestatus query
refs #7344
refs #9009
2015-05-26 17:02:41 +02:00
Eric Lippmann 18499a4a59 monitoring: Support joining downtimes on the Hoststatus query
refs #7344
refs #9009
2015-05-26 17:02:13 +02:00
Eric Lippmann b0576d93de monitoring: Support selecting NULL as column
refs #9009
2015-05-26 17:00:56 +02:00
Eric Lippmann b24e3393f0 monitoring: Prohibit sorting the HostStatus data view by service columns
refs #7344
refs #9009
2015-05-26 17:00:48 +02:00
Eric Lippmann e240f7b955 monitoring: Don't select host last ack, comment and downtime
Where unsure whether or not we will still support this.

refs #7344
refs #9009
2015-05-26 17:00:39 +02:00
Eric Lippmann c81d13d77a monitoring: Use the HostatusQuery in the HostStatus data view
refs #7344
refs #9009
2015-05-26 17:00:34 +02:00
Eric Lippmann e9dd69267c monitoring: Prepare HoststatusQuery to be used when viewing hosts
The Hoststatusquery does not include the joins for last ack, comment and downtime as where unsure whether or not we will still support this.

refs #7344
refs #9009
2015-05-26 17:00:24 +02:00
Matthias Jentsch 4ac7557c2f Show host and service notes in the host and service detail view
refs #8235
2015-05-26 16:40:32 +02:00
Johannes Meyer 59ff4221f6 CommandTransport: Make sure to reset the config before calling current() 2015-05-22 14:01:11 +02:00
Johannes Meyer 265725447d Merge branch 'master' into feature/user-and-group-management-8826 2015-05-22 10:06:31 +02:00
Marius Hein 57abafd10b Merge branch 'master' into bugfix/customvars-case-insensitive-8696 2015-05-21 16:51:04 +02:00
Marius Hein 7c04664888 Make MySQL collation syntax default
Overwrite customVarsJoinTemplate for Postgres and Oracle.

refs #8696
2015-05-21 16:09:03 +02:00
Matthias Jentsch 8ce9989243 Merge branch 'feature/support-icon-image-alt-9300'
resolves #9300
2015-05-21 15:03:06 +02:00
Matthias Jentsch 598ef1e8f4 Add alt-text to icon_images
Print alt-text as title and alt-attribute in the helper class and add the alt-column to the backend query.

refs #9300
2015-05-21 14:59:12 +02:00
Marius Hein e8e3b940af Use CustomVariable names case insensitive
refs #8696
2015-05-21 14:42:09 +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 57328aa6ed monitoring: Make host group and service group alias columns case insensitive
The alias columns should be case insenstive because we now support them when searching.

refs #8241
2015-05-21 13:58:54 +02:00
Eric Lippmann 0c72686ba1 monitoring: Make display_name columns case insensitive
The display_name columns should be case insenstive because we now support them when searching.

refs #8241
2015-05-21 12:46:47 +02:00
Eric Lippmann ad5ab16b3f monitoring: Drop the Groupsummary data view
We have Hostgroupsummary and Servicegroupsummary now.

refs #8241
2015-05-21 12:43:27 +02:00
Eric Lippmann 1a1f93db23 monitoring: Add sort rules to the service group summary
refs #8241
2015-05-21 12:41:29 +02:00
Eric Lippmann e7396ea49c monitoring: Add services_severity to the service group summary data view
refs #8241
2015-05-21 12:38:58 +02:00
Eric Lippmann 73eb8cc805 monitoring: Add sort rule for total services to the host group summary
refs #8241
2015-05-21 12:37:53 +02:00
Eric Lippmann 58b3192ce3 monitoring: Add sort rules to the host group summary
refs #8241
2015-05-21 12:26:27 +02:00
Eric Lippmann 195275a716 monitoring: Don't hardcode sort direction of the severity columns
fixes #9059
2015-05-21 12:20:18 +02:00
Eric Lippmann 82f9425b90 Revert "Make ascending sort by host or service severity initiatable"
This reverts commit 386d4db851.

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
Eric Lippmann 37abc724de monitoring: Let the host group summary provide the column hosts_severity
refs #8241
2015-05-21 11:24:31 +02:00
Eric Lippmann bbed2cffae monitoring: Add column hosts_severity to the group summary query
refs #8241
2015-05-21 11:23:55 +02:00
Eric Lippmann ce463d16ef Reorder group summary query's columns by name
refs #8241
2015-05-21 11:19:58 +02:00
Eric Lippmann cfb819ec61 monitoring: Add missing column to the host group summary data view
refs #8241
2015-05-20 17:03:23 +02:00
Eric Lippmann b9a6e1042d Merge branch 'master' into bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241
Conflicts:
	modules/monitoring/application/controllers/ListController.php
2015-05-20 17:02:49 +02:00
Eric Lippmann 80b174f526 monitoring: Servicegroupsummary must not extend Groupsummary which is subject to remove
refs #8241
2015-05-20 16:16:21 +02:00
Eric Lippmann a9d6a94957 monitoring: Use the groupsummary query for the service group summary view
refs #8241
2015-05-20 16:09:30 +02:00
Eric Lippmann d379b27c24 monitoring: Hostgroupsummary must not extend Groupsummary which is subject to remove
refs #8241
2015-05-20 15:50:19 +02:00
Eric Lippmann 41e72396ee monitoring: Use the groupsummary query for the host group summary view
refs #8241
2015-05-20 15:50:06 +02:00
Eric Lippmann 2493535ac7 Revert "Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery"
This reverts commit 9b4f08eb43.

There's DataView::getQueryName() for this.

refs #8241
2015-05-20 15:29:45 +02:00
Johannes Meyer 71fa736144 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-20 10:46:55 +02:00
Alexander A. Klimov 9b4f08eb43 Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery
Without this the Hostgroupsummary and Servicegroupsummary DataViews would not work

refs #8241
2015-05-20 10:43:54 +02:00
Alexander A. Klimov 93db1d15cb Override ::getSearchColumns()
refs #8241
2015-05-19 18:17:40 +02:00
Alexander A. Klimov 6ba07b089d Implement and use Hostgroupsummary and Servicegroupsummary
refs #8241
2015-05-19 18:17:40 +02:00
Matthias Jentsch c0cf6e4918 Display icon_images in all host and service detail views
refs #8665
2015-05-19 18:08:26 +02:00
Alexander A. Klimov 2ed1d6c66b Implement ::getSearchColumns()
refs #8241
2015-05-19 17:36:24 +02:00
Eric Lippmann 0a8c9ad195 Merge branch 'feature/list-number-of-hosts-in-host-groups-8054'
resolves #8054
2015-05-19 15:10:20 +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
Matthias Jentsch 592d5eadc1 Merge branch 'feature/improve-multi-select-view-8565' 2015-05-18 16:00:52 +02:00
Matthias Jentsch c3129890aa Improve multi-view tabs
Display the current object count next to the tab title, to clarify that those views display a summary of multiple items. Only display the current tab for hosts or services, to avoid confusion.

refs #8565
2015-05-18 15:25:12 +02:00
Johannes Meyer 742dfcaf41 Revert "Fetchable: Add method fetch() which returns an iterator"
This reverts commit 7a6837de0e.
2015-05-18 15:17:22 +02:00
Matthias Jentsch 00bbb762a1 Integrate comments and downtimes into MonitoredObjectsController
Add option to list all related commends and downtimes into the specific hosts and serivces views.

refs #8565
2015-05-18 14:03:10 +02:00
Johannes Meyer 7a6837de0e Fetchable: Add method fetch() which returns an iterator 2015-05-18 13:59:16 +02:00
Marius Hein 62d8c441f8 Add ServiceActionsHook
refs #9284
2015-05-18 11:45:39 +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
Johannes Meyer 149e893ecd Revert "Make ascending sort by host or service severity initiatable"
This reverts commit 7e1f9f6dcc.
2015-05-15 10:54:30 +02:00
Alexander A. Klimov ead0a64244 GroupsummaryQuery: add column `hosts_total'
refs #8054
2015-05-13 18:10:18 +02:00
Alexander A. Klimov 7e1f9f6dcc Make ascending sort by host or service severity initiatable
fixes #9059
2015-05-13 17:48:34 +02:00
Alexander A. Klimov 43d8968bd2 GroupsummaryQuery: add columns
hosts_up_last_state_change
hosts_pending_last_state_change
hosts_down_last_state_change_handled
hosts_unreachable_last_state_change_handled
hosts_down_last_state_change_unhandled
hosts_unreachable_last_state_change_unhandled

refs #8860
2015-05-13 16:22:47 +02:00
Alexander A. Klimov 9e3d65e4e9 Display performance data metrics with value 0
fixes #8744
2015-05-12 17:44:53 +02:00
Alexander A. Klimov 7353c0d287 IdoQuery::initializeForPostgres(): cast only valid IP addresses to inet
fixes #7165
2015-05-12 16:35:14 +02:00
Matthias Jentsch 25f397042b Merge branch 'master' into feature/improve-multi-select-view-8565
Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php
	modules/monitoring/application/views/scripts/hosts/show.phtml
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
	modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
	modules/monitoring/application/views/scripts/services/show.phtml
	modules/monitoring/public/css/module.less
	public/js/icinga/behavior/tooltip.js
2015-05-11 13:28:43 +02:00
Matthias Jentsch 83efc3a4a3 Conform to coding guidelines 2015-05-07 17:23:50 +02:00
Matthias Jentsch 7cf2cb034e Remove unused and redundant controller actions
refs #8624
2015-05-07 16:22:17 +02:00
Matthias Jentsch 4463f16f04 Add abbillity to remove multiple comments by id
refs #8624
2015-05-07 15:11:54 +02:00
Matthias Jentsch ffd12e325c Improve up downtime command form properties
Use a flag instead of a enumeration in delete downtime command form, to remove needless boilerplate.

refs #8624
2015-05-07 14:05:16 +02:00
Matthias Jentsch b35dd4ddfe Separate forms for deleting single and multiple comments
refs #8624
2015-05-07 14:03:09 +02:00
Matthias Jentsch d316b31cbb Fix downtime removal command in detail view
Use removal command for single downtimes in detail view. Move removing single and multiple downtimees into seperate forms.

refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 6ddb004230 Move removal command actions into the downtime controllers
refs #8902
2015-05-07 10:34:06 +02:00
Michael Friedrich defda53ff5 Show icinga program version in Monitoring Health
Also emphasize on the backends used.

fixes #9207
2015-05-05 17:02:45 +02:00
Alexander Fuhr d1f1f5d7d7 ProgrammStatusQuery: Add fallback if ido_version is older than required
resolves #9223
2015-05-05 16:32:18 +02:00
Alexander Fuhr 0e4201a997 Add info about the active ido endpoint to monitoring health overview
resolves #9223
2015-05-05 15:20:25 +02:00
Alexander Fuhr 8484a27b56 Add a backend problem menu item renderer to system menu
refs #4139
2015-04-30 16:13:10 +02:00
Alexander Fuhr 5f3aafd3bd Merge branch 'bugfix/menu-item-renderer-deduplication-7658'
fixes #7658
2015-04-20 17:15:21 +02:00
Alexander Fuhr 9ebf4742de Use the MenuItemRenderer render() implemnetations
refs #7658
2015-04-20 17:07:34 +02:00
Johannes Meyer f11ea04557 Revert "Require `host_name' instead of `host' to show or list particular objects"
This reverts commit b93d18a0fc.
2015-04-20 16:11:22 +02:00
Johannes Meyer 96fb0370a4 Revert "Require `service_description' instead of `service' to show a particular service"
This reverts commit 09ab601942.
2015-04-20 16:09:14 +02:00
Johannes Meyer da7aa23820 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 15:20:23 +02:00
Alexander Fuhr c76e4e3583 Change the global namespace to the module specific namespace
refs #7642
2015-04-20 13:05:23 +02:00
Alexander Fuhr 593ea7add5 Move monitoring module renderers from global module to monitoring module
refs #7642
2015-04-20 13:02:12 +02:00
Johannes Meyer 54a370ca22 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 11:15:04 +02:00
Johannes Meyer 32e8b606b4 Monitoring\Controller: Drop `compactView' property, as it's not used anywere 2015-04-15 15:17:59 +02:00
Eric Lippmann 9d4460d02f Use inheritdoc in the ScheduleServiceCheckCommand 2015-04-15 14:59:29 +02:00
Eric Lippmann b8849c0ac9 Return $this in the setters of the SendCustomNotificationCommand
Further fixed bad PHPDoc.
2015-04-15 14:59:29 +02:00
Johannes Meyer 923bc11b39 GroupsummaryQuery: Provide case insensitive filter columns for group names
I've renamed those and made them case sensitive as part of #8613 but
missed that they are required by the global search.

fixes #9056
2015-04-14 12:44:24 +02:00
Johannes Meyer 2618d4a468 DataView\Contact: Add missing query columns
fixes #9057
2015-04-14 12:27:54 +02:00
Johannes Meyer 638c00d685 Merge branch 'master' into feature/non-collated-ido-queries-8613 2015-04-13 15:55:32 +02:00
Johannes Meyer 9cc5469305 NotificationQuery: Provide case-insensitive filter column `contact'
refs #8613
2015-04-13 15:33:33 +02:00
Johannes Meyer 29f05bf878 NotificationQuery: Provide case-insensitive filter column `service'
refs #8613
2015-04-13 15:33:19 +02:00
Johannes Meyer 3653ec810a NotificationQuery: Provide case-insensitive filter column `host'
refs #8613
2015-04-13 15:32:52 +02:00
Johannes Meyer 644a386bf8 NotificationQuery: Use query column `notification_contact_name'
...instead of `notification_contact'.

refs #8613
2015-04-13 15:26:06 +02:00
Johannes Meyer 15399d77ce NotificationQuery: Use query column `service_description' instead of `service'
refs #8613
2015-04-13 15:25:10 +02:00
Johannes Meyer 96954ea9a1 NotificationQuery: Use query column `host_name' instead of `host'
refs #8613
2015-04-13 15:24:15 +02:00
Johannes Meyer c10617d409 Servicegroups: Use query column `servicegroup_name' instead of `servicegroup'
refs #8613
2015-04-10 16:28:57 +02:00
Johannes Meyer c59d5ac7d5 Hostgroups: Use query column `hostgroup_name' instead of `hostgroup'
refs #8613
2015-04-10 16:28:33 +02:00
Johannes Meyer e7c1e552a5 EventgridQuery: Make filter column `servicegroup' case-insensitive
...and add a case-sensitive query column.

refs #8613
2015-04-10 16:01:22 +02:00
Johannes Meyer ea16d45aa3 EventgridQuery: Make filter column `hostgroup' case-insensitive
...and add a case-sensitive query column.

refs #8613
2015-04-10 16:01:09 +02:00
Johannes Meyer 42e93ffb63 DataView\Eventgrid: Add missing query and filter columns
refs #8613
2015-04-10 15:58:55 +02:00
Johannes Meyer 8b2c0191c4 EventgridQuery: Remove COLLATE from query column `service_description'
refs #8613
2015-04-10 15:54:55 +02:00
Johannes Meyer 904e91bfa9 EventgridQuery: Remove COLLATE from query column `host_name'
refs #8613
2015-04-10 15:54:18 +02:00
Johannes Meyer 629becf2cc DataView\Servicegroup: Add missing query and filter columns
refs #8613
2015-04-10 15:35:24 +02:00
Johannes Meyer 4bc3afaca4 ServicegroupQuery: Make query column `servicegroup_alias' case-insensitive
refs #8613
2015-04-10 15:34:55 +02:00
Johannes Meyer fdd6a4d59b ServicegroupQuery: Remove COLLATE from query column `servicegroup_name'
...and add a case-insensitive alternative called `servicegroup'.

refs #8613
2015-04-10 15:34:28 +02:00
Johannes Meyer 055cd61421 ServicegroupQuery: Remove COLLATE from query column `service_desription'
refs #8613
2015-04-10 15:32:47 +02:00
Johannes Meyer a17c2eddb7 ServicegroupQuery: Remove COLLATE from query column `service_host_name'
refs #8613
2015-04-10 15:31:51 +02:00
Johannes Meyer 26f0b46516 ServicegroupQuery: Remove COLLATE from query column `host_name'
refs #8613
2015-04-10 15:31:09 +02:00
Johannes Meyer f61370f55a DataView\Hostgroup: Add missing query columns
refs #8613
2015-04-10 15:21:18 +02:00
Johannes Meyer 69e520a514 HostgroupQuery: Remove COLLATE from query column `host_name'
refs #8613
2015-04-10 15:20:19 +02:00
Johannes Meyer 9f075e0691 HostgroupQuery: Remove COLLATE from query column `hostgroup_name'
refs #8613
2015-04-10 15:19:55 +02:00
Johannes Meyer 92634a1921 DowntimeQuery: Provide case-insensitive filter column `service_host'
refs #8613
2015-04-10 14:25:53 +02:00
Johannes Meyer 5ccf6a7efa DowntimeQuery: Remove redundant query columns
refs #8613
2015-04-10 14:25:26 +02:00
Johannes Meyer 0f0727491e DowntimeQuery: Make query column `author' case-insensitive
refs #8613
2015-04-10 14:24:53 +02:00
Johannes Meyer 1c32d8ebe5 DowntimeQuery: Add _name suffix to the query column `downtime_author'
...to indicate that it's a case-sensitive column.

refs #8613
2015-04-10 14:23:05 +02:00
Johannes Meyer b8efe01170 CustomvarQuery: Remove COLLATE from query columns
...and provide case-insensitive filter columns alternatively.

refs #8613
2015-04-10 12:56:18 +02:00
Johannes Meyer 0628efb4cd ContactgroupQuery: Make query column `contact_email' case-insensitive
refs #8613
2015-04-10 12:27:44 +02:00
Johannes Meyer 638eda7773 ContactgroupQuery: Make query column `contact_alias' case-insensitive
refs #8613
2015-04-10 12:27:24 +02:00
Johannes Meyer 0fe59aa519 Revert "ContactQuery: Provide ci query columns for aliases and email addresses"
This reverts commit f00adc2138.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
2015-04-10 12:23:35 +02:00
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 71c013178e ContactgroupQuery: Make query column `contactgroup_alias' case-insensitive
refs #8613
2015-04-10 12:14:11 +02:00
Johannes Meyer 6536878d5d ContactgroupQuery: Remove COLLATE from query column `contact_name'
refs #8613
2015-04-10 12:13:23 +02:00