Commit Graph

1858 Commits

Author SHA1 Message Date
Eric Lippmann 97d6feccb8 Data views: Expect a query instance instead of a backend 2014-05-06 18:34:01 +02:00
Eric Lippmann c23e0c3782 Remove createBackend() method from the base controller
Refering to d389d8e we'll use Backend::createBackend() for accessing monitoring backends.
2014-05-06 18:24:42 +02:00
Thomas Gelf d389d8e0f0 Re-establish Backend::createBackend
This partially reverts fcf7f7d6. The original intention was to have
no library code reading config. Moving code snippets to another lib
doesn't solve this. We need quick & easy access to a monitoring
backend, on CLI, in other modules and so forth. Duplicating so much
code again and again is not an option.

I prefer the former way of doing things unless we find a better
solution.
2014-05-06 18:23:22 +02:00
Eric Lippmann fcf7f7d6dc Replace Backend::createBackend() with Monitoring/Controller::createBackend()
Library code should not read configuration files. The new createBackend() method
from Monitoring/Controller takes care of reading backend configuration and error
handling. The Backend constructor now requires a resource instance.
2014-04-17 15:53:23 +02:00
Eric Lippmann 026145356b Add interface "QueryInterface" implementing Browsable, Fetchable, Filterable, Limitable, Sortable, Countable (WIP)
This interface is intended to be used within the data views and monitoring controllers. The monitoring list
and show controllers should only query data views instead of the actual query. Thus a data view is required to
implement the QueryInterface, which will be changed later.
The name is not final because it somehow conflicts with the Queryable interface which is also marked as work in progress.
2014-04-17 14:21:01 +02:00
Eric Lippmann e804f56d5f Data views: Rename getTableName() to getQueryName()
getQueryName is more obvious because the function returns
the name of the query the view should use for querying.
2014-04-17 13:59:11 +02:00
Eric Lippmann 62e044d888 IdoQuery: Move resolveColumns() to the columns() function
Since the BaseQuery no longer allows passing the columns to select via
its the constructor, the columns are resolved when set by the
columns() function.
2014-04-16 10:06:44 +02:00
Eric Lippmann eeadc17a6e StatusQuery: Rename baseQuery to select 2014-04-15 18:12:56 +02:00
Eric Lippmann 734c329caa StatusSummaryQuery: Rename baseQuery to select 2014-04-15 18:12:00 +02:00
Eric Lippmann 2ba1ef4793 StateHistorySummaryQuery: Rename baseQuery to select 2014-04-15 18:11:09 +02:00
Eric Lippmann a30d1cdb2f ServicegroupQuery: Rename baseQuery to select 2014-04-15 18:10:30 +02:00
Eric Lippmann ac5edc153a RuntimesummaryQuery: Rename baseQuery to select 2014-04-15 18:09:54 +02:00
Eric Lippmann 0adbb6a44e NotificationQuery: Rename baseQuery to select 2014-04-15 18:09:08 +02:00
Eric Lippmann 687fa09f7c NotificationhistoryQuery: Rename baseQuery to select 2014-04-15 18:07:34 +02:00
Eric Lippmann cb812b59a8 HoststatusQuery: Rename baseQuery to select 2014-04-15 18:06:37 +02:00
Eric Lippmann 8b471e29e5 HostgroupQuery: Rename baseQuery to select 2014-04-15 18:02:03 +02:00
Eric Lippmann 32fa7b314c GroupsummaryQuery: Rename baseQuery to select 2014-04-15 18:01:10 +02:00
Eric Lippmann 30e649eeb4 EventHistoryQuery: Rename baseQuery to select 2014-04-15 17:59:55 +02:00
Eric Lippmann 67ce376ef0 DowntimeQuery: Rename baseQuery to select 2014-04-15 17:58:06 +02:00
Eric Lippmann 64bee6a414 CustomvarQuery: Rename baseQuery to select 2014-04-15 17:57:12 +02:00
Eric Lippmann 22fa833836 ContactQuery: Rename baseQuery to select 2014-04-15 17:56:31 +02:00
Eric Lippmann c2d633ac49 ContactgroupQuery: Rename baseQuery to select 2014-04-15 17:55:13 +02:00
Eric Lippmann 5caffa78e2 CommentQuery: Rename baseQuery to select 2014-04-15 17:53:07 +02:00
Eric Lippmann 8532622fab Db: Implement missing fetch*() functions on connection level
The BaseQuery forwards fetch*() function calls to its datasource with the
query as first parameter since the datasource implements the actual fetching functionality.
There's no interface for fetch*() functions on the datasource level yet.
2014-04-15 17:44:34 +02:00
Eric Lippmann e525688383 Replace DatasourceInterface with Selectable 2014-04-15 17:43:45 +02:00
Eric Lippmann 1a2577dd47 Db/Connection: Replace getConnection() with getDpAdapter()
For readability getConnection() is deprecated in favor of getDpAdapter()
since Db/Connection is already the connection.
2014-04-15 17:37:44 +02:00
Eric Lippmann c85ade39c0 Create count and select database queries separately
The previous implementation always created both the count
and the select query.
For readability the property baseQuery has been renamed to select which the
IDO queries must take into account.
2014-04-15 17:21:10 +02:00
Eric Lippmann d94170372d Let the BaseQuery implement the query interfaces and remove filter functionality
This commit breaks the application as it introduces incompatible changes which
will be adopted bit by bit.

