Commit Graph

1188 Commits

Author SHA1 Message Date
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
Eric Lippmann 46f9256c82 monitoring: Remove ProcessController::performanceAction()
Not used.
2015-08-27 23:31:12 +02:00
Eric Lippmann 568c0f0955 monitoring: Fix mess in the downtimes-header view script 2015-08-27 23:17:57 +02:00
Eric Lippmann 2f47791a70 monitoring: Fix coding style in the comment-detail view script 2015-08-27 23:17:34 +02:00
Eric Lippmann 9ffe151628 monitoring: Omit full stop for tooltips in the comment-description view script 2015-08-27 23:17:11 +02:00
Eric Lippmann f72c8e30fe monitoring: Don't loop more than 5 comments in the comments-header view script
What the ...
2015-08-27 23:16:25 +02:00
Eric Lippmann d92f2cca0e monitoring: Fix coding style in the comments/show view script 2015-08-27 23:15:56 +02:00
Eric Lippmann aceae4cb6e monitoring: Fix coding style in the downtimes/show view script 2015-08-27 23:15:28 +02:00
Eric Lippmann 2533ebc8d5 monitoring: Fix mess in CommentsController and the related view script 2015-08-27 16:04:24 +02:00
Johannes Meyer cc49a289a2 monitoring: Restore view script for the securityAction 2015-08-27 15:49: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
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 1317a6eaf8 Show an object's instance only if there are multiple instances
refs #9945
2015-08-26 10:55:18 +02:00
Johannes Meyer 241f73f229 Show the instance's name of a host or service in the detail view
refs #9945
2015-08-26 10:54:01 +02:00
Eric Lippmann c5fe641c43 monitoring: Rewrite service-grid view script
refs #9538
2015-08-25 14:55:02 +02:00
Eric Lippmann b629115ba7 monitoring: Use empty() for is empty check in the servicegrid view script
refs #9538
2015-08-21 11:37:46 +02:00
Eric Lippmann 5ae541db25 monitoring: Drop unnecessary call to array_values in the servicegrid view script
refs #9538
2015-08-21 11:35:30 +02:00
Eric Lippmann 71b89ea51a monitoring: Rename $serviceStates to $services in the servicegrid view script
refs #9538
2015-08-21 11:35:03 +02:00
Eric Lippmann 1ab8fc0012 monitoring: Use View::ellipsis() in the servicegrid view script
refs #9538
2015-08-21 11:32:33 +02:00
Eric Lippmann 9d40013b21 monitoring: Rename $service_description to $serviceDescription in the servicegrid view script
refs #9538
2015-08-21 11:30:18 +02:00
Eric Lippmann d461270bf8 monitoring: Rename $host_name to $hostName in the servicegrid view script
refs #9538
2015-08-21 11:29:29 +02:00
Matthias Jentsch 41d68f6a74 Fix delete comments and downtimes button
Fix faulty target names and add additional error checking in case the target DOM Element is not present.

fixes #9330
2015-08-19 16:36:47 +02:00
Eric Lippmann 1741a4f10b monitoring: Use display names for the aria-label in the service grid
refs #9538
2015-08-19 12:56:19 +02:00
Alexander Fuhr 038fa29da8 notifications(view): Fix the wrong url for the service row
fixes #9597
2015-08-18 16:06:57 +02:00
Johannes Meyer ad20d35e78 Eventgrid: Fetch the user's filter directly from the URL
refs #9029
2015-08-13 12:11:01 +02:00
Johannes Meyer 3f0d073f43 Merge branch 'master' into bugfix/slow-unhandled-service-summary-query-in-host-overview-9864 2015-08-11 14:01:27 +02:00
Alexander Fuhr 01ec2cd590 Merge branch 'master' into bugfix/downtimes-with-non-problem-state-time-caption-9266 2015-08-10 12:46:13 +02:00
Alexander Fuhr 72cf023bf8 donwtime/view: Fix condition statement
refs #9266
2015-08-10 12:32:15 +02:00
Alexander Fuhr 073d695c94 downtime/views: Fix the wrong time for flexible downtime
refs #9266
2015-08-10 12:15:26 +02:00
Alexander Fuhr c88f0c7e37 downtime/views: Use ends instead of started ...
refs #9266
2015-08-10 10:58:21 +02:00
Alexander Fuhr f0cabf059a view/downtimes: Add missing translate
refs #9266
2015-08-10 10:20:49 +02:00
Johannes Meyer a4fdb30067 Host Overview: Use a dedicated query to fetch service summaries
refs #9864
2015-08-07 15:37:35 +02:00
Johannes Meyer 9dad63b512 Service history: Remove pagination and provide a load more link instead
refs #8615
2015-08-06 13:09:35 +02:00
Johannes Meyer 63650518ee Host history: Remove pagination and provide a load more link instead
refs #8615
2015-08-06 13:09:24 +02:00
Johannes Meyer b9e0a80479 EventHistory Overview: Show the load more link as button and centered
refs #8615
2015-08-06 12:50:17 +02:00
Johannes Meyer ea3e0bc013 Eventhistory Overview: Use id attribues as the name attribute is deprecated
refs #8615
2015-08-06 11:52:35 +02:00
Johannes Meyer 8cf3b99335 Eventhistory Overview: Remove pagination and provide a load more link instead
refs #8615
2015-08-06 10:23:44 +02:00
Alexander Fuhr aa7adee21f views/donwtime(s|-header): Fix that the Downtimes show "Starts in" ...
... for objects with non-problem state

