2333 Commits

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