Since the filter functionality is subject to change it's removed from the BaseQuery.
The functions setOrderColumns() and getOrderColumns() are deprecated because they're
replaced by functions in the Sortable interface.
Further the Sortable interface now defines the sort constants ASC and DESC and are
thus removed from the BaseQuery. In addition the sort constants are no longer integers
but strings.
The distinct() and isDistinct() functions are removed because they're database specific.
They have been introduced with changes in the PivotTable implementation which should
actually not call distinct blindly anyway.
2014-04-15 16:40:25 +02:00
Eric Lippmann 659e6f774e Add interface "Queryable" (WIP)
Interface for classes which act as a data source and thus return or are a Fetchable.
The name of the interface is not yet final though.
2014-04-15 16:23:17 +02:00
Eric Lippmann 0f3d70c437 Add interface "Filterable" (WIP)
This interface is empty yet. It's meant to define how to filter a result set.
2014-04-15 16:20:11 +02:00
Eric Lippmann e5e3dc9c43 Add interface "Sortable" defining how a result set can be sorted
This interface should be used to ensure that sorting a result set
is standardized among the different query implementations.
2014-04-15 16:07:27 +02:00
Eric Lippmann 3e0d254dfd Implement "Limitable" interface for retrieving just a portion of a result set
Defines how to set a limit count and offset and should be used everywhere
where setting limit and offset is supported.
2014-04-15 15:48:51 +02:00
Eric Lippmann c083747f67 Add "Fetchable" interface for classes providing data retrieval
Classes for retrieving data must implement the Fetchable interface
which defines the usual fetch*() functions.
2014-04-15 15:40:07 +02:00
Eric Lippmann 2cc3823a95 Implement interface "Browsable" for classes providing page turning
This interface is intended to be used everywhere a Zend_Paginator
is returned within our code.
2014-04-15 15:36:13 +02:00
Johannes Meyer 139023571f Fix exception on 404 in monitoring/show/ 2014-04-09 08:44:51 +02:00
Johannes Meyer 82ca774331 Re-enable setting the current configuration when showing icingaweb/config
fixes #5972
2014-04-08 15:18:14 +02:00
Johannes Meyer 875f338824 Merge branch 'bugfix/preference-dbstore-broken-5682'
fixes #5682
2014-04-08 13:30:34 +02:00
Johannes Meyer 3195e6a897 Rewrite preference DbStore
refs #5682
2014-04-08 13:28:45 +02:00
Johannes Meyer a1649a1f22 Refactor PreferencesStore and IniStore
refs #5682
2014-04-07 15:13:28 +02:00
Johannes Meyer 6692f253fd Fix that the preference configuration does not handle defaults properly 2014-04-07 15:03:08 +02:00
Thomas Gelf 072f157064 Allow developers to disable minimizers 2014-04-07 12:04:23 +00:00
Thomas Gelf a857af60be Intendation 2014-04-07 12:03:53 +00:00
Thomas Gelf 88cdf99934 More code style 2014-04-07 12:03:53 +00:00
Johannes Meyer d658eff9b1 Add form field to set the database name for a resource of type db
fixes #5115
2014-04-07 09:55:19 +02:00
Johannes Meyer d109046bc0 Fix that the general and logging form cannot write configuration changes
fixes #5952
2014-04-07 09:27:37 +02:00
Michael Friedrich e6bb32be64 Fix division by zero in Perfdata.php
Fixes #5708

Signed-off-by: Michael Friedrich <Michael.Friedrich@netways.de>
2014-04-06 19:35:08 +02:00
Johannes Meyer ea44ae3693 Improve failure handling when setting the locale 2014-04-04 15:34:46 +02:00
Johannes Meyer 8be3ccc527 Make it possible to save the session by its associated session namespaces 2014-04-04 11:13:07 +02:00
Johannes Meyer 98b640f1e0 Fix that removed values/namespaces remain in the session storage
fixes #5934
2014-04-04 11:10:45 +02:00
Alexander Klimov 16a026194b Merge branch 'feature/logfile_reader-4514'
resolves #4514
2014-04-02 13:50:00 +02:00