refs #9266
2015-08-05 14:37:33 +02:00
Johannes Meyer 15ac59268c Put a small margin around show more links
refs #6677
2015-08-04 15:25:01 +02:00
Johannes Meyer bc91c38a85 Service Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:16:31 +02:00
Johannes Meyer 4481224549 Servicegroup Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:16:16 +02:00
Johannes Meyer 792dc177dd Notification Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:15:22 +02:00
Johannes Meyer 723ff76c17 Host Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:15:08 +02:00
Johannes Meyer 66bf3d2eb9 Hostgroup Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:14:01 +02:00
Johannes Meyer 916a88542a Event Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:13:43 +02:00
Johannes Meyer 5ec85df923 Downtime Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:13:17 +02:00
Johannes Meyer 6017dce1cc Contact Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:13:02 +02:00
Johannes Meyer b8ac2fccd4 Comment Overview: Provide a show more link when in compact view
refs #6677
2015-08-04 15:12:47 +02:00
Markus Frosch 083900dae0 Implement DblClickSelect as a Icinga Behavior
refs #9826
2015-08-04 14:06:33 +02:00
Markus Frosch a14f800d9e Add support for IPv6 address
refs #9645
2015-08-04 14:02:54 +02:00
Johannes Meyer d1917ad2b4 Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632
Conflicts:
	modules/monitoring/application/views/scripts/service/history.phtml
2015-08-03 16:46:27 +02:00
Johannes Meyer 2de761d8ec Service History: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 16:35:17 +02:00
Johannes Meyer 54590bfaf1 Host History: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 16:34:50 +02:00
Johannes Meyer 8a5b5390da Event Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 16:09:42 +02:00
Johannes Meyer f03b9e5769 Eventgrid: Use $query->hasResult() instead of $query->count()
* and do not use fetchAll()
* and do not use <? short tags
* and do not use curly braces if not absolutely necessary..

refs #9632
2015-08-03 16:06:21 +02:00
Johannes Meyer 57e0ce1b53 Comment Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:49:12 +02:00
Johannes Meyer d9539b2ad1 Downtime Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:45:54 +02:00
Johannes Meyer 6f0b51ed8f Notification Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:35:17 +02:00
Johannes Meyer 29fd849cca Contact Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:35:07 +02:00
Johannes Meyer 028342adfe Services Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:24:10 +02:00
Johannes Meyer e1b3c42818 Host Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:22:14 +02:00
Johannes Meyer c0b82eff94 Servicegroup Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:18:40 +02:00
Johannes Meyer 39d29c79d2 Hostgroup Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:06:22 +02:00
Eric Lippmann 688a08585b Merge branch 'master' into bugfix/error-prone-generictts-9611
Conflicts:
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
2015-08-03 15:05:45 +02:00
Eric Lippmann d8e6418e94 monitoring: Fix code style in the show/components/downtime.phtml view script
refs #9611
2015-08-03 15:03:31 +02:00
Eric Lippmann 0809caa86b monitoring: Fix indent in the show/components/comments.phtml view script
refs #9611
2015-08-03 15:03:02 +02:00
Matthias Jentsch 6a17d7cb26 Do not target next pane in multiview detail controls
fixes #9815
2015-08-03 13:45:47 +02:00
Alexander Fuhr a63b69f4a1 components/downtime: Add downtime end time information in view
fixes #8845
2015-08-03 13:44:41 +02:00
Alexander Fuhr 8860181bcc Revert "components/downtime: Add downtime end time information in view"
This reverts commit 863330e50d.

