Commit Graph

551 Commits

Author SHA1 Message Date
Eric Lippmann 5b5ad0acb9 monitoring/security: Add missing permission checks of command actions 2015-02-03 17:36:53 +01:00
Eric Lippmann 5b4fab0750 Add license header
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
Eric Lippmann 5fa2e3cfdc Revert "Add license header"
This reverts commit 338d067aba.
2015-02-03 16:16:26 +01:00
Eric Lippmann 338d067aba Add license header
fixes #7788
2015-02-03 15:51:04 +01:00
Eric Lippmann 946a903a39 Merge branch 'bugfix/Improve-tooltip-descriptions-8110'
fixes #8110
2015-02-03 12:38:59 +01:00
Eric Lippmann dd0638c5d0 monitoring: Improve tooltips for services command links
refs #8110
2015-02-03 12:35:06 +01:00
Eric Lippmann 31728fd024 monitoring: Improve tooltips for hosts command links
refs #8110
2015-02-03 12:34:22 +01:00
Thomas Gelf a705e03aff HostController: fix merge BS 2015-02-02 18:21:01 +01:00
Thomas Gelf ac7ffc757f Merge branch 'feature/hostactions-hook-8208' of git.icinga.org:icingaweb2 into feature/hostactions-hook-8208
Manually merged diverged tab activation

Conflicts:
	modules/monitoring/application/controllers/HostController.php
