Eric Lippmann
2ff822c2ac
Merge branch 'master' into feature/ipv6-addresses-9645-9826
2015-09-28 13:09:30 +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
Johannes Meyer
f4032988bf
MonitoredObject: Add method matches()
...
refs #5600
2015-09-17 10:40:00 +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
1fccf9c721
Merge branch 'master' into feature/monitoring-indicate-late-check-results-8378
2015-09-07 11:09:11 +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
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
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
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
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
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
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
Alexander Fuhr
18dae78d80
MonitoredObject: Add scheduled_end
...
refs #9266
2015-08-10 12:14:49 +02:00
Eric Lippmann
7403c67893
monitoring: Default to Filter::matchAll() in the ObjectList
...
refs #9574
2015-08-04 15:28:18 +02:00
Markus Frosch
a14f800d9e
Add support for IPv6 address
...
refs #9645
2015-08-04 14:02:54 +02:00
Johannes Meyer
fc8b51c4be
ObjectList: Register columns to select even if we're only counting
...
We should never apply any pseudo optimizations on a higher level if
already the lower level applies them, as the optimization might not
be valid in every circumstance.
fixes #9573
2015-07-07 15:50:40 +02:00
Johannes Meyer
20fd3d6758
Fix multiselect views of hosts and services
...
I've broke this with #9472 .
2015-06-24 15:11:33 +02:00
Johannes Meyer
4d72832933
MonitoredObject: Don't apply restrictions to comments and downtimes
...
They're already filtered by object_type and the object's name.
refs #9009
2015-06-17 10:11:59 +02:00
Johannes Meyer
670d6e93c7
MonitoredObject: Ensure that the filter is applied to all queries
...
refs #9009
2015-06-16 17:44:29 +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
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
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
Eric Lippmann
8cbb83d630
Merge branch 'master' into feature/monitoring-restrictions-9009
2015-06-05 15:29:16 +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
f3b84b7ae8
monitoring: Restrict service summary when viewing a host or service
...
refs #9009
2015-06-05 14:14:22 +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
Eric Lippmann
46fdaf4698
monitoring: Fix select columns for the comment data views
...
refs #9009
2015-05-29 15:38:03 +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
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
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
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
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
Matthias Jentsch
c0cf6e4918
Display icon_images in all host and service detail views
...
refs #8665
2015-05-19 18:08:26 +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
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
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
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
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
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
f00adc2138
ContactQuery: Provide ci query columns for aliases and email addresses
...
refs #8613
2015-04-10 09:45:23 +02:00
Johannes Meyer
5372dfb7f1
Fetch a comment's author using `comment_author_name'
...
refs #8613
2015-04-09 13:07:50 +02:00
Matthias Jentsch
878ef05896
Fix "show all downtimes" links
...
refs #8565
2015-04-09 11:19:13 +02:00
Johannes Meyer
09ab601942
Require `service_description' instead of `service' to show a particular service
...
`service' implies that it is possible to provide case-less identifiers which is
*not* possible.
refs #8613
2015-04-08 16:49:52 +02:00
Johannes Meyer
b93d18a0fc
Require `host_name' instead of `host' to show or list particular objects
...
`host' implies that it is possible to provide case-less identifiers which is
*not* possible.
refs #8613
2015-04-08 16:25:29 +02:00
Matthias Jentsch
9ac89edb86
Add filter to summary links
...
Add the multiselection filter as a base filter to the state summary, to ensure that the summary links only selected services.
refs #8565
2015-04-07 18:00:36 +02:00
Matthias Jentsch
46da404452
Add docstrings to ObjectList and coding style
2015-04-07 16:34:20 +02:00
Matthias Jentsch
1c5a091584
Generate filter in host and service lists
...
refs #8565
2015-04-07 16:29:10 +02:00
Matthias Jentsch
5619ac960c
Add inline pies to host and service back to multi-select views
...
Add old inline pie code and visualize handled/unhandled state.
refs #8565
2015-04-02 16:25:20 +02:00
Matthias Jentsch
b0b0ae157c
Turn prepareStateName into more generic string utility function
...
refs #8565
2015-03-31 16:45:21 +02:00
Eric Lippmann
1c8c49e732
Select service_is_reachable in the service detail view
...
refs #6875
2015-03-13 00:26:02 +01:00
Eric Lippmann
37823f0415
Select host_is_reachable in the host detail view
...
refs #6875
2015-03-13 00:25:44 +01:00
Eric Lippmann
53626ccfeb
Merge branch 'master' into bugfix/unnecessary-joins-8614
2015-03-12 16:40:16 +01:00
Eric Lippmann
7156bd7dfb
Fetch object comments by host_name and service_description
...
refs #8614
2015-03-12 16:39:20 +01:00
Eric Lippmann
8563d5ed3f
PHPDoc: Use @var instead of @type
...
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
2015-03-12 16:08:47 +01:00
Eric Lippmann
b501fef62b
Rearrange columns in the Host object
...
refs #8614
2015-03-11 13:10:55 +01:00
Eric Lippmann
ef4970c0c1
Don't select host_process_performance_data twice in the host detail view
...
refs #8614
2015-03-11 13:08:53 +01:00
Eric Lippmann
84f56f4e51
Don't select host_problem in the host detail view
...
The column host_problem is not used in the host detail view.
refs #8614
2015-03-11 13:08:11 +01:00
Eric Lippmann
37d09511c6
Don't select host_modified_host_attributes in the host detail view
...
The column host_modified_host_attributes is not used in the host detail view.
refs #8614
2015-03-11 13:07:33 +01:00
Eric Lippmann
e72670cb75
Use default sorting for an object's event history
...
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann
5ed6838f50
Don't select host_display_name twice in the service detail view
...
refs #8614
2015-03-10 14:18:08 +01:00
Eric Lippmann
e6949eaab4
Reorder columns to select in the Service object
...
refs #8614
2015-03-10 14:17:09 +01:00
Eric Lippmann
fcb94af93c
Don't select service_process_performance_data twice in the service detail view
...
refs #8614
2015-03-10 14:11:50 +01:00
Eric Lippmann
e0acebf474
Don't select service_host_name in the service detail view
...
We already select the host_name.
refs #8614
2015-03-10 14:09:53 +01:00
Eric Lippmann
62f0f5b6a4
Don't select service_modified_service_attributes in the service detail view
...
The column service_modified_service_attributes is not used in the service detail view.
refs #8614
2015-03-10 14:00:17 +01:00
Eric Lippmann
87e5bdfa4c
Do not select columns for check attempt twice in the service detail view
...
The column service_attempt is used in favor of service_current_check_attempt and service_max_check_attempts.
refs #8614
2015-03-10 13:47:20 +01:00
Eric Lippmann
0cc6b5d0c2
Don't select service_last_time_* in the service detail view
...
The columns service_last_time_ ok, warning, critical and unknown are not used in the service detail view.
refs #8614
2015-03-10 13:46:09 +01:00
Eric Lippmann
70ef6263b2
Don't select service_last_hard_state* in the service detail view
...
The columns service_last_hard_state and service_last_hard_state_change are not used in the service detail view.
refs #8614
2015-03-10 13:45:20 +01:00
Eric Lippmann
88dce0c1f4
Don't select host and service columns in the service detail view
...
The columns host and service are not used in the service detail view.
refs #8614
2015-03-10 13:42:53 +01:00
Eric Lippmann
3bbd68dc95
Don't select service_problem in the service detail view
...
The column service_problem is not used in the service detail view.
refs #8614
2015-03-10 13:38:12 +01:00
Eric Lippmann
4e308016bf
Don't select service_hard_state in the service detail view
...
The column service_hard_state is not used in the service detail view.
refs #8614
2015-03-10 13:37:40 +01:00
Eric Lippmann
d65aa39ebd
Don't select host_modified_host_attributes in the service detail view
...
The column host_modified_host_attributes is not used in the service detail view.
refs #8614
2015-03-10 13:33:17 +01:00
Eric Lippmann
34ad174f89
Don't select host_last_time_* in the service detail view
...
The columns host_last_time_ up, down and unreachable are not used in the service detail view.
refs #8614
2015-03-10 13:32:28 +01:00
Eric Lippmann
2cbeab55da
Don't select host_last_hard_state* in the service detail view
...
The columns host_last_hard_state and host_last_hard_state_change are not used in the service detail view.
refs #8614
2015-03-10 13:31:32 +01:00
Eric Lippmann
232b3d3a9f
Don't select host_perfdata in the service detail view
...
The column host_perfdata is not used in the service detail view.
refs #8614
2015-03-10 13:30:03 +01:00
Eric Lippmann
e1dbe0b9a7
Don't select host_severity in the service detail view
...
The column host_severity is not used in the service detail view.
refs #8614
2015-03-10 13:29:39 +01:00
Eric Lippmann
9146a62573
Don't select host_ipv4 in the service detail view
...
The column host_ipv4 is not used in the service detail view.
refs #8614
2015-03-10 13:28:44 +01:00
Eric Lippmann
5f57e290c7
Don't select host_notes_url in the service detail view
...
The column host_notes_url is not used in the service detail view.
refs #8614
2015-03-10 13:27:07 +01:00
Eric Lippmann
0f65f83374
Don't select host_action_url in the service detail view
...
The column host_action_url is not used in the service detail view.
refs #8614
2015-03-10 13:26:47 +01:00
Eric Lippmann
b9ec2844f5
Don't select host_unhandled_services in the service detail view
...
The column host_unhandled_services is not used in the service detail view.
refs #8614
2015-03-10 13:25:25 +01:00
Eric Lippmann
4102ee290b
Don't select host_last_check in the service detail view
...
The column host_last_check is not used in the service detail view.
refs #8614
2015-03-10 13:22:28 +01:00
Eric Lippmann
151d87f38c
Don't select host_is_flapping in the service detail view
...
The column host_is_flapping is not used in the service detail view.
refs #8614
2015-03-10 13:19:37 +01:00
Eric Lippmann
da7f959db5
Don't select host_long_output in the service detail view
...
The column host_long_output is not used in the service detail view.
refs #8614
2015-03-10 13:09:59 +01:00