refs #8845
2015-08-03 13:42:11 +02:00
Alexander Fuhr 1652f1e1ae Revert "components/downtime: Add the missing php script tag"
This reverts commit 95ea0e616d.

refs #8845
2015-08-03 13:41:40 +02:00
Alexander Fuhr 95ea0e616d components/downtime: Add the missing php script tag
refs #8845
2015-08-03 13:05:41 +02:00
Alexander Fuhr 863330e50d components/downtime: Add downtime end time information in view
fixes #8845
2015-08-03 12:37:09 +02:00
Eric Lippmann d5e2f92aa9 monitoring: Use createTicketLinks helper when showing downtimes of an object
refs #9611
2015-08-03 11:00:46 +02:00
Eric Lippmann a379a448d9 monitoring: Fix code style in the show/components/comments.phtml view script
refs #9611
2015-08-03 10:58:57 +02:00
Eric Lippmann b6caeb6c17 monitoring: Use createTicketLinks helper when showing comments of an object
refs #9611
2015-08-03 10:53:51 +02:00
Eric Lippmann e555e3e3b2 monitoring: Use createTicketLinks helper when showing a service's history
refs #9611
2015-08-03 10:44:53 +02:00
Eric Lippmann 498585d8af monitoring: Use createTicketLinks helper when showing a host's history
refs #9611
2015-08-03 10:43:42 +02:00
Matthias Jentsch 2e8b7425a1 Make servicegroup table an action table
refs #8623
2015-07-29 11:41:17 +02:00
Johannes Meyer 8b4c2c459a comments overview: Improve link titles 2015-07-13 12:51:50 +02:00
Johannes Meyer d6f756c670 downtimes overview: Improve link titles 2015-07-13 12:51:12 +02:00
Johannes Meyer c90da0378d downtimes overview: Fix detail links 2015-07-13 12:17:00 +02:00
Johannes Meyer 3db81a8d0f downtimes-header: Do not show links with a bold font 2015-07-10 15:46:24 +02:00
Johannes Meyer d0a588ef58 downtimes-header: Do not access a non-existent property, again
I don't get it..
2015-07-10 15:43:07 +02:00
Johannes Meyer ac8a2d1673 downtimes-header: Show proper times for fixed downtimes not yet started 2015-07-10 15:41:42 +02:00
Johannes Meyer 831581471c downtimes/show.phtml: Drop redundant link title
Such a title has not any advantage as it contains the same content
as the link label.
2015-07-10 15:17:25 +02:00
Johannes Meyer 3091b8cf5c downtimes/show.phtml: Do not show an (inappropriate) icon in the title 2015-07-10 15:16:16 +02:00
Johannes Meyer 9ca1a6dea6 downtimes-header: Add links for hosts and services 2015-07-10 15:11:59 +02:00
Johannes Meyer 4fd5c43c70 downtimes-header: Show a line-break between an object's name and..
..a downtime's description
2015-07-10 14:44:24 +02:00
Johannes Meyer e8f16d112d downtimes-header: We're listing downtimes rather than showing them 2015-07-10 14:43:36 +02:00
Johannes Meyer 006d2cb537 downtimes-header: Be more efficient when listing downtimes 2015-07-10 14:39:30 +02:00
Johannes Meyer bba57d2bbc downtimes-header: Use <strong> instead of <b> 2015-07-10 14:32:08 +02:00
Johannes Meyer 5ded76536e downtimes-header: Use the correct property to access a service's name
Seems to me that no-one has ever selected multiple service downtimes..
2015-07-10 14:30:07 +02:00
Matthias Jentsch 4f884b1529 Revert "Don't use HTMLPurifier in list views to improve performance"
Performance gain turned out to be insignificant. This reverts commit 17bb725f84.

refs #9036
2015-07-07 10:17:04 +02:00
Matthias Jentsch 17bb725f84 Don't use HTMLPurifier in list views to improve performance
refs #9036
2015-07-06 17:14:36 +02:00
Matthias Jentsch 7bda4ce42b Do not escape certain HTML markup for plugin output
Use specialized escape functions for plugin output that allow certain HTML formatting to be allowed.

refs #9036
2015-07-06 15:36:43 +02:00
Matthias Jentsch aecfb2eb97 Merge branch 'bugfix/multiselection-not-visible-9054'
fixes #9054
fixes #9346
2015-06-30 14:08:19 +02:00
Matthias Jentsch 0fcb054be4 Fix service selection in event history
Add rowaction class to all service rows, to make services selectable again.
2015-06-30 14:07:27 +02:00
Matthias Jentsch aec59d9941 Use current filter to highlight active rows instead of storing active rows in JS
Clean up selection code and move it into separate behavior and parse filter query to fetch selectable rows.

