tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,892 Commits 121 Branches 71 Tags 80 MiB
Commit Graph

235 Commits

Author SHA1 Message Date
Johannes Meyer fda261bf22 Use case-sensitive query columns when filtering downtimes by object 
refs #8613
 2015-04-10 14:19:38 +02:00
Johannes Meyer 0fe59aa519 Revert "ContactQuery: Provide ci query columns for aliases and email addresses" 
This reverts commit f00adc2138.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
 2015-04-10 12:23:35 +02:00
Johannes Meyer f00adc2138 ContactQuery: Provide ci query columns for aliases and email addresses 
refs #8613
 2015-04-10 09:45:23 +02:00
Johannes Meyer 84a2727523 Eventhistory: Fetch object names using their columns with initial collation 
refs #8613
 2015-04-09 14:17:27 +02:00
Johannes Meyer 5372dfb7f1 Fetch a comment's author using `comment_author_name' 
refs #8613
 2015-04-09 13:07:50 +02:00
Johannes Meyer cb95f53dba CommentQuery: Fetch and display object names with their initial collation 
i.e. `host_name' instead of `comment_host' alias `host'
and `service_description' instead of `comment_service' alias `service'.

refs #8613
 2015-04-09 12:49:06 +02:00
Johannes Meyer 7d984665d6 Use `host_name' to decide whether to show a service's host or not 
`host' might match multiple hosts even if no * is being part of the filter.

refs #8613
 2015-04-09 11:12:09 +02:00
Thomas Gelf edf55728cb monitoring/list: fix addcolumns VS addColumns 
refs #8641
 2015-03-13 09:07:02 +01:00
Eric Lippmann 53626ccfeb Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 16:40:16 +01:00
Eric Lippmann 90971f2caf Revert "Merge branch 'feature/organize-headings-7976'" 
This reverts commit ea2a17a76c, reversing
changes made to e72de8dfe1.

refs #7976
fixes #8647
 2015-03-12 16:08:34 +01:00
Eric Lippmann cbf39a2d99 Use host_name and service_description columns in the downtime overview 
refs #8614
 2015-03-06 13:14:56 +01:00
Matthias Jentsch 0f3c27f812 Fix event grid for dashboard 2015-03-02 12:27:27 +01:00
Matthias Jentsch 89451f3086 Ensure that form ids are unique 
Add an unique prefix to each Form- or FormElement id, unless id protection is disabled explicitly, to prevent id collisions between different containers.

fixes #8460
 2015-02-25 18:00:28 +01:00
Johannes Meyer 956efe5ef9 Merge branch 'master' into feature/link-labels-8458 
Conflicts:
	application/views/scripts/config/application.phtml
	application/views/scripts/config/module.phtml
	application/views/scripts/config/modules.phtml
	library/Icinga/Web/Widget/Dashboard/Dashlet.php
	modules/monitoring/application/controllers/TimelineController.php
 2015-02-24 08:42:36 +01:00
Johannes Meyer 6eb638f6b3 Add proper titles to the list view's tabs 
refs #8458
 2015-02-23 17:00:30 +01:00
Marius Hein 6f2d428254 Event Grid: Add header 
refs #7976
 2015-02-23 12:24:24 +01:00
Eric Lippmann 6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +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 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 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 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 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
Carlos Cesario 311ebfbcba Add support to untranslated strings 
Add support to untranslated strings

refs #7988
 2014-12-10 10:45:57 -02:00
Thomas Gelf cddb68bffb ActionController: shift global parameters globally 2014-12-03 10:40:48 +01:00
Carlos Cesario 8d8b65473a Add translation to some strings 
Thank you Carlos.

resolves #7787

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
 2014-12-03 10:00:54 +01:00