Commit Graph

1652 Commits

Author SHA1 Message Date
Matthias Jentsch a298197e6c Fix layout of action lincs in view
refs #6392
2015-05-28 15:31:50 +02:00
Matthias Jentsch eb5c48ade9 Access correct resolver function in IconImage
refs #6392
2015-05-28 15:21:56 +02:00
Matthias Jentsch 3b601decc5 Remove unused ResolceMacro Helper
refs #6392
2015-05-28 15:15:07 +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
Eric Lippmann 5fdaa2cd7e monitoring: Fix command links when showing multiple selected hosts
fixes #9327
2015-05-28 13:17:00 +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
Eric Lippmann b3e0851b62 monitoring: Remove the services tab when showing an object's history
refs #7998
2015-05-28 12:24:00 +02:00
Alexander Fuhr 558120e23b Add resource ssh usage to resources and instances
refs #7595
2015-05-28 10:50:13 +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 344e17a605 monitoring: Fix command links when showing multiple selected hosts
fixes #9327
2015-05-28 10:33:13 +02:00
Eric Lippmann 0c1df335fc monitoring: Fix select columns for downtimes, again
refs #9009
refs #9319
2015-05-26 17:15:03 +02:00
Eric Lippmann cd1ee3e306 monitoring: Fix select columns for downtimes
refs #9009
refs #9319
2015-05-26 17:07:58 +02:00
Eric Lippmann e240f7b955 monitoring: Don't select host last ack, comment and downtime
Where unsure whether or not we will still support this.

refs #7344
refs #9009
2015-05-26 17:00:39 +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 ea8c497539 Fix exception when following command links for multiple selected hosts 2015-05-22 16:51:23 +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 8d6d52f9db monitoring: Fix date and time formatting in the timeline
refs #6778
2015-05-22 10:59:17 +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
Eric Lippmann 2bdb725370 Merge branch 'bugfix/monitoring-controllers-response-codes-6281'
fixes #6281
2015-05-22 09:27:51 +02:00
Eric Lippmann e137263c4b monitoring: Fix HTTP response code when showing an invalid comment
refs #6281
2015-05-22 09:20:27 +02:00
Eric Lippmann 8f42d7a1d3 monitoring: Fix HTTP response code when showing an invalid downtime
refs #6281
2015-05-21 17:17:25 +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 0b81a1130f monitoring: Fix HTTP response code when showing an invalid host
refs #6281
2015-05-21 16:18:09 +02:00
Eric Lippmann e8c704b98d monitoring: Fix HTTP response code when showing an invalid service
refs #6281
2015-05-21 16:18:09 +02:00
Eric Lippmann ce9110d22d Revert "Add proper respond http codes to service and host controller"
This reverts commit 6df031dc78.

I revert this commit for the following reasons:
- MissingParameterException must not be thrown manually because we have UrlParams::getRequired() which was UrlParams::req() before.
- The commit introduces the untranslated string 'host or service'.
- 4xx are client, not server errors.
- Copy and paste code for the stack trace handling in the ErrorController.

refs #6281
2015-05-21 16:14:02 +02:00
Matthias Jentsch 8ce9989243 Merge branch 'feature/support-icon-image-alt-9300'
resolves #9300
2015-05-21 15:03:06 +02:00
Matthias Jentsch f808d373ea Display image icon tooltip instantly
refs #9300
2015-05-21 15:02:23 +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
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
Eric Lippmann 47f21eebaa Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'
fixes #8241
2015-05-21 14:05:49 +02:00
Eric Lippmann e0c6ce58c3 monitoring: Fix sort control columns for the service group summary
refs #8241
2015-05-21 12:42:53 +02:00
Eric Lippmann 0db7cfca88 monitoring: Default to the sort rules of the service group summary
refs #8241
2015-05-21 12:41:59 +02:00
Eric Lippmann 89bac33595 monitoring: Fix sort control columns for the host group summary
refs #8241
2015-05-21 12:38:20 +02:00
Eric Lippmann 4b9f7eb910 monitoring: Default to the sort rules of the host group summary
refs #8241
2015-05-21 12:36:05 +02:00
Matthias Jentsch 87a46ea5b1 Merge branch 'feature/show-icon-images-in-detail-view-8665'
fixes #8665
2015-05-21 11:42:57 +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
Eric Lippmann a52264aa32 monitoring: Sort by hosts_severity when sorting the host group summary by severity
refs #8241
2015-05-21 11:26:10 +02:00
Eric Lippmann b9a6e1042d Merge branch 'master' into bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241
Conflicts:
	modules/monitoring/application/controllers/ListController.php