refs #9054
refs #9346
2015-06-29 18:48:42 +02:00
Johannes Meyer db20f2d05a BackendConfigForm: Adjust how to process requests
refs #9516
2015-06-29 14:00:34 +02:00
Johannes Meyer 766ff8ed83 InstanceConfigForm: Adjust how to process requests
fixes #7486
fixes #7488
fixes #7489
fixes #7490
refs #9516
2015-06-29 12:01:43 +02:00
Johannes Meyer b741845d54 Show missing tabs for object command forms
fixes #9477
2015-06-24 14:52:11 +02:00
Johannes Meyer 67e31c730a Fetch host and service statistics not until they are required
fixes #9472
2015-06-23 08:49:11 +02:00
Matthias Jentsch d3dd88a925 Add alternating table layout to module views 2015-06-22 09:46:03 +02:00
Johannes Meyer 44e7fcf295 Improve the look of boxview headings 2015-06-19 15:12:08 +02:00
Johannes Meyer 9b14fffc33 Add missing class attribute 2015-06-18 17:32:00 +02:00
Thomas Gelf e78a80f184 monitoring/object/show: default links for groups 2015-06-18 17:20:51 +02:00
Thomas Gelf fb921a9518 monitoring/details: more styling 2015-06-18 17:20:51 +02:00
Thomas Gelf 02f3c333eb monitoring/object/show: reorder elements 2015-06-18 16:53:39 +02:00
Thomas Gelf cd70c27519 Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-18 15:18:42 +02:00
Thomas Gelf 171b1d84ef object/show: make downtimes look like comments
refs #8281
2015-06-18 14:57:58 +02:00
Johannes Meyer 2bffe56bd5 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-18 14:54:01 +02:00
Thomas Gelf a4ab4db1ca perfdata: occupy more space, highglight like output 2015-06-18 11:39:55 +02:00
Thomas Gelf 3462f0ee9a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361
Conflicts:
	modules/monitoring/application/views/scripts/host/history.phtml
	modules/monitoring/application/views/scripts/list/services.phtml
2015-06-18 11:26:51 +02:00
Matthias Jentsch 1ef643e002 Improve service/host name layout in all views
refs #9361
2015-06-17 11:33:55 +02:00
Johannes Meyer 0d32b94eaa HostController: Open a host's service in the current column 2015-06-17 10:24:18 +02:00
Matthias Jentsch 3caa5b428a Merge branch 'bugfix/don-t-show-more-than-the-five-worst-pies-in-list-views-8205'
fixes #8205
2015-06-16 18:40:03 +02:00
Johannes Meyer 95cb6dea4b Transfer changes from show/history.phtml to service/history.phtml
Was not recognised by git as host/history.phtml is the counterpart
for show/history.phtml in the tree.

refs #9009
2015-06-16 18:13:04 +02:00
Johannes Meyer e8058c09c5 Merge branch 'master' into feature/monitoring-restrictions-9009
Conflicts:
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
2015-06-16 17:12:51 +02:00
Johannes Meyer 71e932bcf9 ShowController: Deprecate historyAction 2015-06-16 17:05:41 +02:00
Johannes Meyer 196450d8cf MonitoredObjectController: Add historyAction 2015-06-16 17:04:36 +02:00
Johannes Meyer d81e637ae9 HostController: Add action to show a host's services 2015-06-16 16:04:45 +02:00
Johannes Meyer d5f7ee3c56 Behave nicely when showing notifications not sent out to any contact
I noticed that there is no output shown for the history views in case no
contact has been notified, but time is short atm...

