Commit Graph

1427 Commits

Author SHA1 Message Date
Eric Lippmann cd521891ae monitoring: Remove HostcommenthistoryQuery::getGroup()
refs #9956
2015-09-29 22:25:02 +02:00
Eric Lippmann b5561a8306 monitoring: Rearrange code in the HostcommentQuery
refs #9956
2015-09-29 22:23:16 +02:00
Eric Lippmann 2ce63ad67d monitoring: Remove HostcommentQuery::getGroup()
refs #9956
2015-09-29 22:22:32 +02:00
Eric Lippmann c597a671f3 monitoring: Rearrange code in the ContactgroupQuery
refs #9956
2015-09-29 22:22:09 +02:00
Eric Lippmann a9588c9cc2 monitoring: Remove ContactgroupQuery::getGroup()
refs #9956
2015-09-29 22:21:05 +02:00
Eric Lippmann 02215592be monitoring: Rearrange code in the ContactQuery
refs #9956
2015-09-29 22:20:39 +02:00
Eric Lippmann e110649184 monitoring: Remove ContactQuery::getGroup()
refs #9956
2015-09-29 22:16:35 +02:00
Eric Lippmann 1de527c5f8 monitoring: Implement IdoQuery::getGroup()
refs #9956
2015-09-29 22:16:12 +02:00
Eric Lippmann 0a8369e6e5 monitoring/lib: Add iterator for iterating over non-pseudo monitoring query columns
refs #9956
2015-09-29 22:15:11 +02:00
Matthias Jentsch 65a2b539f1 Allow filtering for contactgroups in contact list
refs #5543
2015-09-29 12:01:30 +02:00
Eric Lippmann ed63d169ef monitoring: Fix URL and title for state badges
refs #5543
2015-09-28 17:14:55 +02:00
Eric Lippmann 03806f8469 monitoring/CSS: Fix state badges classes
refs #5543
2015-09-28 17:03:36 +02:00
Matthias Jentsch 411b0cf3ac Merge branch 'bugfix/customvar-filters-are-broken-10172'
fixes #10172
2015-09-28 16:11:25 +02:00
Matthias Jentsch feaa92c491 Allow passing customvar names in upper and lower case
Fix that customvar names are not properly lowercased in all places.

refs #10172
2015-09-28 16:07:11 +02:00
Matthias Jentsch ff5696e7a6 Do not validate existence of customvar columns
Improve performance and solve issues with differences in customvar case sensitivitty among different versions.

refs #10172
2015-09-28 15:00:03 +02:00
Eric Lippmann 2ff822c2ac Merge branch 'master' into feature/ipv6-addresses-9645-9826 2015-09-28 13:09:30 +02:00
Eric Lippmann 705432b5fb monitoring/lib: Change StateBadges::add() signature
refs #5543
2015-09-27 15:43:17 +02:00
Eric Lippmann d8f45fc9b1 monitoring: Use StateBadges::STATE_UP in the host groups overview
refs #5543
2015-09-27 14:43:52 +02:00
Eric Lippmann 8de1c6c0f9 monitoring: Show problem state badges first
refs #5543
2015-09-27 14:43:01 +02:00
Eric Lippmann b367206837 monitoring/lib: Add priorities to the state badges
refs #5543
2015-09-27 14:41:33 +02:00
Eric Lippmann e4d93db329 monitoring/lib: Add PHPDoc to the state badges widget
refs #5543
2015-09-27 14:36:00 +02:00
Eric Lippmann 56fff33cb2 monitoring: Add StateBadges::STATE_DOWN*
refs #5543
2015-09-27 14:29:31 +02:00
Eric Lippmann 73242da6bc monitoring: Fix navigation usage in the state badges widget
refs #5543
2015-09-27 13:32:47 +02:00
Eric Lippmann d3ac1b16ee Merge branch 'master' into feature/dope-layout-5543 2015-09-27 13:11:11 +02:00
Eric Lippmann 747c6f9b0b monitoring: Move instance_name from query to filter columns in the comment data view
We don't select but filter for this column.
2015-09-27 12:57:35 +02:00
Eric Lippmann 463fa45f20 monitoring: Move instance_name from query to filter columns in the downtime data view
We don't select but filter for this column
2015-09-27 12:57:35 +02:00
Eric Lippmann 30904056f1 monitoring: Make instance_name filterable for service downtimes 2015-09-27 12:57:35 +02:00
Eric Lippmann 5ca1e76524 monitoring: Make instance_name filterable for service comments 2015-09-27 12:57:34 +02:00
Eric Lippmann 395d285b9d monitoring: Make instance_name filterable for host downtimes 2015-09-27 12:57:34 +02:00
Eric Lippmann e46fbe37af monitoring: Make instance_name filterable for host comments 2015-09-27 12:57:34 +02:00
Eric Lippmann 7ed7343587 monitoring: Reorder query columns in the ContactQuery 2015-09-27 12:57:34 +02:00
Eric Lippmann faa9b41fb8 monitoring: Clear order of the HoststatusQuery used in the HostserviceproblemsummaryQuery 2015-09-27 12:57:34 +02:00
Eric Lippmann a1da5f5558 monitoring/CSS: Fix state badges CSS classes
refs #5543
2015-09-27 12:42:54 +02:00
Eric Lippmann 2267d61c85 monitoring: Add CSS class state-badges to the StateBadges widget
refs #5543
2015-09-27 12:26:59 +02:00
Eric Lippmann fb79caab48 monitoring/lib: Add StateBadges widget (WIP)
refs #5543
2015-09-27 12:26:58 +02:00
Johannes Meyer a55cced039 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-09-25 14:12:43 +02:00
Johannes Meyer 40c2cb2d12 MonitoredObject: Support host- and servicegroup filters in method matches()
refs #5600
2015-09-23 13:03:41 +02:00
Johannes Meyer e42548fc80 MonitoredObject: Allow to fetch servicegroups for host objects
refs #5600
2015-09-23 13:02:43 +02:00
Matthias Jentsch 3b135c6b6f Fix PostgreSQL queries that use GROUP BY
Add missing instance_id to getGroup query functions to avoid query errors in PostgreSQL.

