Commit Graph

1110 Commits

Author SHA1 Message Date
Johannes Meyer 1a32d289b8 HostcommenthistoryQuery: Improve JOIN performance
refs #9009
2015-06-16 08:10:16 +02:00
Johannes Meyer 988bc2cf44 ServicestatusQuery: Improve JOIN performance
refs #9009
2015-06-16 08:09:54 +02:00
Matthias Jentsch 42de13a2b9 Merge branch 'feature/ssh-remote-connection-resource-configuration-7595'
resolves #7595
2015-06-15 17:30:42 +02:00
Johannes Meyer 7cbcb91fd7 DataView\Eventhistory: Allow to filter for custom variables
refs #9009
2015-06-15 16:53:22 +02:00
Johannes Meyer 9876a53f8e DataView\Eventgrid: Allow to filter for custom variables
refs #9009
2015-06-15 16:53:13 +02:00
Johannes Meyer c6cf51b44c NotificationQuery: Force that the host and service subqueries are instantiated
Quick and dirty. I do not have enough time for a more proper version...

refs #9009
2015-06-15 16:24:57 +02:00
Johannes Meyer a32f505fdd ObjectList: Fix that setFilter() violates interface Filterable
refs #9009
2015-06-15 16:08:04 +02:00
Johannes Meyer a1e4e6e92b ObjectList: Implement interface Filterable
Allows to use instances of it for Controller::applyRestriction().

refs #9009
2015-06-15 16:05:37 +02:00
Johannes Meyer 09d9d00844 ContactgroupQuery: Do not use Zend_Select::group() but self::group()
Avoids duplicate GROUP BY expressions.
2015-06-15 15:10:58 +02:00
Johannes Meyer 548aec4233 DataView\Contactgroup: Add support for object restrictions
refs #9009
2015-06-15 15:08:04 +02:00
Johannes Meyer b8efe314a0 DbQuery: Ignore wildcard only filters
This increases query performance vastly, since LIKE '%' comparisons
prevent the dbms from utilizing an index.
2015-06-15 13:59:46 +02:00
Johannes Meyer 07ebf11a07 DataView\Contact: Add support for object restrictions
refs #9009
2015-06-15 13:47:48 +02:00
Johannes Meyer 470c4a54a3 Eventgrid: Add support for object restrictions
refs #9009
2015-06-12 16:27:13 +02:00
Johannes Meyer b6a7b43dd0 MonitoringBackend: Enforce that views and queries are of a particular naming scheme
I'm adding this mainly to not to break support with modules which are
utilizing our queries.
2015-06-12 14:46:46 +02:00
Johannes Meyer 4996f569fe monitoring: Ensure that views and queries are all named using the same scheme
That's "SomesuperQuery" and not "SomeSuperQuery", according to most
of the existing queries.
2015-06-12 14:42:49 +02:00
Johannes Meyer 528df1b26a EventHistory: Add support for object restrictions
refs #9009
2015-06-12 12:52:07 +02:00
Johannes Meyer c35be4023b DowntimeendhistoryQuery: Use subqueries to fetch host and service downtimes
refs #9009
2015-06-12 12:45:59 +02:00
Johannes Meyer dadb3853d7 DowntimestarthistoryQuery: Use subqueries to fetch host and service downtimes
refs #9009
2015-06-12 12:45:49 +02:00
Johannes Meyer 95b5bba65c Introduce query ServicedowntimeendhistoryQuery
refs #9009
2015-06-12 12:45:02 +02:00
Johannes Meyer 3ed858269c Introduce query ServicedowntimestarthistoryQuery
refs #9009
2015-06-12 12:44:49 +02:00
Johannes Meyer 7afa4dac9a Introduce query HostdowntimeendhistoryQuery
refs #9009
2015-06-12 12:44:35 +02:00
Johannes Meyer 18d3fcbbf7 Introduce query HostdowntimestarthistoryQuery
refs #9009
2015-06-12 12:44:25 +02:00
Johannes Meyer 51434c7255 CommentdeletionhistoryQuery: Use subqueries to fetch removed host and service comments
refs #9009
2015-06-11 16:16:17 +02:00
Johannes Meyer b7a26c599d Introduce query ServicecommentdeletionhistoryQuery
refs #9009
2015-06-11 16:15:50 +02:00
Johannes Meyer 7ea9051d43 Introduce query HostcommentdeletionQuery
refs #9009
2015-06-11 16:15:29 +02:00
Johannes Meyer 7358eefed8 CommenthistoryQuery: Use subqueries to fetch host and service comments
refs #9009
2015-06-11 15:29:36 +02:00
Johannes Meyer bf85fd62b5 Introduce query ServicecommenthistoryQuery
refs #9009
2015-06-11 15:28:57 +02:00
Johannes Meyer 26e895aedb Introduce query HostcommenthistoryQuery
refs #9009
2015-06-11 15:28:38 +02:00
Johannes Meyer f17e9162eb StatehistoryQuery: Use subqueries for host and service state records
refs #9009
2015-06-11 12:36:10 +02:00
Johannes Meyer 5083301dea Introduce query ServicestatehistoryQuery
refs #9009
2015-06-11 12:35:29 +02:00
Johannes Meyer 0ead8d4821 Introduce query HoststatehistoryQuery
refs #9009
2015-06-11 12:35:15 +02:00
Johannes Meyer ed66c1f2e4 ServicenotificationQuery: Apply query optimization from NotificationhistoryQuery
refs #9009
2015-06-11 12:34:55 +02:00
Johannes Meyer f9948f5513 HostnotificationQuery: Apply query optimization from NotificationhistoryQuery
refs #9009
2015-06-11 12:34:40 +02:00
Johannes Meyer b235bb6982 NotificationQuery: Select placeholder values when joining hosts, again
I've missed that our notification list-view detects based on a attribute's
value of which type a returned row is...

