Commit Graph

863 Commits

Author SHA1 Message Date
Eric Lippmann 5bc611f772 monitoring: Use new restriction when viewing a service
refs #9009
2015-06-05 14:44:35 +02:00
Eric Lippmann 5745790cdd monitoring: Use new restriction when viewing a host
refs #9009
2015-06-05 14:44:03 +02:00
Eric Lippmann b7afec8f3c monitoring: Restrict the tactical overview
refs #9009
2015-06-05 12:43:24 +02:00
Eric Lippmann f8b49864bb monitoring: Restrict the services overview
refs #9009
2015-06-03 14:59:20 +02:00
Eric Lippmann f479ea1da8 monitoring: Restrict the service status summary
refs #9009
2015-06-03 14:44:36 +02:00
Eric Lippmann 8f111406f3 monitoring: Restrict the host overview and the host status summary
refs #9009
2015-06-03 14:16:22 +02:00
Eric Lippmann fe488c7b77 monitoring: Restrict the service group overview
refs #9009
2015-06-03 12:54:25 +02:00
Eric Lippmann 8bc9e46757 monitoring: Don't select host counts in the service group overview
We're not showing the counts.

refs #9009
2015-06-03 12:21:29 +02:00
Eric Lippmann c1c8c1c005 monitoring: Restrict the host group summary
refs #9009
2015-06-03 11:49:31 +02:00
Eric Lippmann 947b5436c3 monitoring: Fix host group summary select columns
refs #9009
2015-06-03 11:41:31 +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 42d9f05c0f monitoring: Apply host and service restrctions to the comments overview
refs #9009
2015-05-29 15:39:41 +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 2cbadbf957 Revert "monitoring: Don't select host last ack, comment and downtime"
This reverts commit e240f7b955.

refs #7344
refs #9009
2015-05-29 15:09:21 +02:00
Eric Lippmann a93ef04d5d Revert "Add new tab to switch between host and service multi-selection"
This reverts commit 45a0982beb.

Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php

The tab was removed w/ another commit I guess. This revert removes the related not yet removed crap.
2015-05-29 13:30:02 +02:00
Eric Lippmann c17334deee monitoring: Support restricting the downtimes overview
refs #9009
2015-05-29 11:42:05 +02:00
Matthias Jentsch 8309ab336d Merge branch 'feature/resolve-runtime-macros-6392'
resolves #6392
2015-05-28 15:42:16 +02:00
Matthias Jentsch c7261bd481 Add missing columns for macro expansion
refs #6392
2015-05-28 15:37:01 +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 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
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
Eric Lippmann ea8c497539 Fix exception when following command links for multiple selected hosts 2015-05-22 16:51:23 +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 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
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 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 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
Alexander A. Klimov d539a0e017 Add PHPDoc to ::addColumns()
refs #4498
2015-05-19 10:11:54 +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 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 fe2ee3617b Remove pie charts from multi-views
refs #8565
2015-05-18 13:56:35 +02:00
Marius Hein 62d8c441f8 Add ServiceActionsHook
refs #9284
2015-05-18 11:45:39 +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 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 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
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 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 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 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 cab198eadc Fix whitespaces and unused comments 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 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 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 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 A. Klimov d43f4729f1 Monitoring_ListController::filterQuery(): preserve parameter `_dev'
resolves #8453
2015-04-30 17:25:59 +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 b68fd93529 Timeline: Add dashboard action
refs #7876
2015-04-20 15:00:01 +02:00
Johannes Meyer a3eb6e37f2 Tactical overview: Add dashboard action
refs #7876
2015-04-20 14:59:54 +02:00
Johannes Meyer 48f9cf61e7 Monitoring health view: Add dashboard action
refs #7876
2015-04-20 14:59:44 +02:00
Johannes Meyer a4f08067e4 Applicationlog: : Add dashboard action
refs #7876
2015-04-20 14:59:32 +02:00
Johannes Meyer 41222fd34e Service multiselection view: Add dashboard action
refs #7876
2015-04-20 14:59:20 +02:00
Johannes Meyer 4e27ff962c Host multiselection view: Add dashboard action
refs #7876
2015-04-20 14:59:05 +02:00
Johannes Meyer 48df225f98 Alertsummary: Add dashboard action
refs #7876
2015-04-20 14:58:47 +02:00
Johannes Meyer 8b18c5a60a Fix parameters to ignore when setting a filter for the ServiceList
refs #7876
2015-04-20 13:18:36 +02:00
Johannes Meyer 4b43fbe527 Host- and Service multiselection: Ensure dashboard compliance
refs #7876
2015-04-20 13:03:13 +02:00
Johannes Meyer dbf471feac Use the helper to setup the FilterEditor widget
refs #7876
2015-04-17 16:21:14 +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 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
Johannes Meyer 675d070b86 Set the view property `compact' exactly once
refs #7876
2015-04-15 15:33:00 +02:00
Johannes Meyer 5e92171ab7 Drop the `inline' view property, as it's not used anywhere 2015-04-15 15:15:03 +02:00
Johannes Meyer 638c00d685 Merge branch 'master' into feature/non-collated-ido-queries-8613 2015-04-13 15:55:32 +02:00
Johannes Meyer 644a386bf8 NotificationQuery: Use query column `notification_contact_name'
...instead of `notification_contact'.

refs #8613
2015-04-13 15:26:06 +02:00
Johannes Meyer 15399d77ce NotificationQuery: Use query column `service_description' instead of `service'
refs #8613
2015-04-13 15:25:10 +02:00
Johannes Meyer 96954ea9a1 NotificationQuery: Use query column `host_name' instead of `host'
refs #8613
2015-04-13 15:24:15 +02:00
Johannes Meyer 24e06e5bc0 Alertsummary: Remove another bunch of redundant query columns 2015-04-13 15:15:42 +02:00
Johannes Meyer c10617d409 Servicegroups: Use query column `servicegroup_name' instead of `servicegroup'
refs #8613
2015-04-10 16:28:57 +02:00
Johannes Meyer c59d5ac7d5 Hostgroups: Use query column `hostgroup_name' instead of `hostgroup'
refs #8613
2015-04-10 16:28:33 +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 fda261bf22 Use case-sensitive query columns when filtering downtimes by object
refs #8613
2015-04-10 14:19:38 +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
Alexander A. Klimov a817d9070e Move setupSortControl() from Monitoring_ListController to Icinga\Web\Controller 2015-04-10 11:36:25 +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 3c47ba11eb monitoring/show/contact: Require `contact_name' instead of `contact'
refs #8613
2015-04-10 09:39:39 +02:00
Matthias Jentsch f4c69395b1 Add missing database columns
refs #8565
2015-04-09 17:15:26 +02:00