fixes #10160
2015-09-17 16:29:00 +02:00
Eric Lippmann 8cea292745 monitoring: Fix grouping of host and service status when filtering for group columns
refs #9956
2015-09-17 16:22:24 +02:00
Johannes Meyer bf4e492fa1 Action: Accept and apply option "filter"
refs #5600
2015-09-17 11:00:40 +02:00
Johannes Meyer f4032988bf MonitoredObject: Add method matches()
refs #5600
2015-09-17 10:40:00 +02:00
Johannes Meyer 1d6ad6df21 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/configuration.php
2015-09-15 13:31:30 +02:00
Matthias Jentsch 32b4715130 Remove unused joins and conform to coding guidelines 2015-09-14 12:05:15 +02:00
Matthias Jentsch b2c486bf80 Add Backend queries for host and service time periods
refs #9888
2015-09-11 16:31:19 +02:00
Eric Lippmann 1615ed94b2 Revert "monitoring: Add DataView::handleRequest() (WIP)"
This reverts commit 4c1375834c.

refs #9967
2015-09-07 13:21:26 +02:00
Eric Lippmann f12c740046 Revert "monitoring: Fix call for getting the URL parameters in DataView::handleRequest()"
This reverts commit 432abb1d33.

refs #9967
2015-09-07 13:21:18 +02:00
Eric Lippmann 0abd2afb0e Revert "monitoring: Add DataView::$requiresFilter"
This reverts commit e9c7a5894a.
2015-09-07 13:19:28 +02:00
Johannes Meyer 7d167d0191 Action: Do not fail if no url is set
refs #5600
2015-09-07 12:00:35 +02:00
Eric Lippmann 0f8c28d749 Merge branch 'master' into feature/api-9606 2015-09-07 11:33:44 +02:00
Eric Lippmann a569b19153 monitoring: Increase time before a check result is marked as late
refs #8378
2015-09-07 11:12:25 +02:00
Eric Lippmann 1fccf9c721 Merge branch 'master' into feature/monitoring-indicate-late-check-results-8378 2015-09-07 11:09:11 +02:00
Eric Lippmann 30a5f57b7d monitoring: Remove next_update_is_late column from the service status query
refs #8378
2015-09-07 11:06:02 +02:00
Eric Lippmann 8347e126b8 monitoring: Remove next_update_is_late column from the host status query
refs #8378
2015-09-07 11:05:36 +02:00
Johannes Meyer 860edb9768 Add class Action
refs #5600
2015-09-07 10:53:44 +02:00
Eric Lippmann c9c5762320 monitoring/detail: Don't fail if a macro does not exist on the host or service 2015-09-04 18:10:28 +02:00
Matthias Jentsch 0738a37fdf Display sticky comments in "Muted" tab
refs #6144
2015-09-04 16:35:41 +02:00
Eric Lippmann 24f3d42d96 monitoring/host: Select next_update
refs #8378
2015-09-04 16:22:31 +02:00
Eric Lippmann a10652abfc monitoring/service: Select next_update
refs #8378
2015-09-04 16:22:16 +02:00
Eric Lippmann e5ff81aa84 monitoring/hoststatus: Add columns host_next_update and host_next_update_is_late
refs #8378
2015-09-04 16:20:23 +02:00
Eric Lippmann 562fec68cf monitoring/servicestatus: Add columns service_next_update and service_next_update_is_late
refs #8378
2015-09-04 16:18:41 +02:00
Eric Lippmann 7a7214d626 monitoring/host: Select host_attempt 2015-09-04 15:35:52 +02:00
Eric Lippmann 90e6ea77c5 monitoring/lib: Reorder query columns in Host 2015-09-04 15:35:32 +02:00
Johannes Meyer 7a5dceac7b monitoring: Adjust custom navigation renderer for DataView badges
refs #5600
2015-09-04 13:50:53 +02:00
Johannes Meyer a96bead01b monitoring: Adjust custom navigation renderer for backend availability checks
refs #5600
2015-09-04 13:49:54 +02:00
Johannes Meyer 398f3ef413 monitoring: Move custom navigation renderers to the correct namespace
refs #5600
2015-09-04 13:46:23 +02:00
Eric Lippmann 748eb69d89 monioring/lib: Reorder query columns in the ServicestatusQuery 2015-09-04 13:45:27 +02:00
Eric Lippmann 89ff47e761 monitoring: Remove duplicate array key 'service_last_hard_state_change' 2015-09-04 13:07:37 +02:00
Eric Lippmann b28f1c4038 Merge branch 'bugfix/monitoring-ack-comments-display-9674'
fixes #9674
2015-09-04 13:04:39 +02:00
Eric Lippmann b585b92196 monitoring/lib: Add translate parameter to MonitoredObject::getType() 2015-09-04 13:01:49 +02:00
Eric Lippmann f0e8340fbd monitoring/detail: Don't display the comment of the active acknowledgement in the comment list
refs #9674
2015-09-03 16:38:46 +02:00
Eric Lippmann 8a1592fd12 monitoring/lib: Add Acknowledgement object
refs #9674
2015-09-03 16:27:50 +02:00
Eric Lippmann a14b1ce8f7 monitoring/service: Fetch acknowledgement type
refs #9674
2015-09-03 16:23:27 +02:00
Eric Lippmann df72825617 monitoring/host: Fetch acknowledgement type
refs #9674
2015-09-03 16:23:04 +02:00
Eric Lippmann 620c1fa6e0 monitoring: Fix alphabetical order of query columns in the CommentQuery 2015-09-03 16:21:01 +02:00
Matthias Jentsch ddde37e225 Remove acknowledgement view temporarily
Implementation of acknowledgement view temporarily delayed until v2.1.0.

