Commit Graph

1560 Commits

Author SHA1 Message Date
Thomas Gelf fd7165329a IdoQuery: provide ourselves to the hook 2015-11-13 17:37:03 +01:00
Thomas Gelf cd16206c7e IdoQuery: fix typo 2015-11-13 17:37:03 +01:00
Thomas Gelf 2589fbcf04 IdoQuery::joinHookedVirtualTable: missing method 2015-11-13 17:37:03 +01:00
Thomas Gelf b7352105d2 IdoQueryExtensionHook: "just a new hook" 2015-11-13 17:37:03 +01:00
Thomas Gelf 6394cec933 DataviewExtensionHook: return fetched columns 2015-11-13 17:37:03 +01:00
Thomas Gelf 0e709d5469 DataViewHost/Servicestatus: use hooked columns 2015-11-13 17:37:02 +01:00
Thomas Gelf ff2c96e553 DataviewExtensionHook: we always want an array
This way implementors do not need to care
2015-11-13 17:37:02 +01:00
Thomas Gelf 35d3342b05 DataviewExtensionHook: just a new hook 2015-11-13 17:37:02 +01:00
Thomas Gelf f3cb1f915d Monitoring/DataView: allow to hook in columns 2015-11-13 17:37:02 +01:00
Thomas Gelf dc3c787446 Compat Hooks: fix c&p error 2015-11-13 17:37:02 +01:00
Thomas Gelf e6903b3834 Monitoring\Hook: moved from Monitoring\Web\Hook
refs #10613
2015-11-13 17:37:02 +01:00
Johannes Meyer d321b2de79 Merge branch 'master' into bugfix/hot-all-hostgroups-are-shown-10316 2015-11-13 15:37:53 +01:00
Eric Lippmann d5fe0c9610 Merge branch 'feature/dope-layout-5543#2' 2015-11-13 15:21:07 +01:00
Johannes Meyer 26e6acf9af ListController: Fix servicegrid grouping when applying group restrictions #2
PostgreSQL had still issues with it. Quickfix only, again.

refs #10316
2015-11-13 14:42:28 +01:00
Johannes Meyer 5e37f7758b ServicecommenthistoryQuery: Add missing group origin "servicegroups"
refs #10316
2015-11-13 12:55:06 +01:00
Johannes Meyer 005ec27cea IdoQuery: Fix method isTimestamp() not handling customvars properly
refs #10316
2015-11-13 12:13:02 +01:00
Johannes Meyer cc37ca37d9 ListController: Fix servicegrid grouping when applying group restrictions
Quickfix only.

refs #10316
2015-11-13 11:40:51 +01:00
Johannes Meyer 140e288c0b IdoQuery: Fix incorrect GROUP BY for MySQL SELECTs with joined columns
refs #10316
2015-11-12 16:02:41 +01:00
Eric Lippmann a12cc9ab30 monitoring/CSS: Don't set class sparkline-perfdata
Class not in use.

refs #5543
2015-11-12 09:45:35 +01:00
Johannes Meyer 89d8126226 Revert "Fix grouping of host- and servicegroup queries"
This reverts commit 35c7ed81a7.
2015-11-12 09:26:11 +01:00
Johannes Meyer 689cae8701 Merge branch 'master' into bugfix/hot-all-hostgroups-are-shown-10316 2015-11-12 09:23:49 +01:00
Johannes Meyer 651ce0bd04 Merge branch 'master' into bugfix/pgsql-queries-apply-lower-on-select-columns-10364 2015-11-12 09:18:06 +01:00
Thomas Gelf cbd1629176 DataView/Host|ServiceStatus: allow hard_state cols 2015-11-11 17:13:41 +01:00
Johannes Meyer 39f4d869b7 IdoQuery: Fix that PostgreSQL queries do not apply LOWER() on order cols
refs #10364
refs #9955
2015-11-11 15:25:40 +01:00
Johannes Meyer 0b2b1c5d1e IdoQuery: Fix that PostgreSQL queries use LOWER() on non-CI columns
refs #10364
refs #9954
2015-11-11 14:33:00 +01:00
Johannes Meyer 3d735693db IdoQuery: Fix method isCaseInsensitive() returning true for .. everything ..
..with a PostgreSQL backend.

refs #10364
2015-11-10 16:05:05 +01:00
Johannes Meyer 52606eb2e7 Revert "monitoring: Fix handling of collated columns w/ PostgreSQL"
This reverts commit f5ffa8047c.

refs #10364
refs #9954
refs #9955
2015-11-10 15:59:16 +01:00
Johannes Meyer ad5a43ce7b HostserviceproblemsummaryQuery: Group by "so.name1"
fixes #10589
refs #10490
2015-11-10 15:04:00 +01:00
Eric Lippmann 1da70a1270 monitoring: Remove icons for object tabs
We don't have icons somewhere else. We may introduce icons for all tabs later.