refs #9009
2015-06-10 17:04:00 +02:00
Johannes Meyer 5ad93d138c ServicenotificationQuery: Fix grouping when *all* tables are being joined
refs #9009
2015-06-10 17:01:58 +02:00
Johannes Meyer 0ccb765954 HostnotificationQuery: Fix grouping when *all* tables are being joined
refs #9009
2015-06-10 17:01:46 +02:00
Johannes Meyer 51a3213fca NotificationQuery: Add support for history related queries
refs #9009
2015-06-10 13:10:28 +02:00
Johannes Meyer 41ee39d48f EventHistoryQuery: Do not fetch columns which only exist in one subquery
Uses the same technique as the NotificationhistoryQuery for the output.
2015-06-10 13:08:57 +02:00
Johannes Meyer db816e4a5c ServicegroupsummaryQuery: Fix that the service severity is not being fetched 2015-06-09 12:48:15 +02:00
Johannes Meyer a4ad4e2372 CommentQuery: Fix grouping
There was only one comment for each host or service being fetched.

refs #9009
2015-06-08 18:01:16 +02:00
Johannes Meyer 83c21f08e3 DowntimeQuery: Fix grouping
There was only one downtime for each host or service being fetched.

refs #9009
2015-06-08 18:00:54 +02:00
Johannes Meyer 75c5aab1b9 NotificationQuery: Do not use a placeholder if it's possible to select a real value
refs #9009
2015-06-08 17:23:36 +02:00
Johannes Meyer 9229e460d1 NotificationQuery: Use subqueries to fetch host- and service-notifications
refs #9009
2015-06-08 17:09:24 +02:00
Johannes Meyer 70e3434f33 Introduce class ServicenotificationQuery
refs #9009
2015-06-08 17:07:55 +02:00
Johannes Meyer c0ffe4d690 Introduce class HostnotificationQuery
refs #9009
2015-06-08 17:07:34 +02:00
Eric Lippmann d4a884b233 monitoring: Fix filter columns of the service group summary
refs #9009
2015-06-05 15:49:48 +02:00
Eric Lippmann 382007a8bd monitoring: Add missing filter columns to the service status data view
refs #9009
2015-06-05 15:49:26 +02:00
Eric Lippmann d4b0841d4c monitoring: Add missing filter column to the host group summary view
refs #9009
2015-06-05 15:48:58 +02:00
Eric Lippmann bb711f447d monitoring: Fix restrictable filter columns of the downtime view
refs #9009
2015-06-05 15:48:37 +02:00
Eric Lippmann 6597e7aba8 monitoring: Add missing restrictable filter columns to the comment data view
refs #9009
2015-06-05 15:48:05 +02:00
Eric Lippmann 66d76e7ad9 monitoring: Add host_notes to the host status query
refs #9009
2015-06-05 15:30:49 +02:00
Eric Lippmann 8cbb83d630 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-05 15:29:16 +02:00
Eric Lippmann 11a006681b Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998
Conflicts:
	application/controllers/ConfigController.php
	library/Icinga/Web/Widget/FilterEditor.php
	modules/monitoring/application/controllers/HostsController.php
2015-06-05 15:27:42 +02:00
Eric Lippmann 3425b71b4d monitoring: Restrict problem badges
The code should be placed somewhere else in the future.