refs #10032
2015-09-03 16:08:55 +02:00
Eric Lippmann 6a684a97df monitoring: Fix missing parameter initialization in MonitoredObject::parseAttributeUrls() 2015-09-03 14:09:16 +02:00
Eric Lippmann 54a45ff338 monitoring: Fix PHPDoc of MonitoredObject::resolveAllStrings() 2015-09-03 14:08:43 +02:00
Eric Lippmann dc5e86002b monitoring: Reorder code in MonitoredObject 2015-09-03 14:07:38 +02:00
Eric Lippmann 4d2675659c monitoring: Optimize imports in MonitoredObject 2015-09-03 13:47:51 +02:00
Eric Lippmann e5c9eb1d20 monitoring: Don't show ack comments in the comments area of a host or service
refs #9674
2015-09-03 10:52:05 +02:00
Matthias Jentsch 8f545dd0d6 Fix acknowledgement query for PGSQL
refs #10032
2015-09-02 11:25:52 +02:00
Matthias Jentsch 985f6ab85e Fix acknowledgement count query
refs #10032
2015-09-01 17:42:51 +02:00
Matthias Jentsch bcdbf413a6 Add acknowledgement view and query
Add backend queries and the controller to inspect active acknowledgements.

refs #10032
2015-09-01 16:39:08 +02:00
Johannes Meyer 1c51735629 Merge branch 'master' into feature/rename-monitoring-instances-to-command-transports-and-allow-to-link-them-with-a-monitoring-instance-9651
Conflicts:
	modules/monitoring/application/controllers/ConfigController.php
2015-08-31 13:05:10 +02:00
Johannes Meyer b7cdfcfae0 CommandTransport: Respect instance association
refs #9651
2015-08-31 12:19:42 +02:00
Johannes Meyer 1d6d4f0b10 RemoteCommandFile: Accept option `instance'
refs #9651
2015-08-31 12:19:00 +02:00
Johannes Meyer 04ef3f1244 LocalCommandFile: Accept option `instance'
refs #9651
2015-08-31 12:18:25 +02:00
Johannes Meyer fcbd24e28e CommandTransport: Add fallback mechanism
refs #8981
refs #9651
2015-08-31 09:21:59 +02:00
Eric Lippmann c294283636 Merge branch 'bugfix/service-grid-grouping-postgres-9333'
Conflicts:
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php