refs #9009
refs #9430
2015-06-16 13:32:35 +02:00
Thomas Gelf 09c0ebcacd list/services: flip host/service for readability
Re-allow table.action to manually choose row action link if it should not
be the first one. This existed once but got lost.
2015-06-16 02:36:53 +02:00
Thomas Gelf 686f73858f monitoring/list: move object flags to the right 2015-06-16 01:45:48 +02:00
Thomas Gelf 96ac83230c customvars.phtml: no header if no vars 2015-06-16 01:15:32 +02:00
Thomas Gelf 64ac2ea4c8 comments, downtimes: these should never have used...
...that styling. Those are headers and have nothing to do with statesummaries
2015-06-16 00:51:25 +02:00
Thomas Gelf a5a529bc99 Tiny summaries: use header tag instead of div 2015-06-16 00:50:40 +02:00
Thomas Gelf 59ef6ff71a monitoring/show: choose fitting header tags 2015-06-16 00:35:32 +02:00
Thomas Gelf 0170d9941a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-15 23:08:17 +02:00
Alexander A. Klimov e764bfb95d Repair command links
fixes #9392
2015-06-10 14:29:44 +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 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
Thomas Gelf 6e1ba30acc Styling: re-organize and style comments 2015-06-03 15:35:50 +02:00
Thomas Gelf d4a9f4fd98 controls: introduce new "separated" class
Controls defined as "separated" will be separated by space/border/shadow
or similar
2015-06-03 15:35:50 +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
Alexander A. Klimov d7e850da0e Show at most 5 pie charts in the services list
refs #8205
2015-05-29 18:41:07 +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 8b08473341.

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 229e266daf.

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
Alexander A. Klimov 533c980a29 Show only three significant digits in check execution time
fixes #8849
2015-05-15 17:32:13 +02:00
Johannes Meyer fbf0ad4339 Drop interface Browsable
We're not required to handle objects of Zend_Paginator in any way, so
creating such as part of a query is not necessary since QueryAdapter
accepts any instance of QueryInterface. (gets enforced in the near future)

refs #8339
2015-05-15 14:37:41 +02:00
Alexander A. Klimov 8b08473341 Hostgroups view: reduce "Last Problem" column's width 2015-05-15 12:34:59 +02:00
Alexander A. Klimov c7d1a7211f Show host states in host groups 2015-05-15 11:28:16 +02:00
Alexander A. Klimov e879ba445d List number of hosts in host groups
refs #8054
2015-05-13 18:15:04 +02:00
Alexander A. Klimov ab2f8e09d6 Calculate states for host group view from host states
refs #8860
2015-05-13 16:31:25 +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
Matthias Jentsch fff2d5c816 Use consistent controller names
refs #8624
2015-05-07 17:29:46 +02:00
Matthias Jentsch 83efc3a4a3 Conform to coding guidelines 2015-05-07 17:23:50 +02:00
Matthias Jentsch b314c074cc Fix downtime and comment form redirects
refs #8624
2015-05-07 16:20:59 +02:00
Matthias Jentsch 4463f16f04 Add abbillity to remove multiple comments by id
refs #8624
2015-05-07 15:11:54 +02:00
Matthias Jentsch b35dd4ddfe Separate forms for deleting single and multiple comments
refs #8624
2015-05-07 14:03:09 +02:00
Matthias Jentsch 7c8ff44fd1 Fix comment and downtime list inline forms
refs #8903
refs #8902
2015-05-07 10:59:37 +02:00
Matthias Jentsch e5e3e80300 Conform to coding guidelines 2015-05-07 10:59:36 +02:00
Matthias Jentsch 5477a2f18e Escape missing variables
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch e6740c5093 Set link target to next page in all comment views
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch 0c7d8ab481 Add controlle for handling multiple comments
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch ca839d5123 Display amount of selected rows
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch cab198eadc Fix whitespaces and unused comments 2015-05-07 10:59:36 +02:00
Matthias Jentsch 32da02c162 Deduplicate comment views
Move comment detail and description into separate partial to reduce code duplication
2015-05-07 10:59:36 +02:00
Matthias Jentsch dedc175967 Add basic comment detail view
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch a46dece136 Provie link to detail view in downtime partial
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch be566746a9 Provide downtime header in remove and remove-all commands
Add new show script for downtimes and move downtime headers into partials to deduplicate code.

refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch b186ce2cac Handle non-existed downtime ids with exceptions
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 400f351ea5 Improve detail view layout
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 07c5e67304 Display additional downtime info in multiselection detail view
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch a87e1f91d9 Implement detail view for multiple downtimes
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 20b25e656b Show better error message for unknown downtimes
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 9114a34223 Display host and service state in downtime detail area
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch ab0720fe95 Add support for multi-selection to downtime list
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch bb7afd9b2b Add tooltips to downtime detail view
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch ff47b892e9 Improve order and content of downtime properties
Add rows for missing properties, reorder and group related properties.

refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 7b6641dc84 Add basic downtime controller and views
refs #8902
2015-05-07 10:34:06 +02:00
Michael Friedrich defda53ff5 Show icinga program version in Monitoring Health
Also emphasize on the backends used.

