855 Commits

Author SHA1 Message Date
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
f2c7d5686a Timeline: Fix url used to extend the timeline 2015-06-09 09:17:15 +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
2da45d2e94 monitoring: Fix link to a host's services in the service grid
refs #7998
2015-06-02 10:07:43 +02:00
Eric Lippmann
c01512d5e9 monitoring: Fix link to unhandled services of a host
refs #7998
2015-06-02 10:07:13 +02:00
Eric Lippmann
0ce2227385 monitoring: Don't add class active to followed links of a host's service summary
The links now open in the next container. Managing active state of followed links is not yet possible.

refs #7998
2015-06-02 10:06:54 +02:00
Eric Lippmann
9b4f3c9f60 monitoring: Readd link to all configured hosts 2015-06-01 17:25:10 +02:00
Eric Lippmann
34edf87461 monitoring: Readd link to all configured services 2015-06-01 17:24:34 +02:00
Eric Lippmann
fa1a5c609d monitoring: Open links of a host's service summary in the next container
refs #7998
2015-06-01 17:21:11 +02:00
Matthias Jentsch
1901f0af98 Improve .ini file formatting
End every file with a newline, and only display 1 empty line between each section, to improve readabillity.

fixes #8706
2015-06-01 16:12:02 +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
Matthias Jentsch
a298197e6c Fix layout of action lincs in view
refs #6392
2015-05-28 15:31:50 +02:00
Matthias Jentsch
a66949162b Resolve macros when accessing getters on MonitoredObjects
refs #6392
2015-05-28 15:01:10 +02:00
Eric Lippmann
e0fe6440d2 monitoring: Show host's services in the next container
refs #7998
2015-05-28 12:26:22 +02:00
Eric Lippmann
8dbb215e27 monitoring: Remove services action from the ShowController
refs #7998
2015-05-28 12:25:31 +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
Matthias Jentsch
a7135bad62 Resolve runtime macros in notes too
refs #8235
2015-05-26 16:49:08 +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
Eric Lippmann
1d22d0c989 monitoring: Fix wrong partial time when a downtime expires 2015-05-22 16:50:24 +02:00
Eric Lippmann
53ca68903a Merge branch 'bugfix/time-formatting-6778'
fixes #6778
2015-05-22 11:34:43 +02:00
Eric Lippmann
873bc22a1e monitoring: Fix date and time formatting for comments
refs #6778
2015-05-22 10:22:14 +02:00
Eric Lippmann
da97523fa0 monitoring: Fix duration, date and time formatting for downtimes
refs #6778
2015-05-22 10:06:55 +02:00
Eric Lippmann
d17842b485 monitoring: Fix usage of the dropped DateTimeRenderer
refs #6778
2015-05-22 09:33:30 +02:00
Eric Lippmann
d187d77a7f monitoring: Use timeAgo in the comment-description partial
refs #6778
2015-05-22 09:29:33 +02:00
Matthias Jentsch
54f72377c5 Do not display mouse-over effect in comment multi-view 2015-05-21 16:28:00 +02:00
Eric Lippmann
54577d04bd Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/hostgroups.phtml
	modules/monitoring/application/views/scripts/process/info.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
	modules/monitoring/public/css/module.less
2015-05-21 14:57:01 +02:00
Matthias Jentsch
ee6c669441 Deduplicate code and fix layout
Move icon rendering code into a separate for better maintainabillity.

refs #8665
2015-05-21 11:40:08 +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
Eric Lippmann
0a8c9ad195 Merge branch 'feature/list-number-of-hosts-in-host-groups-8054'
resolves #8054
2015-05-19 15:10:20 +02:00
Eric Lippmann
afe07f4814 Revert "Hostgroups view: reduce "Last Problem" column's width"
This reverts commit 8b084733413b74131100abf6a31efc02793695c5.

Common table style is subject of #8935.

refs #8054
2015-05-19 13:45:20 +02:00
Eric Lippmann
3296522d90 Merge branch 'feature/Allow-to-add-columns-to-monitoring-views-via-URL-4498'
resolves #4498
2015-05-19 13:35:04 +02:00
Eric Lippmann
979f16e5f6 Use date and time format view helper function in the monitoring health view
I'm about to drop the DateFormat view helper class.

refs #6778
2015-05-19 10:13:58 +02:00
Eric Lippmann
8f40d76cca Use date format view helper function in the event grid
I'm about to drop the DateFormat view helper class.

refs #6778
2015-05-19 10:11:12 +02:00
Eric Lippmann
7212c038f1 Don't show ago, since, ... for monitoring list views in the dashboard
refs #6778
2015-05-19 10:00:27 +02:00
Eric Lippmann
3fdf1d2a5c Use timeAgo in the event history overview
refs #6778
2015-05-19 09:57:46 +02:00
Matthias Jentsch
94555d7998 Streamline layout of all multi-views
Fix small inconsistencies between layout of downtime, comment, service and host multi-views.
2015-05-18 17:17:30 +02:00
Alexander A. Klimov
0bde465295 Rename ::extraColumns() to ::addColumns()
refs #4498
2015-05-18 16:29:33 +02:00
Matthias Jentsch
592d5eadc1 Merge branch 'feature/improve-multi-select-view-8565' 2015-05-18 16:00:52 +02:00
Matthias Jentsch
1f20ba1bc6 Fix state summary base target in multi views
refs #8565
2015-05-18 15:48:04 +02:00
Matthias Jentsch
342a8a39d1 Fix state summary in multi views
refs #8565
2015-05-18 14:58:51 +02:00
Matthias Jentsch
e84491d438 Improve multi view layout
refs #8565
2015-05-18 14:49:06 +02:00
Eric Lippmann
9ffeffdf09 Show when an object's dowtime was added
refs #6778
2015-05-18 14:39:36 +02:00
Eric Lippmann
13a38c9d18 Revert "Add new line between comment author and creation time in the detail views"
This reverts commit 229e266daf4d57a1052ff69ecb132575bcd40941.

The new line does not help for improving the layout but makes it more confusing.
2015-05-18 14:36:35 +02:00
Eric Lippmann
e49f938f56 Use timeSince and timeUntil when displaying object downtimes
refs #6778
2015-05-18 14:33:49 +02:00
Eric Lippmann
bd51bed9d7 Use timeSince and timeUntil in the dowtimes overview
refs #6778
2015-05-18 14:18:22 +02:00
Eric Lippmann
e1f6aee2e7 Use timeAgo in the notifications overview
refs #6778
2015-05-18 14:17:48 +02:00
Marius Hein
f4d25a71c8 Merge branch 'master' into feature/service-actions-9284 2015-05-18 14:07:41 +02:00
Matthias Jentsch
fe2ee3617b Remove pie charts from multi-views
refs #8565
2015-05-18 13:56:35 +02:00
Alexander A. Klimov
4ff7d7a845 Don't parse $object->check_execution_time w/ regex as it's always a float (or null) 2015-05-18 13:37:38 +02:00
Marius Hein
62d8c441f8 Add ServiceActionsHook
refs #9284
2015-05-18 11:45:39 +02:00