fixes #9333
fixes #9538
2015-08-27 12:58:49 +02:00
Eric Lippmann f35aec1c5c monitoring: Fix default select columns of the instance query 2015-08-27 11:54:20 +02:00
Johannes Meyer 66570c95e0 monitoring: Ensure to ask subqueries whether to allow custom vars
fixes #9998
2015-08-27 08:53:46 +02:00
Johannes Meyer 8c887ee450 monitoring: Rename all command transport related classes
refs #9651
2015-08-26 15:52:36 +02:00
Johannes Meyer ec8567cbbf monitoring: It's now a command transport, not an instance anymore
refs #9651
2015-08-26 15:43:30 +02:00
Johannes Meyer 6651d31481 CommandTransport: Use commandtransports as config file name
refs #9651
2015-08-26 14:17:23 +02:00
Johannes Meyer 1317a6eaf8 Show an object's instance only if there are multiple instances
refs #9945
2015-08-26 10:55:18 +02:00
Johannes Meyer ffcd33ee7e Introduce query InstanceQuery
refs #9945
2015-08-26 10:54:42 +02:00
Johannes Meyer 592a79cd93 Service: Fetch the name of the instance the service belongs to
refs #9945
2015-08-26 10:52:56 +02:00
Johannes Meyer 8a1114bf65 Host: Fetch the name of the instance the host belongs to
refs #9945
2015-08-26 10:52:28 +02:00
Johannes Meyer 91315738c8 monitoring: Allow `instance_name' as restriction column
refs #9934
2015-08-25 16:39:40 +02:00
Johannes Meyer 819d20f17a Hostservice...Query: Add query column `instance_name'
refs #9943
2015-08-25 16:38:54 +02:00
Johannes Meyer 94693fe3e7 DataView\*summary: Add query column `instance_name'
refs #9943
2015-08-25 16:38:23 +02:00
Johannes Meyer 6906ea89b7 *historyQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:37:58 +02:00
Johannes Meyer 344dcf2cf7 ServicestatusQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:48 +02:00
Johannes Meyer ced671a408 HoststatusQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:35 +02:00
Johannes Meyer 780ac16be1 NotificationQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:35:16 +02:00
Johannes Meyer 5c2fd63347 ServicegroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:48 +02:00
Johannes Meyer fedd2c3b18 HostgroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:37 +02:00
Johannes Meyer f70a861ff4 DowntimeQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:34:18 +02:00
Johannes Meyer edb83c8b41 CustomvarQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:33:41 +02:00
Johannes Meyer 7916c149b9 ContactQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:32:27 +02:00
Johannes Meyer ab628338c2 ContactgroupQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:32:15 +02:00
Johannes Meyer 91fe6913d8 CommentQuery: Add query column `instance_name'
refs #9943
2015-08-25 16:31:39 +02:00
Eric Lippmann c8790fad93 Merge branch 'bugfix/service-grid-display_name-9538' into bugfix/service-grid-grouping-postgres-9333
Conflicts:
	library/Icinga/Data/PivotTable.php
	modules/monitoring/application/controllers/ListController.php
2015-08-25 15:51:20 +02:00
Eric Lippmann 96fb3b5d4b Merge branch 'master' into feature/api-9606 2015-08-25 09:25:59 +02:00
Eric Lippmann e9c7a5894a monitoring: Add DataView::$requiresFilter
refs #9606
2015-08-24 16:01:07 +02:00
Johannes Meyer 9ca278d7b2 Merge branch 'master' into feature/activity-indicators-for-form-submits-8369 2015-08-21 13:37:54 +02:00
Eric Lippmann 155191ca6f Revert "monitoring: Clone the filter before modyfing it in the IdoQuery"
This reverts commit d8f866c2bc.

Master branch contains the fix w/ the proper refs.
2015-08-21 11:24:56 +02:00
Eric Lippmann 90ef288362 monitoring: Clone the filter before modyfing it in the IdoQuery
fixes #9971
2015-08-21 11:24:02 +02:00
Eric Lippmann f722e242fd monitoring: Optimize method order in the DeleteCommentCommand 2015-08-21 10:33:18 +02:00
Eric Lippmann fbb16e5ea2 monitoring: Optimize method order in the DeleteDowntimeCommand 2015-08-21 10:30:41 +02:00
Matthias Jentsch 44271471e3 Allow declarative definitions of badge renderers and improve interface
Allow the data backend, columns and generated tooltips to be defined in the configuration instead of providing subclasses for every new configuration. Provide an abstract BadgeMenuItemRenderer that allows creating Badges with less boilerplate.

