Matthias Jentsch
e7a875da26
Merge branch 'bugfix/perfdata-details-hidden-8334'
...
fixes #8334
2015-06-02 17:51:57 +02:00
Alexander A. Klimov
5b8de49cdf
Link to the about page
...
refs #9247
2015-06-02 17:16:27 +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
Johannes Meyer
28a28a89d3
Merge branch 'master' into feature/user-and-group-management-8826
...
Conflicts:
library/Icinga/Data/SimpleQuery.php
2015-06-02 14:54:13 +02:00
Johannes Meyer
06fb6ff6fc
SimpleQuery: Re-add method paginate but flag it as deprecated
2015-06-02 14:47:29 +02:00
Johannes Meyer
267e71f38b
User: Consider the required permission more important if it has a wildcard
...
refs #9202
2015-06-02 12:01:02 +02:00
Johannes Meyer
7213379cac
AuthBackendController: Add final indexAction
...
Required to automatically redirect to the first permitted list action.
refs #8826
2015-06-02 11:59:04 +02:00
Johannes Meyer
00c31ffd28
RolesController: Rename to RoleController
2015-06-02 11:57:13 +02:00
Johannes Meyer
cd0c418854
Merge branch 'master' into feature/user-and-group-management-8826
2015-06-02 10:44:13 +02:00
Johannes Meyer
5d50eabb44
FileReader: Mimic cursor capability
2015-06-02 10:39:49 +02:00
Johannes Meyer
ae30a62055
ConfigController: Add tab for the user group backend configuration
...
refs #8826
2015-06-02 10:23:40 +02:00
Johannes Meyer
cf96e66ff2
Rename permission config/application/roles* to config/authentication/...
...
Does also split it into *, show, add, edit, remove as this should behave like
any other authentication configuration.
refs #8826
2015-06-02 09:07:06 +02:00
Johannes Meyer
3fffd90135
Rename permission config/application/groups* to config/authentication/...
...
refs #8826
2015-06-02 09:04:34 +02:00
Johannes Meyer
a558f2873a
Rename permission config/application/users* to config/authentication/...
...
refs #8826
2015-06-02 09:02:57 +02:00
Johannes Meyer
46e2393074
UsergroupbackendController: Do only assert that the user has one permission
...
The configuration of a backend itself should not be that granular.
refs #8826
2015-06-02 08:58:21 +02:00
Eric Lippmann
44968266f6
Fix no-op searches
...
Depeding on the current filter, Filter::andFilter() may return a new filter object w/ the and filter applied or the and filter is applied to the object itself.
The FilterEditor did not make use of the return value of Filter::andFilter() thus resulting in no-op searches in some scenarios.
2015-06-01 17:22:52 +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
6661d49bd2
Use ltrim instead of a manual loop to remove trailing lines in ini writer
...
refs #8706
2015-06-01 17:00:43 +02:00
Johannes Meyer
17e7f1e754
Link the roles configuration with the user and group management
...
refs #8826
2015-06-01 16:43:11 +02:00
Johannes Meyer
66fd7dfd93
ConfigController: Rename applicationAction to generalAction
2015-06-01 16:35:27 +02:00
Johannes Meyer
49bb09d9d3
Add dedicated menu entries to manage users, groups and roles
...
refs #8826
2015-06-01 16:31:48 +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
Johannes Meyer
e936c76ca9
DbUserGroupBackend: Really clear memberships and parent relations...
...
...when removing a group.
refs #8826
2015-06-01 15:34:38 +02:00
Johannes Meyer
1385295e4e
DbUserGroupBackend: Properly handle sequences of group names
...
refs #8826
2015-06-01 15:33:35 +02:00
Johannes Meyer
62fff94808
DbUserGroupBackend: Do not try to fetch a group id for null
...
refs #8826
2015-06-01 15:16:03 +02:00
Johannes Meyer
beb5bd7370
Repository: Clone a filter implicitly in self::requireFilter($clone = true)
...
refs #8826
2015-06-01 15:03:08 +02:00
Johannes Meyer
601b720a03
LdapUserBackend: Fetch and interpret the correct attributes (OpenLDAP)
...
refs #8826
2015-06-01 14:05:44 +02:00
Johannes Meyer
d1a5321d02
LdapUserBackend: Fetch and interpret the correct attributes (ActiveDirectory)
...
refs #8826
2015-06-01 12:23:16 +02:00
Johannes Meyer
7127d5eb39
Ldap\Connection: Connect automatically in case capabilities are not set yet
2015-06-01 12:20:36 +02:00
Johannes Meyer
d097f7fe8f
Add menu entry for the user group backend configuration
...
That's definitely just a placeholder...
refs #8826
2015-05-29 16:36:05 +02:00
Johannes Meyer
c8e8a39f5a
DbRepository: Relax check in providesValueConversion()
...
Would otherwise conflict when tables are joined in.
refs #8826
2015-05-29 11:58:21 +02:00
Johannes Meyer
cc779024fe
Repository: providesValueConversion() should not be required being called
...
refs #8826
2015-05-29 11:57:38 +02:00
Johannes Meyer
b82d7d7cc0
DbRepository: split() is deprecated, use explode() instead
...
Why php, why? :'(
refs #8826
2015-05-29 11:37:42 +02:00
Johannes Meyer
3959dc27d7
Repository: Do not return filter columns when requiring all query columns
...
I really wonder why I did not notice this until now...
refs #8826
2015-05-29 11:36:08 +02:00
Johannes Meyer
a88037f45d
DbUserGroupBackend: Fetch and persist a group's id when it's name is given
...
refs #8826
2015-05-29 11:33:35 +02:00
Johannes Meyer
bb285db05b
Differentiate the source or destination of a column when converting values
...
refs #8826
2015-05-29 11:32:15 +02:00
Johannes Meyer
60ce78c958
DbUserGroupBackend: Adjust how to load the name of a group's parent
...
refs #8826
2015-05-29 08:57:49 +02:00
Johannes Meyer
c94e6a3292
Db/IniUserGroupBackend: Drop column parent_name, it's not a name anymore
...
refs #8826
2015-05-29 08:56:58 +02:00
Johannes Meyer
5e0ae6410b
DbRepository: Consider a filter column without query context as a statement column
...
Feels wrong..somehow, but it works.
refs #8826
2015-05-29 08:02:12 +02:00
Johannes Meyer
32b99be8ab
DbUserGroupBackend: Adjust to fit the new database schema
...
refs #8826
2015-05-28 15:22:15 +02:00
Johannes Meyer
fd931e4232
RepositoryQuery: getQuery() might be called during prepareQueryColumns()
2015-05-28 14:26:48 +02:00
Johannes Meyer
08f8fe6f49
DbRepository: Add support for joining tables based on query/filter columns
...
refs #8826
2015-05-28 13:53:49 +02:00
Johannes Meyer
119b2fdddb
DbQuery: Allow to join additional tables
...
This should just be the beginning of such additions, there is still a group(),
distinct(), etc missing..
2015-05-28 13:52:00 +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
Johannes Meyer
5326ce6bca
DbRepository: Add support for table specific aliases
...
This was previously only possible for the base table and in case one wanted
to use table aliases in the query column definition for non-base tables as
well, it did not work well due to not being explicitly supported. Now, to use
such table aliases one must initialize DbRepository::tableAliases.
refs #8826
2015-05-28 13:44:51 +02:00
Johannes Meyer
647dd9d425
RepositoryQuery: Pass through the query when requiring a table or column
...
This allows now to adjust the query in custom repository implementations.
refs #8826
2015-05-28 13:25:26 +02:00
Eric Lippmann
31400ea16a
monitoring: Fix that searching for specific columns is no longer possible if default search columns are set
2015-05-28 13:17:00 +02:00
Alexander Fuhr
bf21f55656
Add a new ssh resource form
...
refs #7595
2015-05-28 10:44:58 +02:00
Alexander A. Klimov
cba36ec017
Ignore the preferences' loadability during authentication
...
fixes #8956
2015-05-27 15:13:53 +02:00
Johannes Meyer
23b7ab0764
DbRepository: Remove COLLATE from a query column in case of a pgsql connection
...
refs #8826
2015-05-27 11:47:18 +02:00
Johannes Meyer
8713f59e66
AuthBackendController: Only show tabs the user is permitted to view
...
refs #8826
2015-05-27 10:38:35 +02:00
Alexander A. Klimov
b842a39650
Implement ::getLinuxDistro()
...
refs #8705
2015-05-26 18:23:26 +02:00
Johannes Meyer
237b50f953
RepositoryQuery: Ensure that we'll adjust a copy of a filter
2015-05-26 14:32:47 +02:00
Johannes Meyer
20f0b46574
Introduce class AuthBackendController
...
refs #8826
2015-05-26 10:11:40 +02:00
Johannes Meyer
ec556edc65
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-26 09:28:35 +02:00
Johannes Meyer
54354b17bf
DbConnection: Replicate the fix for #9211
2015-05-26 09:26:55 +02:00
rbelinsky
b0f7773260
lib: Fix sprintf format strings used in Format::seconds()
...
fixes #9291
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-05-22 16:06:11 +02:00
Johannes Meyer
4f0b4e55ef
ErrorLabeller: Use an element's name if no label is set
2015-05-22 14:01:26 +02:00
Eric Lippmann
83a6e85b5d
lib: Don't render empty filters to SQL
...
Else we are presented with syntax errors.
fixes #9211
2015-05-22 13:53:57 +02:00
Eric Lippmann
53ca68903a
Merge branch 'bugfix/time-formatting-6778'
...
fixes #6778
2015-05-22 11:34:43 +02:00
Eric Lippmann
3fced8472b
lib: Remove unused function from our format util
...
refs #6778
2015-05-22 10:27:50 +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
de9be044b3
lib: Provide formatDuration() in our views
...
refs #6778
2015-05-22 10:04:00 +02:00
Eric Lippmann
edd386e14b
lib: Add DateFormatter::formatDuration()
...
refs #6778
2015-05-22 09:49:06 +02:00
Eric Lippmann
dd298edb81
lib: Only invert relative partial times if necessary
...
refs #6778
2015-05-22 09:33:51 +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
d2bb74a2f9
lib: Move HttpNotFoundException beneath the Http Exception namespace
...
refs #6281
2015-05-22 09:25:49 +02:00
Eric Lippmann
71a2324cb9
lib: Let Controller::assertHttpMethod() throw a HttpMethodNotAllowedException
...
refs #6281
2015-05-22 09:12:42 +02:00
Eric Lippmann
fde60f4a00
lib: Add HttpMethodNotAllowedException
...
At the moment we throw a Zend_Controller_Action_Exception when the HTTP method is not allowed.
I'll replace this w/ the exception introduced.
refs #6281
2015-05-21 17:19:07 +02:00
Eric Lippmann
fcd7aaef87
lib: Add HttpException as base class for HTTP exceptions
...
refs #6281
2015-05-21 17:18:29 +02:00
Eric Lippmann
dd1025119d
Throw HttpNotFoundException on Controller::httpNotFound()
...
refs #6281
2015-05-21 16:54:00 +02:00
Eric Lippmann
c4ed49cb1a
lib: Add HttpNotFoundException
...
The HttpNotFoundException should be used for sending a HTTP 404 response w/ a custom message.
There's also Zend_Controller_Action_Exception but this exception will always show 'Page not found' because we
want to hide messages generated by Zend, like 'Action "foobar" does not exist and was not trapped in __call()'.
refs #6281
2015-05-21 16:43:58 +02:00
Johannes Meyer
fac2ebce80
RepositoryQuery: Fix handling of queries returning no results in fetchColumn()
...
refs #8826
2015-05-21 15:02:56 +02:00
Johannes Meyer
4833ff109c
RepositoryQuery: Validate the table passed when calling from()
...
refs #8826
2015-05-21 15:01:13 +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
0002c0be26
Provide default config name for Module::getConfig()
2015-05-21 14:40:52 +02:00
Eric Lippmann
c47465a732
lib/filter: Fix check against unset search columns
...
refs #8241
2015-05-21 14:04:04 +02:00
Johannes Meyer
10b158a182
LdapUserBackend: Fix sorting when sorting by user_name
...
refs #8826
2015-05-21 13:53:27 +02:00
Johannes Meyer
4d79731646
DbUserBackend: Fix sorting when sorting by user_name
...
refs #8826
2015-05-21 13:53:18 +02:00
Johannes Meyer
ba31be9695
RepositoryQuery: Disim.. Fix sort order handling
...
refs #8826
2015-05-21 13:52:43 +02:00
Johannes Meyer
9278d708d7
IniUserGroupBackend: Do not sort by parent when sorting by group_name
...
refs #8826
2015-05-21 13:51:24 +02:00
Johannes Meyer
6369643145
DbUserGroupBackend: Do not sort by parent when sorting by group_name
...
refs #8826
2015-05-21 13:51:15 +02:00
Eric Lippmann
970d4d7a4a
Fix that time-until doesn't show negative partial time in the dashboard
...
refs #6778
2015-05-21 10:19:07 +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
Johannes Meyer
0dda19dc7a
DbRepository: Remove the table prefix when resolving statement columns
...
refs #8826
2015-05-20 11:50:09 +02:00
Johannes Meyer
71fa736144
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-20 10:46:55 +02:00
Eric Lippmann
902c00e836
lib: Introduce Controller::httpNotFound()
...
Many actions require loading specific objects from database or any other storage.
If the object isn't found, Controller::httpNotFound($message) should be used
for immediately returning w/ HTTP 404.
2015-05-20 10:30:01 +02:00
Eric Lippmann
338fad5da9
cli: Add Params::shiftRequired()
2015-05-20 10:30:00 +02:00
Eric Lippmann
ccaebd1d73
cli: Rename Params::req() to ::getRequired()
2015-05-20 10:30:00 +02:00
Eric Lippmann
3d1c3609c0
lib: Add UrlParams::shiftRequired()
2015-05-20 10:30:00 +02:00
Eric Lippmann
3a2238f737
Rename UrlParams::req() to ::getRequired()
...
req() seems mysterious :)
2015-05-20 10:30:00 +02:00
Johannes Meyer
093857641a
DbConnection: Cast a queries count to integer forcefully
2015-05-20 09:30:23 +02:00
Johannes Meyer
a3d5cfc28a
RepositoryQuery: Properly handle queries returning no results
...
refs #8826
2015-05-20 09:11:46 +02:00
Alexander A. Klimov
cc050ed696
Display an error notification rather than throwing an exception
...
refs #8241
2015-05-19 17:36:24 +02:00
Alexander A. Klimov
3243f9a65a
Don't handle the case $this->searchColumns === null for actions in which ::setSearchColumns() is called
...
refs #8241
2015-05-19 17:36:23 +02:00
Eric Lippmann
2715e8ed2b
Revert "Set default locale for the intl extension upon locale detection"
...
This reverts commit 06830e035e
.
We don't use the intl extension at the moment.
refs #6778
2015-05-19 16:21:57 +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
Johannes Meyer
bd7c7f9636
Introduce widget Paginator
...
This does not support custom scrolling styles as of now. Custom view
scripts are supported though. In case Paginator::getPages() does not
suffice, feel free to improve this.
2015-05-19 13:57:21 +02:00
Johannes Meyer
73e8c51fd1
Ldap\Query: Remove method paginate()
2015-05-19 13:57:20 +02:00