refs #9009
2015-06-05 15:01:45 +02:00
Eric Lippmann 4dc2eb9f4a monitoring: Use soft states in the host status summary query again
refs #9009
2015-06-05 15:01:08 +02:00
Eric Lippmann 2e059a9bb7 monitoring: Use soft states in the host group summary again
refs #9009
2015-06-05 15:00:14 +02:00
Eric Lippmann dae35b9106 monitoring: Restrict host and service groups when viewing a host or service
refs #9009
2015-06-05 14:47:01 +02:00
Eric Lippmann d830480655 monitoring: Add missing restrictable columns to host and service comments and downtimes
refs #9009
2015-06-05 14:43:38 +02:00
Eric Lippmann 80c80436cf monitoring: Support restricting service groups of a service
refs #9009
2015-06-05 14:42:49 +02:00
Eric Lippmann bbcd6e3a2b monitoring: Support restricting host groups of a host
refs #9009
2015-06-05 14:42:11 +02:00
Eric Lippmann c735ee799c monitoring: Remove unnecessary group call in the host downtime query
refs #9009
2015-06-05 14:41:25 +02:00
Eric Lippmann 52a0ad363f monitoring: Remove unnecessary group call in the host comment query
refs #9009
2015-06-05 14:40:17 +02:00
Eric Lippmann f3b84b7ae8 monitoring: Restrict service summary when viewing a host or service
refs #9009
2015-06-05 14:14:22 +02:00
Eric Lippmann 45d883dcf1 monitoring: Add restrictable filter columns to the status summary
refs #9009
2015-06-05 12:42:55 +02:00
Eric Lippmann 2b3acc99e2 monitoring: Use host and service status queries in the status summary query
refs #9009
2015-06-05 12:42:27 +02:00
Eric Lippmann b69b47277e monitoring: Add columns the to host status query required by the tactical overview
refs #9009
2015-06-05 12:37:29 +02:00
Eric Lippmann 99b5c7b243 monitoring: Add columns the to service status query required by the tactical overview
refs #9009
2015-06-05 12:36:56 +02:00
Eric Lippmann 55921b4854 monitoring: Fix service status query regarding handled/unhandled and using distinct
refs #9009
2015-06-05 11:49:00 +02:00
Eric Lippmann c08a98f6ac monitoring: Use grouping instead of distinct in the host status query
refs #9009
2015-06-05 11:48:33 +02:00
Eric Lippmann c993ee63b7 monitoring: Use grouping instead of distinct in the service downtime query
refs #9009
2015-06-05 11:48:03 +02:00
Eric Lippmann c3c1993870 monitoring: Use grouping instead of distinct in the service comment query
refs #9009
2015-06-05 11:47:39 +02:00
Eric Lippmann 2539e51549 monitoring: Use grouping instead of distinct in the host downtime query
refs #9009
2015-06-05 11:47:07 +02:00
Eric Lippmann 044027772d monitoring: Use grouping instead of distinct in the host comment query
refs #9009
2015-06-05 11:46:45 +02:00
Eric Lippmann 0719c294d8 monitoring: Use the service group summary query
refs #9009
2015-06-05 10:29:30 +02:00
Eric Lippmann e0b117915a monitoring: Use a sub select in the service status summary
refs #9009
2015-06-05 10:28:50 +02:00
Eric Lippmann 76e2d8f5ee monitoring: Add service_last_state_change to the service status query
refs #9009
2015-06-05 10:17:54 +02:00
Eric Lippmann 3f02197891 monitoring: Remove allowCustomVars form the host status summary query
allowCustomVars is not needed on this query because all filters are passed to the underlying query.

refs #9009
2015-06-05 10:17:07 +02:00
Eric Lippmann 480becd3d6 monitoring: Fix pagination of the host group overview
refs #9009
2015-06-05 10:16:41 +02:00
Eric Lippmann 7b176261f8 monitoring: Add query for service group summaries
refs #9009
2015-06-05 10:16:17 +02:00
Eric Lippmann 82b0354704 monitoring: Support filtering the service group overview by custom variables
refs #9009
2015-06-05 09:16:28 +02:00
Eric Lippmann 1ea7335b96 monitoring: Support filtering the service group summary by service custom variables
refs #9009
2015-06-05 09:15:09 +02:00
Eric Lippmann c299fb3ce9 monitoring: Support filtering the host group overview by service custom variables
refs #9009
2015-06-05 09:14:26 +02:00
Eric Lippmann 28b1cf5762 monitoring: Support joining the service status query by service groups
refs #9009
2015-06-05 09:13:17 +02:00
Eric Lippmann b409609df7 monitoring: Use sub query count when joining service related tables to the host query
Fixes count problems.