fixes #9694
2015-08-20 18:16:33 +02:00
Eric Lippmann d8f866c2bc monitoring: Clone the filter before modyfing it in the IdoQuery 2015-08-20 15:50:02 +02:00
Johannes Meyer 5602d57d0b Indicate that the configuration is being validated
refs #8369
2015-08-20 15:48:41 +02:00
Eric Lippmann 2229665ec6 monitoring: Return an empty filter in Controller::getRestriction() if the authenticated user is not restricted
This is because applyFilter requires a filter object.
2015-08-20 14:24:06 +02:00
Eric Lippmann 432abb1d33 monitoring: Fix call for getting the URL parameters in DataView::handleRequest()
refs #9967
2015-08-20 14:23:03 +02:00
Eric Lippmann dcb1502286 monitoring: Implement Controller::getRestriction()
Controller::applyRestriction() breaks fluent interfaces whereas Controller::getRestriction() doesn't.
2015-08-20 13:11:36 +02:00
Eric Lippmann 310dbdfde5 monitoring: Optimize imports in DataView 2015-08-20 13:11:36 +02:00
Eric Lippmann 4c1375834c monitoring: Add DataView::handleRequest() (WIP)
This method is work in progress as it's missing pagination, sorting and output format handling.

refs #9967
2015-08-20 13:11:18 +02:00
Eric Lippmann 9ea3f73e83 monitoring: Fix query class names not matching the file name 2015-08-19 12:52:38 +02:00
Johannes Meyer 65806fafbf MonitoredObject: Only select history entries for the respective object
And fix that the default sort order is not applied.

fixes #9963
2015-08-19 11:53:00 +02:00
Eric Lippmann 4ab20b9142 monitoring: Eliminate unncessary GROUP BY clauses in the HoststatusQuery
refs #9956
2015-08-19 11:40:37 +02:00
Eric Lippmann 6e12dd4d78 monitoring: Fix service status grouping when selecting group alias columns
refs #9956
2015-08-19 11:39:51 +02:00
Johannes Meyer 7812f6ddcc DataView: Remove obsolete $filter property 2015-08-19 11:23:40 +02:00
Eric Lippmann 18f720d31f monitoring: Eliminate unncessary GROUP BY clauses in the ServicestatusQuery
refs #9956
2015-08-18 16:37:14 +02:00
Eric Lippmann f5ffa8047c monitoring: Fix handling of collated columns w/ PostgreSQL
fixes #9954
fxies #9955
2015-08-18 16:36:00 +02:00
Eric Lippmann e904c26445 monitoring: Fix fetch function in the BackendAvailabilityMenuItemRenderer
fixes #9942
2015-08-18 13:09:34 +02:00
Eric Lippmann 00e206096d monitoring: Don't rely on Icinga updating the is_currently_running column
From version to version this column seems to be buggy as it's not being updated when stopping Icinga.

refs #9942
2015-08-18 13:08:03 +02:00
Johannes Meyer 8b8fb6379d DataView: Provide default labels for non-labelled filter columns
refs #9029
2015-08-17 15:06:52 +02:00
Johannes Meyer 84ac316cde IdoQuery: Allow check if a column is case insensitive compared
refs #9029
2015-08-17 15:05:44 +02:00
Johannes Meyer b061161979 DataView\Statussummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:07:07 +02:00
Johannes Meyer e20f78bba9 DataView\Servicestatussummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:58 +02:00
Johannes Meyer fe9c7a613c DataView\Servicestatus: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:48 +02:00
Johannes Meyer f0488dddf4 DataView\Servicegroupsummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:36 +02:00
Johannes Meyer 92cece92ab DataView\Servicegroup: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:26 +02:00
Johannes Meyer 833e177666 DataView\Servicedowntime: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:14 +02:00
Johannes Meyer 66d5513517 DataView\Servicecomment: Adjust how to handle filter columns
refs #9029
2015-08-17 14:06:05 +02:00
Johannes Meyer 5d2c389220 DataView\Notification: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:56 +02:00
Johannes Meyer ebbc2686c8 DataView\Hoststatussummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:49 +02:00
Johannes Meyer 25acebab77 DataView\Hostgroupsummary: Adjust how to handle filter columns
refs #9029
2015-08-17 14:05:37 +02:00