refs #5543
2015-11-10 09:45:26 +01:00
Eric Lippmann ba55ad7c5a monitoring: Fix unhandled service counter in the hosts overview
Group by was wrong.

fixes #10490
2015-11-09 09:55:17 +01:00
Thomas Gelf a2667dd551 Ido: remove test query objects from erraneous commit 2015-11-04 18:37:32 +01:00
Thomas Gelf 0c72b697e0 Classes: rename listing-table to common-table 2015-11-04 15:16:45 +01:00
Eric Lippmann 55f0863649 monitoring: Fix host and service detail history style
fixes #10317
2015-11-03 10:37:34 +01:00
Eric Lippmann c0c9f3b5eb monitoring: Select host_state_type and host_attempt in the service detail view for displaying soft states
refs #5543
2015-10-28 12:08:04 +01:00
Johannes Meyer 35c7ed81a7 Fix grouping of host- and servicegroup queries
It's a rather quick fix but fixes the problem. We should take another look whether
a more sophisticated solution can be found.

refs #10316
2015-10-10 20:04:04 +02:00
Johannes Meyer 6a68d25bc3 MonitoredObject: Deprecate method matches()
It's now possible to achieve the same by passing the object directly to a
filter.

refs #10304
2015-10-05 14:04:40 +02:00
Johannes Meyer 07e5664fbe MonitoredObject: Allow to access a set-value by name
$object->contact|contactgroup|hostgroup|servicegroup + _name
is now allowed and returns an array of strings

refs #10304
2015-10-05 13:59:57 +02:00
Johannes Meyer 499a7d628f Macro: Resolve prefixed custom vars and object attributes
refs #10304
2015-10-05 13:18:10 +02:00
Johannes Meyer 0ed6e08175 MonitoredObject: Allow to access custom variables by property
refs #10304
2015-10-05 13:16:41 +02:00
Johannes Meyer 996959b65e MonitoredObject: Fix object_type condition in method fetchHostVariables
refs #10304
2015-10-05 12:54:30 +02:00
Johannes Meyer 7419c9e87c MonitoredObject: Allow to fetch a host's customvariables for services
refs #10304
2015-10-05 11:57:31 +02:00
Eric Lippmann 54bb99a96d Merge branch 'feature/dope-layout-5543'
refs #5543
2015-10-02 11:16:35 +02:00
Eric Lippmann 61357da35c Merge branch 'bugfix/group-by-9956'
fixes #9956
2015-10-01 23:05:27 +02:00
Thomas Gelf 9ca81320ac Search: re-add object names, allow for addresses
It's now possible do search for IP (and IPv6) addresses. Object names
are once again allowed

fixes #9591
fixes #10163
2015-10-01 18:48:36 +02:00
Eric Lippmann 231c63b703 Merge branch 'master' into feature/dope-layout-5543 2015-09-30 18:52:52 +02:00
Matthias Jentsch 7e81b00a96 Fix multi-view badge filters
Allow providing a base URL for StateBadges to display hosts and services based on a filter.