refs #9009
2015-06-05 09:11:10 +02:00
Eric Lippmann 7ffa1b93a3 monitoring: Add service status summary data view
refs #9009
2015-06-03 14:44:16 +02:00
Eric Lippmann fc2a50a9ff monitoring: Add missing restrictable filter columns to the host status summary data view
refs #9009
2015-06-03 14:39:43 +02:00
Eric Lippmann f2f3fe2c07 monitoring: Add missing restrictable filter columns to the host status data view
refs #9009
2015-06-03 14:39:10 +02:00
Eric Lippmann e9308e847a monitoring: Add host status summary data view
refs #9009
2015-06-03 14:15:09 +02:00
Eric Lippmann 131af8e818 monitoring: Add host status summary query
refs #9009
2015-06-03 14:14:55 +02:00
Eric Lippmann 8e88864f4a monitoring: Fix host columns of the service status query
refs #9009
2015-06-03 12:54:51 +02:00
Eric Lippmann 6588c73b4e monitoring: Add restrictable filter columns to the service group summary
refs #9009
2015-06-03 12:53:56 +02:00
Eric Lippmann a8b925e2ec monitoring: Use the service status summary query in the service groups overview
refs #9009
2015-06-03 12:48:22 +02:00
Eric Lippmann d1bb19d037 monitoring: Add service status summary query
refs #9009
2015-06-03 12:48:04 +02:00
Eric Lippmann 082f9b1edd monitoring: Don't provide unnecessary columns in the host group summary query
refs #9009
2015-06-03 12:26:01 +02:00
Eric Lippmann 6926452268 monitoring: Add restrictable filter columns to the host group summary
refs #9009
2015-06-03 11:49:21 +02:00
Eric Lippmann 71f19b2cc6 monitoring: Add missing columns to the service status query
refs #9009
2015-06-03 11:48:34 +02:00
Eric Lippmann 761de2eb33 monitoring: Fix a join condition in the host status query
refs #9009
2015-06-03 11:48:14 +02:00
Eric Lippmann 4b2c83fbf7 monitoring: Use the host group summary query
refs #9009
2015-06-03 11:40:55 +02:00
Eric Lippmann 798f4adc34 monitoring: Add query for the host group summary
refs #9009
2015-06-03 11:40:03 +02:00
Matthias Jentsch e7a875da26 Merge branch 'bugfix/perfdata-details-hidden-8334'
fixes #8334
2015-06-02 17:51:57 +02:00
Matthias Jentsch a5c3782de7 Do not display columns that don't include any values
refs #8334
2015-06-02 15:20:27 +02:00
Johannes Meyer cd0c418854 Merge branch 'master' into feature/user-and-group-management-8826 2015-06-02 10:44:13 +02:00
Matthias Jentsch 29cc92a3f3 Display acknowledgement action for all unacknowledged objects
Instead of displaying the ack for all unhandled problem host, make acknowledgement possible for all monitored objects in multi views.

fixes #7931
2015-06-01 12:24:29 +02:00
Alexander A. Klimov 6e24cfd538 Implement ::worseThan()
refs #8205
2015-05-29 18:29:45 +02:00
Alexander A. Klimov 1f36e545d9 Implement ::getState()
refs #8205
2015-05-29 17:26:56 +02:00
Eric Lippmann 46fdaf4698 monitoring: Fix select columns for the comment data views
refs #9009
2015-05-29 15:38:03 +02:00
Eric Lippmann 54eb0eaf22 monitoring: Add restrictable filter columns to the comment data view
refs #9009
2015-05-29 15:37:05 +02:00
Eric Lippmann 41bc4e3b21 monitoring: Provide downtime_author only as filter column
refs #9009
2015-05-29 15:36:42 +02:00
Eric Lippmann 16ab26cb7c monitoring: Remove unused alias from the downtime query
refs #9009
2015-05-29 15:36:03 +02:00
Eric Lippmann 85c21b042d monitoring: Use the host and service comment queries in the comment query
refs #9009
2015-05-29 15:35:39 +02:00
Eric Lippmann 82644b6122 monitoring: Add service comment data view
refs #9009
2015-05-29 15:35:08 +02:00
Eric Lippmann 3c15b2b972 monitoring: Add service comment query
refs #9009
2015-05-29 15:34:52 +02:00
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
Alexander Fuhr 49589128ef Rename identity_key with private_key in ssh resource
refs #7595
2015-05-28 14:09:13 +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
Alexander Fuhr a47d05a038 Add identity key usage for a specific user in remote command
refs #7595
fixes #7447
2015-05-28 10:51:56 +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