2015-02-02 17:48:40 +01:00
Thomas Gelf 67e935557e HostController: use host actions hook
refs #8208
2015-02-02 17:46:39 +01:00
Johannes Meyer 8b377cd651 Use the new command-view scripts 2015-02-02 16:30:52 +01:00
Eric Lippmann bfb2f710a1 monitoring: Fix exception in the alert summary report when using the "One month" interval
fixes #8220
2015-02-02 14:28:47 +01:00
Eric Lippmann d19e36d937 monitoring/security: Require monitoring/command/feature/instance permission for disabling notifications 2015-01-30 09:57:31 +01:00
Johannes Meyer 6fde4eec30 Show all tabs except "Add to Dashboard" when issuing a command
refs #8279
2015-01-28 12:50:29 +01:00
Eric Lippmann 49b82af704 monitoring/security: Apply services/filter restriction in the service detail view 2015-01-27 14:57:54 +01:00
Eric Lippmann 49d4d74dbb monitoring/security: Apply hosts/filter restriction in the host detail view 2015-01-27 14:57:22 +01:00
Eric Lippmann 3cbafe16f6 monitoring/security: Move applyRestriction() to the module's base controller 2015-01-27 14:22:37 +01:00
Eric Lippmann f37cd0cb95 monitoring/security: Apply hosts restriction in the hosts overview 2015-01-27 13:51:15 +01:00
Eric Lippmann c8084dde92 monitoring/security: Apply services restriction in the services overview 2015-01-27 13:49:51 +01:00
Eric Lippmann 08795e7cf4 monitoring/security: Expect restriction name in ListController::applyRestriction()
Before, the restriction was hard coded to 'monitoring/filter'.
This restriction will be removed because we can not use the very same filter for all views.
2015-01-27 13:33:52 +01:00
Eric Lippmann 555ab77c3d Fix "Undefined property: stdClass::$service_display_name" in the alert summary
fixes #8284
2015-01-26 13:42:05 +01:00
Eric Lippmann 53a4f10253 monitoring: Sort host groups and service groups by their alias
refs #7843
2015-01-23 15:47:18 +01:00
Eric Lippmann 7e05de1255 monitoring: Select the service group alias in the servicegroups ovweview
refs #8266
2015-01-23 11:23:59 +01:00
Eric Lippmann 42071118af monitoring: Select hostgroup_alias in the hostgroups overview
refs #8266
2015-01-23 11:22:20 +01:00
Eric Lippmann bd65f4d50a monitoring/security: Hide delete comment action in the comments overview if user lacks the respective permission 2015-01-23 09:18:29 +01:00
Eric Lippmann ac5ac10feb monitoring/security: Hide delete downtime action in the downtimes overview if user lacks the respective permission 2015-01-23 09:16:30 +01:00
Eric Lippmann 9a59f3529c monitoring: Group permissions by topic where it makes sense, i.e. downtime and comment 2015-01-22 16:56:00 +01:00
Eric Lippmann 3d7b375ab4 Security: Require permissions for executing common service commands 2015-01-22 15:23:02 +01:00
Eric Lippmann 44718e5012 Security: Require permissions for executing common host commands 2015-01-22 15:22:20 +01:00
Eric Lippmann 6be0224d9d monitoring: Add sort by 'Host' and 'Service' in the comments overview
refs #7843
2015-01-21 16:15:38 +01:00
Eric Lippmann e933b9174c monitoring: Select the host and service display_name columns in the comments overview
refs #7843
2015-01-21 16:10:02 +01:00
Eric Lippmann b6f87df90e monitoring: Select the host and service display_name column when viewing notifications for a contact
refs #7843
2015-01-21 15:50:32 +01:00
Eric Lippmann 0ceec816c6 monitoring: Use notifications default ordering when showing a contact 2015-01-21 15:49:36 +01:00
Eric Lippmann 846f391080 monitoring: Select the host and service display_name columns in the notifications overview
refs #7843
2015-01-21 15:48:04 +01:00
Eric Lippmann 7621de8ec0 monitoring: Add sort by 'Host' and 'Service' to the downtimes overview
refs #7843
2015-01-21 13:06:32 +01:00
Eric Lippmann d340b0d49d monitoring: Let the data view handle the default ordering in the downtime overview
refs #7843
2015-01-21 12:55:41 +01:00
Eric Lippmann ab6eed03e5 monitoring: Select the host and service display_name in the downtimes overview
refs #7843
2015-01-21 12:53:26 +01:00
Eric Lippmann cd03c2164a monitoring: Fix sorting by 'End Time' in the downtimes overview 2015-01-21 10:33:05 +01:00
Eric Lippmann e55cf73f34 monitoring: Select the host and service display_name columns in the eventhistory overview
refs #7843
2015-01-21 09:55:41 +01:00
Eric Lippmann 3bb5a9c702 monitoring: Select the host_display_name column in the services overview
refs #7843
2015-01-21 09:41:52 +01:00
Eric Lippmann f661713bbb monitoring: Reorder the sort by combobox in the services overview 2015-01-21 09:35:33 +01:00
Eric Lippmann a6ad5ad865 monitoring: Reorder sort column combo box in the hosts overview 2015-01-21 09:30:33 +01:00
Eric Lippmann 9d5dccc484 monitoring: Sort by display_name when sorting by 'Hostname' or 'Service Name' in the services overview
refs #7843
2015-01-21 09:22:44 +01:00
Eric Lippmann f1ada110f8 monitoring: Select the host_display_name in the hosts overview
refs #7843
2015-01-20 16:23:12 +01:00
Eric Lippmann 9fd90c90cc monitoring: Sort by host_display_name when sorting by 'Hostname' in the hosts overview
refs #7843
2015-01-20 16:22:36 +01:00
Eric Lippmann 0b557b7b29 monitoring: Fix unused local variable 'stateType' in the ListController 2015-01-20 16:14:56 +01:00
Eric Lippmann f5acd0c7b5 monitoring: Remove unused use ... in the ListController 2015-01-20 16:13:05 +01:00
Eric Lippmann ab0910e09b monitoring: Prefer 'Hostname' over 'Host name' 2015-01-20 16:12:10 +01:00
Eric Lippmann 0300a90d14 monitoring: Remove duplicate array key 'host_state' in the ListController 2015-01-20 16:08:47 +01:00
Matthias Jentsch 4dfad963e9 Merge branch 'master' into feature/improve-chart-implementation-7841 2015-01-19 15:15:24 +01:00