Commit Graph

1775 Commits

Author SHA1 Message Date
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
Johannes Meyer e5f62f017f DeleteCommentCommandForm: Show a trash icon instead
The "cancel" icon is, like its name implies, supposed to abort/close
something..
2015-07-10 14:26:39 +02:00
Matthias Jentsch 39df25f043 Fix HTML detection in PluginOutput
refs #9036
2015-07-08 15:16:32 +02:00
Matthias Jentsch 604ef87de8 Merge branch 'bugfix/plugin-output-always-escaped-9036'
fixes #9036
2015-07-07 10:24:54 +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 b505101694 Comply to coding guidelines 2015-07-06 15:47:04 +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 9d2f0be24c Identify perfdata containing html markup properly
refs #9036
2015-07-06 14:43:32 +02:00
Johannes Meyer cef9b58029 InstancePage: Show missing fields
fixes #9540
2015-07-03 15:07:58 +02:00
Johannes Meyer 74a916d72a Hide feature commands which are not supported by Icinga 2 from the user
fixes #7930
2015-07-03 14:17:06 +02:00
Johannes Meyer 3e5e6ec64e ToggleInstanceFeaturesCommandForm: Only issue a command for changes 2015-07-03 13:36:24 +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 a2b7b10df8 BackendConfigForm: Validate IDO resources
fixes #9519
2015-06-29 15:51:39 +02:00
Johannes Meyer a1b336f26b IdoResourcePage: Some documentation and style fixes 2015-06-29 15:03:46 +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 20fd3d6758 Fix multiselect views of hosts and services
I've broke this with #9472.
2015-06-24 15:11:33 +02:00
Johannes Meyer b741845d54 Show missing tabs for object command forms
fixes #9477
2015-06-24 14:52:11 +02:00
Johannes Meyer 98b01207cf Show intersecting ok-states as well in the default servicegrid view
fixes #9360
2015-06-24 14:37:07 +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
Matthias Jentsch 36622101ae Use built-in php sort functions
refs #8205
2015-06-16 18:36:12 +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 4a2a17aba1 HostController: Do not permit to filter the servicesAction 2015-06-16 16:34:45 +02:00
Johannes Meyer d81e637ae9 HostController: Add action to show a host's services 2015-06-16 16:04:45 +02:00
Johannes Meyer c05594b124 ShowController: Fix link to show a host's services 2015-06-16 16:03:17 +02:00
Johannes Meyer c316e5ce8f Revert "monitoring: Remove the services tab when showing an object's history"
This reverts commit b3e0851b62.
2015-06-16 13:48:56 +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 7669fd88bc ToggleObjectFeaturesCommandForm: use h2 instead of h4 2015-06-16 01:28:38 +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
Matthias Jentsch 42de13a2b9 Merge branch 'feature/ssh-remote-connection-resource-configuration-7595'
resolves #7595
2015-06-15 17:30:42 +02:00
Johannes Meyer 4db9629268 AlertsummaryController: Apply object restrictions
refs #9009
2015-06-15 16:26:07 +02:00
Johannes Meyer 5545b4a605 AlertsummaryController: Fix filter columns 2015-06-15 16:25:48 +02:00
Johannes Meyer bd41839a19 ServicesController: Restrict the display of multiple services
refs #9009
2015-06-15 16:06:13 +02:00
Johannes Meyer ce48f63ac6 HostsController: Restrict the display of multiple hosts
refs #9009
2015-06-15 16:05:56 +02:00
Johannes Meyer ede8cc5e83 TimelineController: Restrict the displayed entries
refs #9009
2015-06-15 16:04:43 +02:00
Johannes Meyer efc52e3342 ShowController: Restrict the display of single contacts
refs #9009
2015-06-15 16:04:14 +02:00
Johannes Meyer 32c5d5a1ee ShowController: Restrict the servicestatus summary
I doubt that this is necessary, since showing hosts and services by using
this controller is deprecated, but I've added it nonetheless..