fixes #9207
2015-05-05 17:02:45 +02:00
Alexander Fuhr 0e4201a997 Add info about the active ido endpoint to monitoring health overview
resolves #9223
2015-05-05 15:20:25 +02:00
Alexander A. Klimov a976d777b3 Show custom variables visually separated in the host and service detail views
resolves #8966
2015-04-23 13:31:02 +02:00
Johannes Meyer 1e064a5379 Revert "Fix host and service multiselection"
This reverts commit 1f4b3aa8ea.
2015-04-20 16:13:03 +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 894457a1c1 Revert "Adjust command links so that they'll use `host_name' instead of `host'"
This reverts commit b9aee47d1f.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-04-20 16:11:08 +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 9bbb23ae7d Revert "Adjust command links so that they'll use `service_description'"
This reverts commit cee189a5fc.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-04-20 16:08:51 +02:00
Johannes Meyer da7aa23820 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 15:20:23 +02:00
Johannes Meyer 0997eaf459 Host detail view: Fix that the list of services is missing all tabs
refs #7876
2015-04-20 14:56:30 +02:00
Matthias Jentsch 423b92f8dc Remove gravity settings from servicegrid
refs #9025
2015-04-20 12:02:17 +02:00
Johannes Meyer 54a370ca22 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 11:15:04 +02:00
Johannes Meyer 14a555629d servicegrid: Ensure dashboard compliance
refs #7876
2015-04-17 16:20:29 +02:00
Johannes Meyer c099b7ddd7 eventgrid: Ensure dashboard compliance
refs #7876
2015-04-17 16:20:22 +02:00
Johannes Meyer 78e4df2ce9 monitoring health views: Ensure dashboard compliance
refs #7876
2015-04-17 16:20:06 +02:00
Johannes Meyer b9f9ea6142 service/show: Ensure dashboard compliance
refs #7876
2015-04-17 16:19:38 +02:00
Johannes Meyer b2246c2aff host/show: Ensure dashboard compliance
refs #7876
2015-04-17 16:19:30 +02:00
Johannes Meyer 58b93101c7 multiselect views: Ensure dashboard compliance
refs #7876
2015-04-17 16:18:56 +02:00
Johannes Meyer 7be00791a7 list/eventhistory: Ensure dashboard compliance
refs #7876
2015-04-17 16:15:58 +02:00
Johannes Meyer faa29e3dee list/hostgroups: Ensure dashboard compliance
refs #7876
2015-04-17 16:14:59 +02:00
Johannes Meyer 7ae7bf38c4 list/servicegroups: Ensure dashboard compliance
refs #7876
2015-04-17 16:14:46 +02:00
Johannes Meyer 2190e553be list/comments: Ensure dashboard compliance
refs #7876
2015-04-17 16:14:29 +02:00
Johannes Meyer b9249dac4e list/contactgroups: Ensure dashboard compliance
refs #7876
2015-04-17 16:14:13 +02:00
Johannes Meyer d725b2feb7 list/contacts: Ensure dashboard compliance
refs #7876
2015-04-17 16:13:56 +02:00
Johannes Meyer a09e41e3b8 list/notifications: Ensure dashboard compliance
refs #7876
2015-04-17 16:13:36 +02:00
Johannes Meyer 5f19ec1b2e list/downtimes: Ensure dashboard compliance
refs #7876
2015-04-17 16:13:22 +02:00
Johannes Meyer 29648191e4 list/services: Ensure dashboard compliance
refs #7876
2015-04-17 16:12:56 +02:00
Johannes Meyer 74cf3cf375 list/hosts: Ensure dashboard compliance
refs #7876
2015-04-17 16:12:35 +02:00
Johannes Meyer 073dc31128 Timeline: Ensure dashboard compliance
refs #7876
2015-04-17 16:11:06 +02:00
Johannes Meyer 3f092ffb2d show/contact: Ensure dashboard compliance
refs #7876
2015-04-17 16:10:49 +02:00
Johannes Meyer 9388944283 show/history: Ensure dashboard compliance
refs #7876
2015-04-17 16:10:21 +02:00
Johannes Meyer 5f4a61f36e Alertsummary: Ensure dashboard compliance
refs #7876
2015-04-17 16:09:50 +02:00
Matthias Jentsch 0974b70e0e Display service grid tooltips on the top
fixes #9025
2015-04-16 18:32:47 +02:00
Eric Lippmann 796cbffbd7 Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
2015-04-15 15:43:39 +02:00