d701f9a354
monitoring/security: Guard delete downtime action
2015-02-03 16:11:29 +01:00
338d067aba
Add license header
...
fixes #7788
2015-02-03 15:51:04 +01:00
946a903a39
Merge branch 'bugfix/Improve-tooltip-descriptions-8110'
...
fixes #8110
2015-02-03 12:38:59 +01:00
dd0638c5d0
monitoring: Improve tooltips for services command links
...
refs #8110
2015-02-03 12:35:06 +01:00
31728fd024
monitoring: Improve tooltips for hosts command links
...
refs #8110
2015-02-03 12:34:22 +01:00
a705e03aff
HostController: fix merge BS
2015-02-02 18:21:01 +01:00
b54a12c2d5
HostActionsHook: document the new hook
2015-02-02 18:17:30 +01:00
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
b4c47c51e7
components/actions: show links if available
...
Now we show links regardless of whether we have host actions, there
might be hook-provided links only. Renamed "Foreign URLs" to "Actions"
and made it translatable.
2015-02-02 17:46:40 +01:00
3038de5ad0
components/actions: show host action urls if given
2015-02-02 17:46:40 +01:00
6c8808875a
host/show: show action urls above perfdata
2015-02-02 17:46:40 +01:00
67e935557e
HostController: use host actions hook
...
refs #8208
2015-02-02 17:46:39 +01:00
45bf071db6
HostActionsHook: initial very simple implementation
...
refs #8208
2015-02-02 17:44:29 +01:00
61fde8b359
monitoring: Prefix tooltips in the service groups overview with "List ..."
...
refs #8110
2015-02-02 17:29:30 +01:00
a8de3c093a
monitoring/host: Add tooltip for the unhandled services link to the link
...
refs #8110
2015-02-02 17:27:59 +01:00
2722463372
Prefix tooltips in the host groups overview with "List ..."
...
refs #8110
2015-02-02 17:06:32 +01:00
4fc8850e25
Use transplatePlural for hosts in downtime and hosts having comments tooltips
...
refs #8110
2015-02-02 16:48:13 +01:00
942d55c0d4
Merge branch 'master' into bugfix/Improve-tooltip-descriptions-8110
2015-02-02 16:37:03 +01:00
a5fe9a1fe1
Revert "Introduce link target "_right" to keep a column with tabs rightmost"
...
This reverts commit 618ab4f4b9
2015-02-02 16:34:29 +01:00
9df2430cbe
Remove redundant help message when scheduling host/service checks
2015-02-02 16:31:57 +01:00
5382f73c53
Drop all old object- and command-view scripts
2015-02-02 16:31:25 +01:00
8b377cd651
Use the new command-view scripts
2015-02-02 16:30:52 +01:00
2e99e476fe
Use the new object-view scripts
2015-02-02 16:28:35 +01:00
afa3431aed
Introduce new object- and command-view scripts
...
Represents how we plan to handle view scripts that are re-usable. Should
supersede all <action>/component/* view scripts in the upcoming future.
2015-02-02 16:26:55 +01:00
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
f9047e85c5
monitoring: Fix wrong unhandled service problems count in the hosts overview
...
The query was missing the is_active = 1 condition. I'll open an issue for the other
affected queries.
fixes #8013
2015-02-02 11:12:27 +01:00
cf944a7daf
monitoring: Show close button when removing a backend
2015-02-02 11:07:01 +01:00
a62acb4a82
monitoring: Show close button when updating a backend
2015-02-02 11:06:40 +01:00
42fe7079ee
monitoring: Show close button when creating an instance
2015-02-02 11:06:20 +01:00
cbc1a0313a
monitoring: Show close button when creating a backend
2015-02-02 11:05:50 +01:00
d7cbfebbd0
monitoring: Show close button when removing an instance
2015-02-02 11:05:32 +01:00
734c7b3546
monitoring: Show close button when updating an instance
2015-02-02 11:04:41 +01:00
f2d639108f
monitoring: Move "Service Grid" beneath "Problems"
...
The service grid is filtered by problems by default. Thus it makes sense
to move it beneath the problems section.
2015-02-02 00:08:25 +01:00
ad4ebf8fa5
monitoring: Fix that selecting a hostgroup displays its services instead of its hosts
...
fixes #8273
2015-02-01 23:30:48 +01:00
bf470125c3
Merge branch 'master' into feature/create-missing-directories-when-creating-inis-8219
...
Conflicts:
modules/monitoring/library/Monitoring/MonitoringWizard.php
2015-01-30 16:21:42 +01:00
6416fc421c
Do not create directories which are created automatically if necessary
...
refs #8219
2015-01-30 15:43:39 +01:00
e8619686ae
Add the sockets module as optional requirement of the monitoring module
2015-01-30 13:01:51 +01:00
127ce7abfe
monitoring/security: Fix that toggling instance features is always disabled
...
In HTML5 the presence of a boolean attribute on an element represents the true value,
and the absence of the attribute represents the false value.
In Zend we have to set null for the absence of the attribute and the empty string for the
presence of the attribute.
2015-01-30 10:47:02 +01:00
1681f746c1
monitoring/security: Disable toggling object features if user lacks the permission monitoring/command/feature/object
2015-01-30 10:46:24 +01:00
bdc637ff67
monitoring/security: Guard toggling object features
...
Toggling object features will only be possible if the user has the permission monitoring/command/feature/object.
2015-01-30 10:31:49 +01:00
868295110a
Merge branch 'master' into bugfix/Improve-tooltip-descriptions-8110
...
Conflicts:
modules/monitoring/application/views/scripts/hosts/show.phtml
2015-01-30 10:26:47 +01:00
35b33647cf
monitoring/security: Guard the link for disabling notifications on an instance-wide basis
...
The link in the monitoring health view will only be shown if the user has the permission monitoring/command/feature/instance.
2015-01-30 10:26:43 +01:00
3716be4a48
monitoring/security: Disable toggling instance features if user lacks the permission monitoring/command/feature/instance
2015-01-30 10:01:03 +01:00
26613a0106
monitoring/security: Rename permission monitoring/command/feature/program to monitoring/command/feature/instance
2015-01-30 09:58:30 +01:00
7dbb8c6841
monitoring/security: Require monitoring/command/feature/instance permission for toggling instance features
2015-01-30 09:58:10 +01:00
d19e36d937
monitoring/security: Require monitoring/command/feature/instance permission for disabling notifications
2015-01-30 09:57:31 +01:00
63305fdf9a
Add Icinga\Application\Config::saveIni()
...
Simplifies saving INI files. Icinga\File\Ini\IniWriter does already require an
instance of Icinga\Application\Config so it's obvious to give "Config" the
task to initialize the writer.. We do also have a central place to handle
creating missing ancestor directories now.
refs #8219
2015-01-30 09:32:08 +01:00
618ab4f4b9
Introduce link target "_right" to keep a column with tabs rightmost
...
I'd have liked to get it to work that in case the tab control is not in the
rightmost column a "go back" in the history is being simulated causing
the preceding leftmost column(s) to be restored and the rightmost one
set to the one containing the tab control. But the history api does not
seem to support any read operations except for the current state..
refs #6436
2015-01-28 14:21:06 +01:00
c19ff289bf
Open command forms in the same column where their link is located
...
refs #8279
2015-01-28 13:02:37 +01:00
6fde4eec30
Show all tabs except "Add to Dashboard" when issuing a command
...
refs #8279
2015-01-28 12:50:29 +01:00
49b82af704
monitoring/security: Apply services/filter restriction in the service detail view
2015-01-27 14:57:54 +01:00
49d4d74dbb
monitoring/security: Apply hosts/filter restriction in the host detail view
2015-01-27 14:57:22 +01:00
7bf6bd39e9
monitoring: Implement Filterable in MonitoredObject
2015-01-27 14:54:21 +01:00
e086905384
monitoring: Deprecate DataView::addFilter() and DataView::setFilter()
...
The from now on deprecated interface Filterable has proven that it sucks in the DataView.
Because of requiring us to implement trillion stupid methods, only DataView::applyFilter()
does not forget to handle column validation. Thus only DataView::applyFilter() must be used in order
to apply filters.
For setFilter() a wrapping Filter::matchAny() for the IdoQuery (or the DbQuery or the SimpleQuery I didn't have a look)
is required for the filter to work properly.
The deprecation is just for the records. I guess we do not use the other methods.
2015-01-27 14:52:13 +01:00
b2f93abb12
monitoring/security: Require a Filterable instead of a DataView in applyRestriction()
2015-01-27 14:24:56 +01:00
3cbafe16f6
monitoring/security: Move applyRestriction() to the module's base controller
2015-01-27 14:22:37 +01:00
f37cd0cb95
monitoring/security: Apply hosts restriction in the hosts overview
2015-01-27 13:51:15 +01:00
c8084dde92
monitoring/security: Apply services restriction in the services overview
2015-01-27 13:49:51 +01:00
f8aa9eb05c
monitoring/security: Replace 'monitoring/filter' restrictions with filter for the hosts and the services view
2015-01-27 13:48:33 +01:00
405e18a46f
monitoring: Fix PHPDoc for MonitoringBackend::from()
2015-01-27 13:37:28 +01:00
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
fccc2ffbcf
Hosts list: use $this->translatePlural()
2015-01-26 14:17:48 +01:00
f0784caaad
Hosts view: show object amounts in titles
2015-01-26 14:09:39 +01:00
555ab77c3d
Fix "Undefined property: stdClass::$service_display_name" in the alert summary
...
fixes #8284
2015-01-26 13:42:05 +01:00
53a4f10253
monitoring: Sort host groups and service groups by their alias
...
refs #7843
2015-01-23 15:47:18 +01:00
910065436b
monitoring: Support hostgroup_alias and servicegroup_alias filter
2015-01-23 15:47:18 +01:00
a1fbb3d937
monitoring: Fix host and service groups overviews when using PostgreSQL
...
fixes #8268
2015-01-23 15:47:18 +01:00
a07bff490f
Fix that the monitoring module's config directory is not being created
...
Forgot to re-add this when reverting a temporary change while adjusting
the module installation as part of #8191 .
2015-01-23 15:31:45 +01:00
7500dd9c68
Revert "GroupSummary/Postgres: Fix group by in initial join query"
...
This reverts commit f47bc46654
2015-01-23 15:27:52 +01:00
c78d4aa0bd
monitoring/security: Provide permissions for the feature commands
2015-01-23 13:29:47 +01:00
86ac09d7b1
monitoring: Use the service group alias for displaying service group names in the servicegroups overview
...
refs #8266
2015-01-23 11:24:39 +01:00
7e05de1255
monitoring: Select the service group alias in the servicegroups ovweview
...
refs #8266
2015-01-23 11:23:59 +01:00
9fe720e715
monitoring: Escape the service group name in the servicegroups overview
2015-01-23 11:23:42 +01:00
257186fb92
monitoring: Use hostgroup alias for displaying the host group's name in the hostgroups overview
...
refs #8266
2015-01-23 11:22:35 +01:00
42071118af
monitoring: Select hostgroup_alias in the hostgroups overview
...
refs #8266
2015-01-23 11:22:20 +01:00
30eed015ba
monitoring: Support selecting host group and service group alias in the GroupsummaryQuery
...
refs #8266
2015-01-23 11:21:29 +01:00
74a0c1e274
monitoring: Support selecting host group and service group alias in the HoststatusQuery
...
refs #8266
2015-01-23 11:21:10 +01:00
e15c085f19
monitoring: Support selecting host group and service group alias in the StatusQuery
...
refs #8266
2015-01-23 11:20:35 +01:00
b54564eb5c
monitoring: Escape the host group's name in the hostgroups overview
2015-01-23 11:20:00 +01:00
5ac1eaa513
monitoring: Fix indents in the GroupsummaryQuery
2015-01-23 11:11:34 +01:00
3cb2dd0e8b
monitoring/security: Hide 'Acknowledge' link if user lacks the respective permission
2015-01-23 11:01:47 +01:00
08e8d5d742
monitoring/security: Hide 'Process check result' link if user lacks the respective permission
2015-01-23 10:48:21 +01:00
2535d802b1
monitoring: Add missing td closing tag
2015-01-23 10:45:10 +01:00
27c1500295
monitoring: Do not translate brackets
2015-01-23 10:41:42 +01:00
a166234e6d
monitoring/security: Hide 'Reschedule check' link if user lacks the respective permission
2015-01-23 10:40:48 +01:00
af2698b075
monitoring: Do not generate 'Schedule downtime' and 'Add comment' links if user lacks the respective permissions
2015-01-23 10:15:55 +01:00
d07e1329e8
monitoring: Use nl2br instead of str_replace for downtime comment and comment text
2015-01-23 09:45:43 +01:00
f47dae1092
monitoring/security: Hide 'Schedule downtime' link if user lacks the respective permission
2015-01-23 09:43:16 +01:00
67be1b329b
monitoring/security: Hide 'Add comment' link if user lacks the respective permission
2015-01-23 09:41:06 +01:00
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
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
5967d5fe04
monitoring/security: Hide delete downtime action if user lacks the respective permission
2015-01-22 17:35:34 +01:00
a19c155d9f
monitoring/security: Hide delete comment action if user lacks the respective permission
2015-01-22 17:33:20 +01:00
4226f06d5d
monitoring: Remove unused variable in the MonitoredObjectController
2015-01-22 17:28:33 +01:00
f46a587266
monitoring/security: Hide 'Remove Problem Acknowledgement' action if user lacks the respective permission
2015-01-22 17:25:30 +01:00
a09ba15859
monitoring/security: Hide 'Check Now' action if user lacks the respective permission
2015-01-22 17:13:35 +01:00
9a59f3529c
monitoring: Group permissions by topic where it makes sense, i.e. downtime and comment
2015-01-22 16:56:00 +01:00
251030e1d8
monitoring: Rename remove-downtime to delete-downtime
2015-01-22 16:03:22 +01:00
ba7818db5f
monitoring: Restrict delete downtime and delete comment to HTTP POST
2015-01-22 15:49:40 +01:00
3d7b375ab4
Security: Require permissions for executing common service commands
2015-01-22 15:23:02 +01:00
44718e5012
Security: Require permissions for executing common host commands
2015-01-22 15:22:20 +01:00
6845480b5f
Fix that strtoupper can't handle non ascii chars
...
Fixed by not using strtoupper or by using it prior
to the translation of the corresponding string.
fixes #8163
2015-01-22 14:37:07 +01:00
78a6937c22
Drop Zend_View_Helper_MonitoringState
...
It's not required anymore... finally.
2015-01-22 14:37:07 +01:00
f4f50fde3c
monitoring: Remove _RenderServicePerfdata view helper
...
This helper is not used anywhere.
2015-01-22 14:12:02 +01:00
fecdab9463
monitoring: Provide permission for processing host and service check results
2015-01-22 13:50:55 +01:00
9c47b2d949
monitoring: Fix permission description for 'monitoring/command/schedule'
2015-01-22 13:46:32 +01:00
afd58d52bf
Merge branch 'master' into feature/more-intuitive-module-installation-8191
2015-01-22 13:33:45 +01:00
8bd56f4387
monitoring: Use the Link helper in the eventhistory overview
2015-01-22 10:58:16 +01:00
4589621f58
monitoring: Use host and service display_name for displaying host and service names for an object's history
...
refs #7843
2015-01-22 10:57:44 +01:00
1aa91f0228
monitoring: Select host and service display_name for an object's history
...
refs #7843
2015-01-22 10:57:15 +01:00
d1715c8ec6
monitoring: Escape event message in an object's event history
2015-01-22 10:45:14 +01:00
a1f4d124b4
monitoring: Prefer <br> over <br /> in components/header.phtml
2015-01-22 10:36:44 +01:00
9e5d7f43ff
monitoring: Show host_name in the detail area too if it's different from the display_name
...
refs #7843
2015-01-22 10:36:02 +01:00
3d306c0a06
monitoring: Use display_name for displaying the host name in the detail area
...
refs #7843
2015-01-22 10:35:06 +01:00
4539462bc7
monitoring: Select host_display_name in the host and service object
...
refs #7843
2015-01-22 10:34:35 +01:00
e61edaaffb
monitoring: Show service_description in the detail area too if it's different from the display_name
...
refs #7843
2015-01-22 10:30:55 +01:00
ed7dc1beb6
monitoring: Use display_name when displaying the service name in the detail area
...
refs #7843
2015-01-22 10:29:57 +01:00
98acc9166a
monitoring: Fix coding style in components/header.phtml
2015-01-22 10:24:44 +01:00
d064b0ac79
monitoring: Rename $showService to $isService in the header view script
...
Most views use $isService to set whether we are about to show a service.
2015-01-21 17:29:31 +01:00
6be0224d9d
monitoring: Add sort by 'Host' and 'Service' in the comments overview
...
refs #7843
2015-01-21 16:15:38 +01:00
3055531e2d
monitoring: Support sorting by host and service display name in the Comment data view
...
refs #7843
2015-01-21 16:15:09 +01:00
cf391b056c
monitoring: Use display_name for displaying the host and service names in the comments overview
...
refs #7843
2015-01-21 16:12:37 +01:00
e933b9174c
monitoring: Select the host and service display_name columns in the comments overview
...
refs #7843
2015-01-21 16:10:02 +01:00
94be58e121
monitoring: Support host and service display_name columns in the Comment data view
...
refs #7843
2015-01-21 16:09:36 +01:00
a91a2eba68
monitoring: Support host and service display_name columns in the CommentQuery
...
refs #7843
2015-01-21 16:09:13 +01:00
9b7e67919f
monitoring: Use host and service icons in the notifications overview
2015-01-21 15:59:20 +01:00
439052ad97
monitoring: Use the link helper in the downtimes overview
2015-01-21 15:56:58 +01:00
423e4c55a8
monitoring: Use the ellipsis view helper in the notifications overview
2015-01-21 15:52:24 +01:00
cbbd811adb
monitoring: Do not strip_tags in the notifications overview
2015-01-21 15:51:14 +01:00
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
0ceec816c6
monitoring: Use notifications default ordering when showing a contact
2015-01-21 15:49:36 +01:00
ece6bfe6bb
monitoring: Use display_name for displaying the host and service name in the notifications overview
...
refs #7843
2015-01-21 15:48:45 +01:00
846f391080
monitoring: Select the host and service display_name columns in the notifications overview
...
refs #7843
2015-01-21 15:48:04 +01:00
ad879b1ee6
monitoring: Select the host and service display_name columns in the Notification data view
...
refs #7843
2015-01-21 15:47:36 +01:00
d8b1e63231
monitoring: Support host and service display_name in the NotificationQuery
...
refs #7843
2015-01-21 15:47:10 +01:00
b05316340c
monitoring: Add Link view helper
...
Most of the monitoring overviews link to detail information, e.g. the full information of the involved monitored
object. Instead of reintroducing link generation and translation in those views, this helper contains most
frequently used jump links.
2015-01-21 15:46:41 +01:00
96390d34bf
Enable modules as part of the main installation routine
...
refs #8191
2015-01-21 15:03:34 +01:00
0bcca651b2
monitoring: Remove useless PHPDoc in the NotificationQuery
2015-01-21 13:12:26 +01:00
1f6a81aefb
Add Wizard::skipPage()
...
Required to not to duplicate code in custom wizards and to avoid errors
when detecting the direction.
refs #8191
2015-01-21 13:07:08 +01:00
7621de8ec0
monitoring: Add sort by 'Host' and 'Service' to the downtimes overview
...
refs #7843
2015-01-21 13:06:32 +01:00
91b7c31cda
monitoring: Support sorting downtimes by host and service display_name
...
refs #7843
2015-01-21 13:06:03 +01:00
5862fc98a5
monitoring: Sort by 'downtime_scheduled_start' too when sorting by 'Is In Effect'
2015-01-21 12:58:46 +01:00
d340b0d49d
monitoring: Let the data view handle the default ordering in the downtime overview
...
refs #7843
2015-01-21 12:55:41 +01:00
86cc56afe6
monitoring: Display host and service names using the display_name column in the downtimes overview
...
refs #7843
2015-01-21 12:53:47 +01:00
ab6eed03e5
monitoring: Select the host and service display_name in the downtimes overview
...
refs #7843
2015-01-21 12:53:26 +01:00
5f0b809619
monitoring: Support host and service display_name columns in the Downtime data view
...
refs #7843
2015-01-21 12:52:58 +01:00
85aa447516
monitoring: Support host and service display_name in the DowntimeQuery
...
refs #7843
2015-01-21 12:52:29 +01:00
d528ddc641
monitoring: Fix that host_display_name is NULL when the object is a service in the evenhistory overview
...
refs #7843
2015-01-21 12:51:47 +01:00
573c1046bb
Ensure that the SummaryPage has a unique name when being utilized
...
refs #8191
2015-01-21 11:44:44 +01:00
2fdeabd398
monitoring: Escape host and service name, author and comment in the downtimes overview
2015-01-21 10:47:20 +01:00
Eric Lippmann
Thomas Gelf
Johannes Meyer
Alexander Klimov