refs #9009
2015-06-15 16:03:46 +02:00
Johannes Meyer 8b749521ba DowntimesController: Restrict display of downtimes
refs #9009
2015-06-15 16:00:19 +02:00
Johannes Meyer 9a6e3a7042 DowntimeController: Restrict display of single comments
refs #9009
2015-06-15 15:59:50 +02:00
Johannes Meyer 8187135564 CommentsController: Restrict display of comments
refs #9009
2015-06-15 15:58:54 +02:00
Johannes Meyer b83abc4dbc CommentController: Restrict display of single comments
refs #9009
2015-06-15 15:58:15 +02:00
Johannes Meyer 1a08102531 ListController: Apply contactgroup restrictions after the filter editor 2015-06-15 15:14:09 +02:00
Johannes Meyer 53e6d4cadc ListController: Restrict the contactgroups view
refs #9009
2015-06-15 15:08:25 +02:00
Johannes Meyer 2fceac9771 ListController: Fix contactgroup sorting 2015-06-15 14:15:51 +02:00
Johannes Meyer aabdfec03a ListController: Restrict the contacts view
refs #9009
2015-06-15 13:48:13 +02:00
Johannes Meyer d5ade9ae74 ListController: Restrict the eventgridAction
refs #9009
2015-06-12 16:27:34 +02:00
Johannes Meyer eb93886cc7 ListController: Do not apply restrictions before the filter editor is being set up
Might cause the restrictions being shown to the user..

refs #9009
2015-06-12 14:58:20 +02:00
Johannes Meyer 4996f569fe monitoring: Ensure that views and queries are all named using the same scheme
That's "SomesuperQuery" and not "SomeSuperQuery", according to most
of the existing queries.
2015-06-12 14:42:49 +02:00
Johannes Meyer 76b17462f9 ListController: Restrict eventhistoryAction
refs 9009
2015-06-12 12:52:29 +02:00
Alexander A. Klimov a9ea6a7c9a Don't use non-existent Format::timeSince()
fixes #9400
2015-06-10 17:50:37 +02:00
Alexander A. Klimov 98b2699e35 Documentation: use command line arguments in the format --arg=<value>
refs #8472
2015-06-10 17:20:27 +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 d5dffe9a7a Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-09 09:22:50 +02:00
Johannes Meyer f2c7d5686a Timeline: Fix url used to extend the timeline 2015-06-09 09:17:15 +02:00
Johannes Meyer 2669d0e478 monitoring: Restrict the notification overview
refs #9009
2015-06-08 17:10:16 +02:00
Eric Lippmann 6c07a4842b monitoring: Fix controller function fetchHostStats()
refs #9009
2015-06-05 15:50:11 +02:00
Eric Lippmann 8cbb83d630 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-05 15:29:16 +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
Eric Lippmann 1d775842f9 monitoring: Restrict the service grid
refs #9009
2015-06-05 15:06:34 +02:00
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
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
Thomas Gelf 38a88d129c DeleteCommentCommandForm: choose another icon 2015-06-03 15:35:50 +02:00
Thomas Gelf 5b19f9474c CheckNowCommandForm: remove visible whitespace 2015-06-03 15:35:50 +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 ab129d094b remove unneeded code 2015-06-02 17:50:31 +02:00
Matthias Jentsch 198834294f Fix table position for perfdata without piecharts
refs #8334
2015-06-02 17:30:24 +02:00
Matthias Jentsch 1e8151bed3 Limit perfdata label size
Add paratentheses when perfdata label size exceeds a certain limit. Display the full label as tooltip.

refs #8334
2015-06-02 17:09:40 +02:00
Matthias Jentsch 8e35bb446a Hide columns with useless information in perfdata table
Hide columns that don't provide any useful information, to reduce the size of the perfdata table.

refs #8334
2015-06-02 16:21:55 +02:00
Matthias Jentsch a5c3782de7 Do not display columns that don't include any values
refs #8334
2015-06-02 15:20:27 +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
Alexander A. Klimov 9a141d5e3c Sort Perfdata by ::worseThan() DESC
refs #8205
2015-05-29 18:39:16 +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
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