refs #5543
2015-09-30 16:58:42 +02:00
Johannes Meyer 415690134b Add tab extension to add the current container url as new menu entry 2015-09-30 14:47:42 +02:00
Johannes Meyer 62d96a154e monitoring: Normalize custom variable names not until they're displayed 2015-09-30 13:23:54 +02:00
Eric Lippmann 527b146054 monitoring: Remove unnecessary columns in the GROUP BY list for MySQL
refs #9956
2015-09-30 09:45:52 +02:00
Eric Lippmann bcbe7640e7 monitoring: Fix typos in queries after removing ::getGroup()
refs #9956
2015-09-30 09:45:18 +02:00
Eric Lippmann 0f622fe10b monitoring: Fix renamed index in the ServicedowntimeendhistoryQuery
refs #9956
2015-09-30 09:33:53 +02:00
Eric Lippmann c4ac3cbc1a monitoring: Rearrange code in the ServicedowntimestarthistoryQuery
refs #9956
2015-09-30 09:33:10 +02:00
Eric Lippmann aa76925f69 monitoring: Remove ServicedowntimestarthistoryQuery::getGroup()
refs #9956
2015-09-30 09:32:36 +02:00
Eric Lippmann bd4216907e monitoring: Rearrange code in the ServicedowntimeQuery
refs #9956
2015-09-30 09:30:04 +02:00
Eric Lippmann f4e4dbe069 monitoring: Remove ServicedowntimeQuery::getGroup()
refs #9956
2015-09-30 09:29:34 +02:00
Eric Lippmann 690fc89d62 monitoring: Rearrange code in the ServicestatushistoryQuery
refs #9956
2015-09-30 09:28:27 +02:00
Eric Lippmann e96d0c26e3 monitoring: Remove ServicestatehistoryQuery::getGroup()
refs #9956
2015-09-30 09:27:58 +02:00
Eric Lippmann bbd59d4fbc monitoring: Rearrange code in the HoststatehistoryQuery
refs #9956
2015-09-30 09:25:44 +02:00
Eric Lippmann 178ebd215d monitoring; Remove HoststatehistoryQuery::getGroup()
refs #9956
2015-09-30 09:25:12 +02:00
Eric Lippmann 2f79c2f911 monitoring: Fix renamed index in the ServicecommentdeletionhistoryQuery, part 2
refs #9956
2015-09-30 09:06:51 +02:00
Eric Lippmann 58c630b7ef monitoring: Fix renamed index in the HostdowntimeendhistoryQuery
refs #9956
2015-09-29 23:04:47 +02:00
Eric Lippmann 185c0b43be monitoring: Rearrange code in the HostdowntimestarthistoryQuery
refs #9956
2015-09-29 23:04:01 +02:00
Eric Lippmann 956c86dcdb monitoring: Remove HostdowntimestarthistoryQuery::getGroup()
refs #9956
2015-09-29 23:03:13 +02:00
Eric Lippmann df69755056 monitoring: Rearrange code in the ServicegroupQuery
refs #9956
2015-09-29 22:54:45 +02:00
Eric Lippmann e22dd1d0b4 monitoring: Remove ServicegroupQuery::getGroup()
refs #9956
2015-09-29 22:54:08 +02:00
Eric Lippmann d18d606ad6 monitoring: Handle joined virtual table serviceobjects in IdoQuery::getGroup()
refs #9956
2015-09-29 22:53:41 +02:00
Eric Lippmann 944129d1e6 monitoring: Handle joined virtual table hostobjects in IdoQuery::getGroup()
refs #9956
2015-09-29 22:51:06 +02:00
Eric Lippmann 73152e9244 monitoring: Rearrange code in the HostgroupQuery
refs #9956
2015-09-29 22:50:49 +02:00
Eric Lippmann 6519b25ec1 monitoring: Remove HostgroupQuery::getGroup()
refs #9956
2015-09-29 22:50:12 +02:00
Eric Lippmann 844f80d2df monitoring: Rearrange code in the ServicestatusQuery
refs #9956
2015-09-29 22:47:07 +02:00
Eric Lippmann 6307af9e10 monitoring: Remove ServicestatusQuery::getGroup()
refs #9956
2015-09-29 22:46:02 +02:00
Eric Lippmann d0f11e10f6 monitoring: Rearrange code in the HoststatusQuery
refs #9956
2015-09-29 22:44:12 +02:00
Eric Lippmann 02eee7a603 monitoring: Remove HoststatusQuery::getGroup()
refs #9956
2015-09-29 22:43:09 +02:00
Eric Lippmann 70717169c2 monitoring: Rearrange code in the ServicecommentQuery
refs #9956
2015-09-29 22:42:44 +02:00
Eric Lippmann d2d960d072 monitoring: Remove ServicecommentQuery::getGroup()
refs #9956
2015-09-29 22:42:00 +02:00
Eric Lippmann 92778ec0eb monitoring: Remove HostdowntimeQuery::getGroup()
refs #9956
2015-09-29 22:41:16 +02:00
Eric Lippmann 08965898e9 monitoring: Rearrange code in the HostdowntimeQuery
refs #9956
2015-09-29 22:39:01 +02:00
Eric Lippmann e4e0ad7c18 monitoring: Rearrange columns in the HostcommenthistoryQuery
refs #9956
2015-09-29 22:38:00 +02:00
Eric Lippmann 041c72bb6c monitoring: Rearrange code in the ServicecommenthistoryQuery
refs #9956
2015-09-29 22:37:26 +02:00
Eric Lippmann 1f040df1e9 monitoring: Fix renamed index in the ServicecommentdeletionhistoryQuery
refs #9956
2015-09-29 22:36:24 +02:00
Eric Lippmann e8ce410f08 monitoring: Remove ServicecommenthistoryQuery::getGroup()
refs #9956
2015-09-29 22:36:02 +02:00
Eric Lippmann a3b74fe6d0 monitoring: Fix renamed index in the HostcommentdeletionhistoryQuery
refs #9956
2015-09-29 22:26:05 +02:00
Eric Lippmann 3623cf5196 monitoring: Rearrange code in the HostcommenthistoryQuery
refs #9956
2015-09-29 22:25:45 +02:00
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