Commit Graph

2560 Commits

Author SHA1 Message Date
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 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
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
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