2015-05-20 17:02:49 +02:00
Eric Lippmann f9952cf231 monitoring: Don't sort the service group summary by service severity
refs #8241
2015-05-20 16:15:38 +02:00
Eric Lippmann 2dc6d5467d monitoring: Don't select unnecessary columns in the host group summary
refs #8241
2015-05-20 16:07:49 +02:00
Eric Lippmann 5efbad3a71 monitoring: Don't sort the host group summary by service severity
refs #8241
2015-05-20 15:50:13 +02:00
Alexander A. Klimov 0b937c86dc Get columns for FilterEditor::setSearchColumns() from DataView::getSearchColumns()
refs #8241
2015-05-19 18:17:41 +02:00
Alexander A. Klimov 6ba07b089d Implement and use Hostgroupsummary and Servicegroupsummary
refs #8241
2015-05-19 18:17:40 +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
Alexander A. Klimov 36713fb519 Rename parameter $query of ::filterQuery() to $dataView
refs #8241
2015-05-19 17:36:23 +02:00
Alexander A. Klimov b1b2e3fc21 Revert "Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'"
This reverts commit 75b004dc42, reversing
changes made to bd7c7f9636.
2015-05-19 17:13:46 +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
Alexander A. Klimov a2b262eab1 Take display_name into account when searching for host and service names
refs #8241
2015-05-19 14:04:23 +02:00
Alexander A. Klimov 85dd496d35 Add parameter $searchColumns to ::filterQuery()
refs #8241
2015-05-19 14:01:18 +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 b5a0f7950e Use PHP's DateTime instead of our DateTimeFactory in the TimeLineController
I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.

