Commit Graph

2941 Commits

Author SHA1 Message Date
Johannes Meyer 83c21f08e3 DowntimeQuery: Fix grouping
There was only one downtime for each host or service being fetched.

refs #9009
2015-06-08 18:00:54 +02:00
Johannes Meyer 75c5aab1b9 NotificationQuery: Do not use a placeholder if it's possible to select a real value
refs #9009
2015-06-08 17:23:36 +02:00
Johannes Meyer 2669d0e478 monitoring: Restrict the notification overview
refs #9009
2015-06-08 17:10:16 +02:00
Johannes Meyer 9229e460d1 NotificationQuery: Use subqueries to fetch host- and service-notifications
refs #9009
2015-06-08 17:09:24 +02:00
Johannes Meyer 70e3434f33 Introduce class ServicenotificationQuery
refs #9009
2015-06-08 17:07:55 +02:00
Johannes Meyer c0ffe4d690 Introduce class HostnotificationQuery
refs #9009
2015-06-08 17:07:34 +02:00
Alexander A. Klimov e9d308eb62 Setup: add module.info
refs #7651
2015-06-08 13:26:30 +02:00
Alexander A. Klimov 6e045b6239 Change version in modules/*/module.info to 2.0.0-rc1
refs #7651
2015-06-08 13:19:46 +02:00
Alexander A. Klimov 6a914dc25b Merge branch 'bugfix/Show-all-shell-commands-required-to-get-ready-in-the-setup-wizard-8705'
fixes #8705
2015-06-05 18:40:07 +02:00
Alexander A. Klimov 34992c2841 Merge branch 'bugfix/indicate-that-nothing-was-found-in-the-docs-when-searching-8847'
fixes #8847
2015-06-05 16:22:37 +02:00
Alexander A. Klimov 05b7c3aa6a Replace <h1> w/ <h2>
refs #8847
2015-06-05 16:01:37 +02:00
Eric Lippmann 6c07a4842b monitoring: Fix controller function fetchHostStats()
refs #9009
2015-06-05 15:50:11 +02:00
Eric Lippmann d4a884b233 monitoring: Fix filter columns of the service group summary
refs #9009
2015-06-05 15:49:48 +02:00
Eric Lippmann 382007a8bd monitoring: Add missing filter columns to the service status data view
refs #9009
2015-06-05 15:49:26 +02:00
Eric Lippmann d4b0841d4c monitoring: Add missing filter column to the host group summary view
refs #9009
2015-06-05 15:48:58 +02:00
Eric Lippmann bb711f447d monitoring: Fix restrictable filter columns of the downtime view
refs #9009
2015-06-05 15:48:37 +02:00
Eric Lippmann 6597e7aba8 monitoring: Add missing restrictable filter columns to the comment data view
refs #9009
2015-06-05 15:48:05 +02:00
Alexander A. Klimov 6dedb48444 Indicate that nothing was found in the docs when searching
refs #8847
2015-06-05 15:37:31 +02:00
Eric Lippmann 66d76e7ad9 monitoring: Add host_notes to the host status query
refs #9009
2015-06-05 15:30:49 +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 3425b71b4d monitoring: Restrict problem badges
The code should be placed somewhere else in the future.

refs #9009
2015-06-05 15:01:45 +02:00
Eric Lippmann 4dc2eb9f4a monitoring: Use soft states in the host status summary query again
refs #9009
2015-06-05 15:01:08 +02:00
Eric Lippmann 2e059a9bb7 monitoring: Use soft states in the host group summary again
refs #9009
2015-06-05 15:00:14 +02:00
Eric Lippmann dae35b9106 monitoring: Restrict host and service groups when viewing a host or service
refs #9009
2015-06-05 14:47:01 +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 d830480655 monitoring: Add missing restrictable columns to host and service comments and downtimes
refs #9009
2015-06-05 14:43:38 +02:00
Eric Lippmann 80c80436cf monitoring: Support restricting service groups of a service
refs #9009
2015-06-05 14:42:49 +02:00
Eric Lippmann bbcd6e3a2b monitoring: Support restricting host groups of a host
refs #9009
2015-06-05 14:42:11 +02:00
Eric Lippmann c735ee799c monitoring: Remove unnecessary group call in the host downtime query
refs #9009
2015-06-05 14:41:25 +02:00
Eric Lippmann 52a0ad363f monitoring: Remove unnecessary group call in the host comment query
refs #9009
2015-06-05 14:40:17 +02:00
Eric Lippmann f3b84b7ae8 monitoring: Restrict service summary when viewing a host or service
refs #9009
2015-06-05 14:14:22 +02:00
Thomas Gelf edeb24792e CSS: move monitoring styles to monitoring module 2015-06-05 12:49:07 +02:00
Eric Lippmann b7afec8f3c monitoring: Restrict the tactical overview
refs #9009
2015-06-05 12:43:24 +02:00
Eric Lippmann 45d883dcf1 monitoring: Add restrictable filter columns to the status summary
refs #9009
2015-06-05 12:42:55 +02:00
Eric Lippmann 2b3acc99e2 monitoring: Use host and service status queries in the status summary query
refs #9009
2015-06-05 12:42:27 +02:00
Thomas Gelf 6c5c153fed monitoring/css: temporarily disable header styling 2015-06-05 12:41:11 +02:00
Eric Lippmann b69b47277e monitoring: Add columns the to host status query required by the tactical overview
refs #9009
2015-06-05 12:37:29 +02:00
Eric Lippmann 99b5c7b243 monitoring: Add columns the to service status query required by the tactical overview
refs #9009
2015-06-05 12:36:56 +02:00
Eric Lippmann 55921b4854 monitoring: Fix service status query regarding handled/unhandled and using distinct
refs #9009
2015-06-05 11:49:00 +02:00
Eric Lippmann c08a98f6ac monitoring: Use grouping instead of distinct in the host status query
refs #9009
2015-06-05 11:48:33 +02:00
Eric Lippmann c993ee63b7 monitoring: Use grouping instead of distinct in the service downtime query
refs #9009
2015-06-05 11:48:03 +02:00
Eric Lippmann c3c1993870 monitoring: Use grouping instead of distinct in the service comment query
refs #9009
2015-06-05 11:47:39 +02:00
Eric Lippmann 2539e51549 monitoring: Use grouping instead of distinct in the host downtime query
refs #9009
2015-06-05 11:47:07 +02:00
Eric Lippmann 044027772d monitoring: Use grouping instead of distinct in the host comment query
refs #9009
2015-06-05 11:46:45 +02:00
Eric Lippmann 0719c294d8 monitoring: Use the service group summary query
refs #9009
2015-06-05 10:29:30 +02:00
Eric Lippmann e0b117915a monitoring: Use a sub select in the service status summary
refs #9009
2015-06-05 10:28:50 +02:00
Eric Lippmann 76e2d8f5ee monitoring: Add service_last_state_change to the service status query
refs #9009
2015-06-05 10:17:54 +02:00
Eric Lippmann 3f02197891 monitoring: Remove allowCustomVars form the host status summary query
allowCustomVars is not needed on this query because all filters are passed to the underlying query.

refs #9009
2015-06-05 10:17:07 +02:00
Eric Lippmann 480becd3d6 monitoring: Fix pagination of the host group overview
refs #9009
2015-06-05 10:16:41 +02:00
Eric Lippmann 7b176261f8 monitoring: Add query for service group summaries
refs #9009
2015-06-05 10:16:17 +02:00
Thomas Gelf c857a3de76 monitoring/css: change section title styling
* white on gray
* temporarily disabled autosubmit hint
2015-06-05 10:15:54 +02:00
Thomas Gelf a1c1ca13e9 monitoring/css: align feature commands 2015-06-05 10:06:43 +02:00
Eric Lippmann 82b0354704 monitoring: Support filtering the service group overview by custom variables
refs #9009
2015-06-05 09:16:28 +02:00
Eric Lippmann 1ea7335b96 monitoring: Support filtering the service group summary by service custom variables
refs #9009
2015-06-05 09:15:09 +02:00
Eric Lippmann c299fb3ce9 monitoring: Support filtering the host group overview by service custom variables
refs #9009
2015-06-05 09:14:26 +02:00
Eric Lippmann 28b1cf5762 monitoring: Support joining the service status query by service groups
refs #9009
2015-06-05 09:13:17 +02:00
Eric Lippmann b409609df7 monitoring: Use sub query count when joining service related tables to the host query
Fixes count problems.

refs #9009
2015-06-05 09:11:10 +02:00
Thomas Gelf 2318eaf4c3 monitoring/module.less: highlight plugin output 2015-06-03 15:35:51 +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 7ffa1b93a3 monitoring: Add service status summary data view
refs #9009
2015-06-03 14:44:16 +02:00
Eric Lippmann fc2a50a9ff monitoring: Add missing restrictable filter columns to the host status summary data view
refs #9009
2015-06-03 14:39:43 +02:00
Eric Lippmann f2f3fe2c07 monitoring: Add missing restrictable filter columns to the host status data view
refs #9009
2015-06-03 14:39:10 +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 e9308e847a monitoring: Add host status summary data view
refs #9009
2015-06-03 14:15:09 +02:00
Eric Lippmann 131af8e818 monitoring: Add host status summary query
refs #9009
2015-06-03 14:14:55 +02:00
Eric Lippmann 8e88864f4a monitoring: Fix host columns of the service status query
refs #9009
2015-06-03 12:54:51 +02:00
Eric Lippmann fe488c7b77 monitoring: Restrict the service group overview
refs #9009
2015-06-03 12:54:25 +02:00
Eric Lippmann 6588c73b4e monitoring: Add restrictable filter columns to the service group summary
refs #9009
2015-06-03 12:53:56 +02:00
Eric Lippmann a8b925e2ec monitoring: Use the service status summary query in the service groups overview
refs #9009
2015-06-03 12:48:22 +02:00
Eric Lippmann d1bb19d037 monitoring: Add service status summary query
refs #9009
2015-06-03 12:48:04 +02:00
Eric Lippmann 082f9b1edd monitoring: Don't provide unnecessary columns in the host group summary query
refs #9009
2015-06-03 12:26:01 +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 6926452268 monitoring: Add restrictable filter columns to the host group summary
refs #9009
2015-06-03 11:49:21 +02:00
Eric Lippmann 71f19b2cc6 monitoring: Add missing columns to the service status query
refs #9009
2015-06-03 11:48:34 +02:00
Eric Lippmann 761de2eb33 monitoring: Fix a join condition in the host status query
refs #9009
2015-06-03 11:48:14 +02:00
Eric Lippmann 947b5436c3 monitoring: Fix host group summary select columns
refs #9009
2015-06-03 11:41:31 +02:00
Eric Lippmann 4b2c83fbf7 monitoring: Use the host group summary query
refs #9009
2015-06-03 11:40:55 +02:00
Eric Lippmann 798f4adc34 monitoring: Add query for the host group summary
refs #9009
2015-06-03 11:40:03 +02:00
Matthias Jentsch e7a875da26 Merge branch 'bugfix/perfdata-details-hidden-8334'
fixes #8334
2015-06-02 17:51:57 +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
Johannes Meyer cd0c418854 Merge branch 'master' into feature/user-and-group-management-8826 2015-06-02 10:44:13 +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
Johannes Meyer 2490d0ae67 ConfigController: We're configuring user backends from now on
refs #8826
2015-06-02 09:58:57 +02:00
Michael Friedrich cf95994ff5 Documentation: Add config overview as first draft
refs #7153
2015-06-01 19:16:35 +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
Johannes Meyer 7b9983de38 Merge the menu entries for users, groups and roles into "Authentication" 2015-06-01 17:16:24 +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
Johannes Meyer c7ce1498bf Introduce menu entry "Configuration" 2015-06-01 16:10:23 +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
Alexander A. Klimov 6e24cfd538 Implement ::worseThan()
refs #8205
2015-05-29 18:29:45 +02:00
Alexander A. Klimov 1f36e545d9 Implement ::getState()
refs #8205
2015-05-29 17:26:56 +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 54eb0eaf22 monitoring: Add restrictable filter columns to the comment data view
refs #9009
2015-05-29 15:37:05 +02:00
Eric Lippmann 41bc4e3b21 monitoring: Provide downtime_author only as filter column
refs #9009
2015-05-29 15:36:42 +02:00
Eric Lippmann 16ab26cb7c monitoring: Remove unused alias from the downtime query
refs #9009
2015-05-29 15:36:03 +02:00
Eric Lippmann 85c21b042d monitoring: Use the host and service comment queries in the comment query
refs #9009
2015-05-29 15:35:39 +02:00
Eric Lippmann 82644b6122 monitoring: Add service comment data view
refs #9009
2015-05-29 15:35:08 +02:00
Eric Lippmann 3c15b2b972 monitoring: Add service comment query
refs #9009
2015-05-29 15:34:52 +02:00
Eric Lippmann a9680bfd68 monitoring: Add host comment data view
refs #9009
2015-05-29 15:34:38 +02:00
Eric Lippmann ebe8a409e3 monitoring: Add host comment query
refs #9009
2015-05-29 15:34:18 +02:00
Eric Lippmann bb97269c55 monitoring: Use the Hostdowntime data view in the HostList
refs #9009
2015-05-29 15:10:14 +02:00
Eric Lippmann f1bb064020 monitoring: Use the Servicedowntime data view in the ServiceList
refs #9009
2015-05-29 15:10:00 +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 0729973045 monitoring: Add last *comment columns to the host status queries 2015-05-29 15:07:06 +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 e71682ffb3 monitoring: Don't join downtimes in the servicestatus query
refs #9009
2015-05-29 13:20:01 +02:00
Eric Lippmann ba07077ca8 monitoring: Don't join downtimes in the hoststatus query
refs #9009
2015-05-29 13:13:28 +02:00
Eric Lippmann 6e94755c4c monitoring: Use host and service downtime query in the downtime query
refs #9009
2015-05-29 13:12:34 +02:00
Eric Lippmann b833a04110 monitoring: Add data view for service downtimes
refs #9009
2015-05-29 13:12:03 +02:00
Eric Lippmann 02cabf3a50 monitoring: Add query for service downtimes
refs #9009
2015-05-29 13:11:48 +02:00
Eric Lippmann 22a83b7388 monitoring: Add data view for host downtimes
refs #9009
2015-05-29 13:11:32 +02:00
Eric Lippmann 3e53426ece monitoring: Add query for host downtimes
refs #9009
2015-05-29 13:10:20 +02:00
Eric Lippmann 3a69e8185f monitoring: Add restrictable filter columns to the downtime data view
refs #9009
2015-05-29 11:44:34 +02:00
Eric Lippmann b1446fcb23 monitoring: Allow the hoststatus query to be filtered by restrictable columns
refs #9009
2015-05-29 11:43:41 +02:00
Eric Lippmann c17334deee monitoring: Support restricting the downtimes overview
refs #9009
2015-05-29 11:42:05 +02:00
Eric Lippmann 4544653c2e monitoring: Don't apply restrictions in the downtime query
Restrictions should be applied from the controller.

refs #9009
2015-05-29 11:41:39 +02:00
Eric Lippmann 7793b61e4c monitoring: Combine restrictions w/ OR
If a user has more than one filter for the same restriction, the filters will be combined w/ or. The combined filters will then be applied w/ AND to the query.

refs #9009
2015-05-29 11:40:26 +02:00
Eric Lippmann 41be32adff monitoring: Provide only the monitoring/filter/objects restriction
We'll combine the hosts and services filter restrictions into a single restriction.

refs #9009
2015-05-29 11:23:47 +02:00
Eric Lippmann 9f155ea99d monitoring: Don't show SSH command when transporting a command to a remote command file failed
refs #8006
2015-05-28 16:33:35 +02:00
Eric Lippmann a4a1a296d1 monitoring: Reduce error output when transporting a command to a local command file failed
refs #8006
2015-05-28 16:13:35 +02:00
Eric Lippmann 1a51368a76 Fix MacroTest
Pushing failing tests to the master is a mystery to me.

refs #6392
2015-05-28 16:08:21 +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 2572842aa4 Add unit test cases for the new macro syntax
refs #6392
2015-05-28 15:07:46 +02:00
Matthias Jentsch 60e5608b40 Rename ResolveMacroTest
refs #6392
2015-05-28 15:02:58 +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
Alexander Fuhr f3a37e9575 Update documentation for resources and instances
I've just only renamed the identity_key to the private_key thats it

refs #7595
2015-05-28 14:15:01 +02:00
Alexander Fuhr 49589128ef Rename identity_key with private_key in ssh resource
refs #7595
2015-05-28 14:09:13 +02:00
Johannes Meyer 58d78f59f3 DbQuery: Initialize self::$select as early as possible
I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query...
2015-05-28 13:49:36 +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
Eric Lippmann 646cffd62d monitoring: Remove the services tab when showing host or service details
refs #7998
2015-05-28 12:22:57 +02:00
Alexander Fuhr a47d05a038 Add identity key usage for a specific user in remote command
refs #7595
fixes #7447
2015-05-28 10:51:56 +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
Alexander Fuhr 9fdf2a215c Update instance documentation with the usage of a ssh resource
refs #7595
2015-05-28 10:43:30 +02:00
Eric Lippmann 344e17a605 monitoring: Fix command links when showing multiple selected hosts
fixes #9327
2015-05-28 10:33:13 +02:00
Alexander A. Klimov 38cecdb724 Setup Wizard: show how to add a system group "icingaweb2" and how to add the webserver's user to it
refs #8705
2015-05-27 11:39: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 61565543ab monitoring: Fix downtime filter columns
refs #9009
refs #9319
2015-05-26 17:10:23 +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 bb9b9bc754 monitoring: Apply host and service restrictions to downtimes
refs #9009
refs #9319
2015-05-26 17:05:47 +02:00
Eric Lippmann 788481e2b1 monitoring: Add Servicestatus query
refs #7344
refs #9009
2015-05-26 17:02:41 +02:00
Eric Lippmann 18499a4a59 monitoring: Support joining downtimes on the Hoststatus query
refs #7344
refs #9009
2015-05-26 17:02:13 +02:00
Eric Lippmann b0576d93de monitoring: Support selecting NULL as column
refs #9009
2015-05-26 17:00:56 +02:00
Eric Lippmann b24e3393f0 monitoring: Prohibit sorting the HostStatus data view by service columns
refs #7344
refs #9009
2015-05-26 17:00:48 +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 c81d13d77a monitoring: Use the HostatusQuery in the HostStatus data view
refs #7344
refs #9009
2015-05-26 17:00:34 +02:00
Eric Lippmann e9dd69267c monitoring: Prepare HoststatusQuery to be used when viewing hosts
The Hoststatusquery does not include the joins for last ack, comment and downtime as where unsure whether or not we will still support this.

refs #7344
refs #9009
2015-05-26 17:00:24 +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
Johannes Meyer ec556edc65 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-26 09:28:35 +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
Johannes Meyer 59ff4221f6 CommandTransport: Make sure to reset the config before calling current() 2015-05-22 14:01:11 +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
Johannes Meyer 265725447d Merge branch 'master' into feature/user-and-group-management-8826 2015-05-22 10:06:31 +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
Marius Hein 57abafd10b Merge branch 'master' into bugfix/customvars-case-insensitive-8696 2015-05-21 16:51:04 +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
Marius Hein 7c04664888 Make MySQL collation syntax default
Overwrite customVarsJoinTemplate for Postgres and Oracle.

refs #8696
2015-05-21 16:09:03 +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
Marius Hein e8e3b940af Use CustomVariable names case insensitive
refs #8696
2015-05-21 14:42:09 +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 57328aa6ed monitoring: Make host group and service group alias columns case insensitive
The alias columns should be case insenstive because we now support them when searching.

refs #8241
2015-05-21 13:58:54 +02:00
Eric Lippmann 0c72686ba1 monitoring: Make display_name columns case insensitive
The display_name columns should be case insenstive because we now support them when searching.

refs #8241
2015-05-21 12:46:47 +02:00
Eric Lippmann ad5ab16b3f monitoring: Drop the Groupsummary data view
We have Hostgroupsummary and Servicegroupsummary now.

refs #8241
2015-05-21 12:43:27 +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 1a1f93db23 monitoring: Add sort rules to the service group summary
refs #8241
2015-05-21 12:41:29 +02:00
Eric Lippmann e7396ea49c monitoring: Add services_severity to the service group summary data view
refs #8241
2015-05-21 12:38:58 +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 73eb8cc805 monitoring: Add sort rule for total services to the host group summary
refs #8241
2015-05-21 12:37:53 +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
Eric Lippmann 58b3192ce3 monitoring: Add sort rules to the host group summary
refs #8241
2015-05-21 12:26:27 +02:00
Eric Lippmann 195275a716 monitoring: Don't hardcode sort direction of the severity columns
fixes #9059
2015-05-21 12:20:18 +02:00
Eric Lippmann 82f9425b90 Revert "Make ascending sort by host or service severity initiatable"
This reverts commit 386d4db851.

The commit introduced the bug that changing the sort direction no longer changed the sort direction :)

refs #9059
2015-05-21 12:20:18 +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 37abc724de monitoring: Let the host group summary provide the column hosts_severity
refs #8241
2015-05-21 11:24:31 +02:00
Eric Lippmann bbed2cffae monitoring: Add column hosts_severity to the group summary query
refs #8241
2015-05-21 11:23:55 +02:00
Eric Lippmann ce463d16ef Reorder group summary query's columns by name
refs #8241
2015-05-21 11:19:58 +02:00
Eric Lippmann cfb819ec61 monitoring: Add missing column to the host group summary data view
refs #8241
2015-05-20 17:03:23 +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 80b174f526 monitoring: Servicegroupsummary must not extend Groupsummary which is subject to remove
refs #8241
2015-05-20 16:16:21 +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 a9d6a94957 monitoring: Use the groupsummary query for the service group summary view
refs #8241
2015-05-20 16:09:30 +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 d379b27c24 monitoring: Hostgroupsummary must not extend Groupsummary which is subject to remove
refs #8241
2015-05-20 15:50:19 +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
Eric Lippmann 41e72396ee monitoring: Use the groupsummary query for the host group summary view
refs #8241
2015-05-20 15:50:06 +02:00
Eric Lippmann 2493535ac7 Revert "Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery"
This reverts commit 9b4f08eb43.

There's DataView::getQueryName() for this.

refs #8241
2015-05-20 15:29:45 +02:00
Johannes Meyer 71fa736144 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-20 10:46:55 +02:00
Alexander A. Klimov 9b4f08eb43 Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery
Without this the Hostgroupsummary and Servicegroupsummary DataViews would not work

refs #8241
2015-05-20 10:43:54 +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 93db1d15cb Override ::getSearchColumns()
refs #8241
2015-05-19 18:17:40 +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 2ed1d6c66b Implement ::getSearchColumns()
refs #8241
2015-05-19 17:36:24 +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
Johannes Meyer fb07f0b94c Merge branch 'master' into feature/user-and-group-management-8826
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +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
Johannes Meyer 4cedfce07f DataView: Fix that method getOffset() calls parent::hasOffset() 2015-05-19 13:57:20 +02:00
Johannes Meyer a629adb448 DataView: Remove method paginate() 2015-05-19 13:57:20 +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