refs #6778
2015-05-19 11:17:00 +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
Alexander A. Klimov d539a0e017 Add PHPDoc to ::addColumns()
refs #4498
2015-05-19 10:11:54 +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
Alexander A. Klimov 52d1cb8c8f Merge branch 'bugfix/Toggle-FeaturesCommandForm-make-notifications-more-verbose-9023'
fixes #9023
2015-05-18 16:09:07 +02:00
Alexander A. Klimov 7caba93a28 Replace `...' w/ `..'
refs #9023
2015-05-18 16:07:28 +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 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
Alexander A. Klimov 0d48ddcc06 ToggleObjectFeaturesCommandForm::onSuccess(): show a notification for each feature about whether it has been enabled or disabled
refs #9023
2015-05-18 15:18:26 +02:00
Matthias Jentsch 342a8a39d1 Fix state summary in multi views
refs #8565
2015-05-18 14:58:51 +02:00
Alexander A. Klimov 729fb9a4d1 ToggleInstanceFeaturesCommandForm::onSuccess(): notifications: show which feature has been enabled or disabled
refs #9023
2015-05-18 14:51:22 +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
Alexander A. Klimov 4fbadaea2c ToggleInstanceFeaturesCommandForm::createElements(): make form labels shorter
refs #9023
2015-05-18 14:20:17 +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 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 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
Alexander A. Klimov 58434d9743 ToggleInstanceFeaturesCommandForm::onSuccess(): show a notification for each feature about whether it has been enabled or disabled
fixes #9023
2015-05-15 17:01:28 +02:00
Alexander Fuhr 2cbcea25cb Merge branch 'feature/ido-resource-validation-9203'
fixes #9214
resolves #9203
2015-05-15 15:59:18 +02:00
Alexander Fuhr e6ba3d6470 Add descriptive message to custom validations
refs #9203
2015-05-15 15:49:57 +02:00
Johannes Meyer d0cc2ae704 ShowController: Use a default limit of 50 for an object's history listing
refs #8337
2015-05-15 15:23:49 +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
Johannes Meyer 3b7f27f614 Revert "ListController: set up sort control before paginating a query"
This reverts commit ca79b020e3.
2015-05-15 14:37:41 +02:00
Alexander Fuhr df7b56881f Add IDO instance validation
refs #9203
2015-05-15 13:06:33 +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
Alexander A. Klimov ca79b020e3 ListController: set up sort control before paginating a query 2015-05-13 14:33:48 +02:00
Alexander A. Klimov 9e4c00506d Revert "Display performance data metrics with value 0"
This reverts commit 3c73f28157.
2015-05-12 17:22:25 +02:00
Alexander A. Klimov 3c73f28157 Display performance data metrics with value 0
fixes #8744
2015-05-12 17:19:20 +02:00
Alexander A. Klimov dd58f1466c Don't apply sort rules in Monitoring_ListController::filterQuery()
refs #9220
2015-05-12 10:17:38 +02:00
Matthias Jentsch 6658415b6f Remove uneeded use statements 2015-05-11 14:40:23 +02:00
Alexander A. Klimov 152c6a8f7f Merge Monitoring_ListController::hasBetterUrl() into Icinga\Web\Controller::init()
refs #9220
2015-05-11 13:36:58 +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
Alexander Fuhr c3b4ea71d3 Add ido schema and instance availability validation
refs #9203
2015-05-11 10:32:34 +02:00
Matthias Jentsch 8c5f2662ea Fix redirects in downtime multi view
refs #8624
2015-05-07 17:33:38 +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 c6c78989a5 Fix redirects after deleting a comment
refs #8624
2015-05-07 17:02:34 +02:00
Matthias Jentsch 1fa550838d Coding guidelines and cleanup 2015-05-07 16:37:35 +02:00
Matthias Jentsch 7cf2cb034e Remove unused and redundant controller actions
refs #8624
2015-05-07 16:22:17 +02:00
Matthias Jentsch ac599e642a Add submit button label to multi comment form
refs #8624
2015-05-07 16:21:34 +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 ffd12e325c Improve up downtime command form properties
Use a flag instead of a enumeration in delete downtime command form, to remove needless boilerplate.

refs #8624
2015-05-07 14:05:16 +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 11c9cde557 Remove dashboard action from multi view
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch 3187975553 Conform to coding guidelines 2015-05-07 10:59:36 +02:00
Matthias Jentsch 1586275521 Conform to coding guidelines in downtime controller 2015-05-07 10:59:36 +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 c71786a624 Remove useless comments 2015-05-07 10:59:36 +02:00
Matthias Jentsch 6ff903c8a9 Remove useless comments 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 d316b31cbb Fix downtime removal command in detail view
Use removal command for single downtimes in detail view. Move removing single and multiple downtimees into seperate forms.

refs #8902
2015-05-07 10:34:06 +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 6ddb004230 Move removal command actions into the downtime controllers
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
Alexander Fuhr 6df031dc78 Add proper respond http codes to service and host controller
fixes #6281
2015-05-06 14:21:46 +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 Fuhr 993cb31572 Fix the permission for the toggle object feature assertion
fixes #9198
2015-05-04 14:39:12 +02:00
Alexander A. Klimov d43f4729f1 Monitoring_ListController::filterQuery(): preserve parameter `_dev'
resolves #8453
2015-04-30 17:25:59 +02:00