d1917ad2b4
Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632
...
Conflicts:
modules/monitoring/application/views/scripts/service/history.phtml
2015-08-03 16:46:27 +02:00
2de761d8ec
Service History: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 16:35:17 +02:00
54590bfaf1
Host History: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 16:34:50 +02:00
8a5b5390da
Event Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 16:09:42 +02:00
f03b9e5769
Eventgrid: Use $query->hasResult() instead of $query->count()
...
* and do not use fetchAll()
* and do not use <? short tags
* and do not use curly braces if not absolutely necessary..
refs #9632
2015-08-03 16:06:21 +02:00
57e0ce1b53
Comment Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 15:49:12 +02:00
d9539b2ad1
Downtime Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 15:45:54 +02:00
6f0b51ed8f
Notification Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 15:35:17 +02:00
29fd849cca
Contact Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 15:35:07 +02:00
028342adfe
Services Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 15:24:10 +02:00
e1b3c42818
Host Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 15:22:14 +02:00
c0b82eff94
Servicegroup Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 15:18:40 +02:00
39d29c79d2
Hostgroup Overview: Use $query->hasResult() instead of $query->count()
...
refs #9632
2015-08-03 15:06:22 +02:00
688a08585b
Merge branch 'master' into bugfix/error-prone-generictts-9611
...
Conflicts:
modules/monitoring/application/views/scripts/show/components/downtime.phtml
2015-08-03 15:05:45 +02:00
d8e6418e94
monitoring: Fix code style in the show/components/downtime.phtml view script
...
refs #9611
2015-08-03 15:03:31 +02:00
0809caa86b
monitoring: Fix indent in the show/components/comments.phtml view script
...
refs #9611
2015-08-03 15:03:02 +02:00
9a0e47a3e1
SimpleQuery: Add method hasResult()
...
refs #9632
2015-08-03 14:49:33 +02:00
6a17d7cb26
Do not target next pane in multiview detail controls
...
fixes #9815
2015-08-03 13:45:47 +02:00
a63b69f4a1
components/downtime: Add downtime end time information in view
...
fixes #8845
2015-08-03 13:44:41 +02:00
8860181bcc
Revert "components/downtime: Add downtime end time information in view"
...
This reverts commit 863330e50d#8845
2015-08-03 13:42:11 +02:00
1652f1e1ae
Revert "components/downtime: Add the missing php script tag"
...
This reverts commit 95ea0e616d#8845
2015-08-03 13:41:40 +02:00
95ea0e616d
components/downtime: Add the missing php script tag
...
refs #8845
2015-08-03 13:05:41 +02:00
863330e50d
components/downtime: Add downtime end time information in view
...
fixes #8845
2015-08-03 12:37:09 +02:00
d5e2f92aa9
monitoring: Use createTicketLinks helper when showing downtimes of an object
...
refs #9611
2015-08-03 11:00:46 +02:00
a379a448d9
monitoring: Fix code style in the show/components/comments.phtml view script
...
refs #9611
2015-08-03 10:58:57 +02:00
b6caeb6c17
monitoring: Use createTicketLinks helper when showing comments of an object
...
refs #9611
2015-08-03 10:53:51 +02:00
e555e3e3b2
monitoring: Use createTicketLinks helper when showing a service's history
...
refs #9611
2015-08-03 10:44:53 +02:00
498585d8af
monitoring: Use createTicketLinks helper when showing a host's history
...
refs #9611
2015-08-03 10:43:42 +02:00
dafa722cec
Hide non-essential form fields when configuring LDAP user group backends
...
resolves #9780
2015-07-31 15:56:13 +02:00
5a3401cc28
monitoring: Reduce amount of default quick search columns
...
Entering an arbitrary pattern in the quick search field will now only search
for a host's and service's display name or a group's / contact's alias.
fixes #9751
2015-07-31 15:15:13 +02:00
60b0b4cc61
Merge branch 'master' into feature/query-limit-plus-one-9661
2015-07-31 13:57:00 +02:00
99c69cc461
SimpleQuery: Add support for peek aheads
...
refs #9661
2015-07-31 13:51:39 +02:00
f4c7fd5408
Merge branch 'bugfix/env-in-source-9615'
...
fixes #9615
2015-07-31 11:31:54 +02:00
834017f6e5
translation: Always use the correct path to the Icinga library in the translation helper
...
refs #9615
2015-07-31 11:30:26 +02:00
c5b5d3c9c3
SetupException: Provide a default exception message
2015-07-31 11:06:01 +02:00
073c61903a
DatabaseStep: Be less error-prone while calling array_search
2015-07-31 11:04:26 +02:00
7305edc74c
DbTool: Be less error-prone while calling array_search
2015-07-31 11:04:17 +02:00
b8293b1fdd
WebWizard: Be less error-prone while calling array_search
2015-07-31 11:04:00 +02:00
c32b749701
DatabaseStep: Fix schema checks
...
The step to setup the database considered any table of foreign schemas
as one of our own schema, causing it to never create our schema for
non-empty databases.
fixes #9799
2015-07-31 11:03:12 +02:00
316a4d8b82
Merge branch 'master' into bugfix/allow-to-configure-how-to-manage-groups-9609
2015-07-30 16:16:04 +02:00
c57bc30e67
AuthBackendPage: Don't crash while validating an external backend's config
2015-07-30 16:00:04 +02:00
a8415caf24
AuthenticationPage: Show the external-auth note as info form-notification
2015-07-30 15:57:06 +02:00
8d137aa575
translation: Load msgfmt path from config or default to /usr/bin/env msgfmt
...
refs #9615
2015-07-30 15:55:05 +02:00
d4c7261562
translation: Fix msgmerge default
...
refs #9615
2015-07-30 15:53:39 +02:00
c9c97f3c61
translation: Load xgettext path from config or default to /usr/bin/env xgettext
...
refs #9615
2015-07-30 15:53:13 +02:00
7160eb600a
translation: Load msgmerge path from config or default to /usr/bin/env msgmerge
...
refs #9615
2015-07-30 15:51:41 +02:00
16a964cb20
UserGroupStep: Do not produce invalid HTML
...
refs #9609
2015-07-30 15:51:07 +02:00
5ca0e981c4
UserGroupBackendPage: Ensure that all required fields exist
...
refs #9609
2015-07-30 15:49:04 +02:00
219dcdda37
translation: Set config on the translation helper
...
Installations from package will provide a config for the translation module which defines the appropriate gettext tools paths.
refs #9615
2015-07-30 15:47:35 +02:00
9cd419d330
UserGroupBackendPage: Add missing page description
...
refs #9609
2015-07-30 15:28:13 +02:00
171be7a436
AuthenticationStep: Fix that the backend type 'msldap' is shown as external
2015-07-30 15:05:19 +02:00
a234852f32
Merge branch 'feature/basic-auth-9660'
...
resolves #9660
2015-07-30 15:05:07 +02:00
87deda86be
AuthBackendPage: Fix that re-populating the chosen LDAP type has no effect
...
...
2015-07-30 14:51:51 +02:00
eb4e56fbc0
AuthenticationStep: Do not report a success if nothing has changed
2015-07-30 14:14:43 +02:00
0155599a1a
Wizard: Use <pre> instead of <textarea> for displaying the setup's log
2015-07-30 14:13:52 +02:00
81aad9d6a6
Rename Notifiation::getMessages() to popMessages()
...
Because the call to popMessages()--before getMessages()--automatically resets the notification messages on the instance, popMessages() is a much better name for the method.
refs #9660
2015-07-30 13:45:39 +02:00
f3a8981aa3
UserGroupStep: Fix c&p mistake
...
refs #9609
2015-07-30 13:31:23 +02:00
47079b723d
Wizard: Apply user group backend configuration
...
refs #9609
2015-07-30 13:22:51 +02:00
c5761243c1
Wizard: Apply initial administrative rights for groups
...
refs #9609
2015-07-30 11:35:28 +02:00
ff5142896b
AuthenticationStep: We're creating the roles.ini, ultimately
2015-07-30 09:04:33 +02:00
9858d79aaa
AdminAccountPage: Do not allow to choose a group..
...
Does not work currently :(
refs #9609
refs #9772
2015-07-29 17:18:41 +02:00
ba8d05af85
Wizard: Allow to choose a group for initial administrative access
...
refs #9609
2015-07-29 17:13:06 +02:00
226caac4f9
Wizard: Clear user group stage data on a auth backend type switch as well
...
refs #9609
2015-07-29 16:28:41 +02:00
a159e8195f
Wizard: Fix that auto-submitting a form does not have any effect
...
I already said it's a mess...
2015-07-29 16:17:14 +02:00
4cc95c91ef
AdminAccountPage: Fix user backend creation
...
Missed to adjust this as part of 83aafe8c
2015-07-29 15:07:41 +02:00
3f7081296b
Merge branch 'master' into bugfix/allow-to-configure-how-to-manage-groups-9609
2015-07-29 15:02:20 +02:00
f72304a2fa
Wizard: Allow to configure a user group backend for LDAP user backends
...
refs #9609
2015-07-29 14:44:28 +02:00
4dab67ef5b
Introduce wizard page UserGroupBackendPage
...
refs #9609
2015-07-29 14:44:09 +02:00
57bdd2686e
AuthBackendPage: Fix that the chosen LDAP type is not re-populated
2015-07-29 14:18:43 +02:00
22bcc790ef
Wizard: Prevent the width of header steps from exceeding 100% in total
2015-07-29 12:30:39 +02:00
2e8b7425a1
Make servicegroup table an action table
...
refs #8623
2015-07-29 11:41:17 +02:00
e8af4295b1
Allow to manually validate the configuration in the wizard as well
...
It's a mess...
2015-07-29 10:52:32 +02:00
83aafe8cda
Allow to discover LDAP connections in the wizard as well
...
...
2015-07-29 09:26:53 +02:00
07849e0fea
lib: Rename Authentication/Manager to Authentication/Auth
...
refs #9660
2015-07-28 17:08:55 +02:00
5c5dea616d
doc: Use Params::getRequired() in ModuleController
...
refs #9644
2015-07-28 13:59:59 +02:00
794e4a1e1e
doc: Use Params::getRequired() in IcingawebController
...
refs #9644
2015-07-28 13:59:39 +02:00
9a758f3ed9
doc: Use Controller::httpNotFound() in SearchController
...
refs #9644
2015-07-28 13:47:25 +02:00
9846dfb2e2
doc: Use Controller:httpNotFound() in ModuleController
...
refs #9644
2015-07-28 13:47:06 +02:00
7cfc78558d
Merge branch 'master' into feature/secure-modules-9644
...
Conflicts:
library/Icinga/Exception/IcingaException.php
2015-07-28 13:42:02 +02:00
0d2f73668d
Merge branch 'bugfix/non-compound-9449'
...
fixes #9449
2015-07-28 13:37:39 +02:00
a8765bc4ea
monitoring: Remove unnecessary use in StatehistoryForm
...
refs #9449
2015-07-28 13:36:51 +02:00
7df1b3aa0f
monitoring: Fix use statements in EventOverviewForm
...
refs #9449
2015-07-28 13:35:52 +02:00
0a01eb66b1
monitoring: Remove unnecessary use w/ backslash in DeleteDowntimesCommandForm
...
refs #9449
2015-07-28 13:34:39 +02:00
919c7c52cf
monitoring: Fix PHPDoc in DeleteDowntimeCommand
2015-07-28 13:33:56 +02:00
dd7d078704
monitoring: Fix PHPDoc in DeleteCommentCommand
2015-07-28 13:33:56 +02:00
5d01dca291
monitoring: Fix PHPDoc in DeleteDowntimesCommandForm
2015-07-28 13:33:56 +02:00
72c3337be8
monitoring: Use @inheritdoc in DeleteDowntimeCommandForm
2015-07-28 13:33:56 +02:00
455d2cee69
monitoring: Use @inheritdoc in DeleteCommentCommandForm
2015-07-28 13:33:56 +02:00
9bd31f70e2
monitoring: Remove unnecessary use w/ backlash in DeleteDowntimeCommandForm
...
refs #9449
2015-07-28 12:44:27 +02:00
f6ec028627
monitoring: Fix PHPDoc in DeleteCommentsCommandForm
2015-07-28 12:32:19 +02:00
36a5ec3e17
monitoring: Fix PHPDoc in CommandForm
2015-07-28 12:32:19 +02:00
901e6754eb
monitoring: Define CommandTransportInterface::send()
2015-07-28 12:32:19 +02:00
b2fb0a836f
monitoring: Move CommandTransportException to the monitoring's exception namespace
2015-07-28 12:32:19 +02:00
4536eacd66
monitoring: Rename TransportException to CommandTransportException
2015-07-28 12:32:19 +02:00
ec07da6c5e
monitoring: Remove unnecessary use w/ backlash in DeleteCommentsCommandForm
...
refs #9449
2015-07-28 11:56:48 +02:00
d850cffa42
doc: Remove unnecessary use in SearchController
...
refs #9449
2015-07-28 11:55:27 +02:00
b3f463a7a5
doc: Remove unnecessary use in ModuleController
...
refs #9449
2015-07-28 11:54:55 +02:00
e70fb76d31
doc: Remove unnecessary use in IcingawebController
...
refs #9449
2015-07-28 11:54:00 +02:00
d56b31fe5e
DataView\Eventhistory: Fix sort rules
...
refs #6644
2015-07-28 11:42:55 +02:00
247c0f3952
DataView\Customvar: Fix sort rules
...
refs #6644
2015-07-28 11:42:40 +02:00
1f6bc8ea47
DataView: Implement interface SortRules
...
refs #6644
2015-07-28 11:41:25 +02:00
07fb82357b
doc: Make documentation for all installed modules avaiable
...
Before, only documentation of enabled modules was available.
refs #9644
2015-07-27 15:19:32 +02:00
998610bafa
ProgramstatusQuery: Provide a(nother) fallback for older IDO installations
...
fixes #9168
2015-07-24 15:46:12 +02:00
2c4b6eb915
ResourceConfigForm: Replace isValid- with inspectResource()
...
refs #7588
2015-07-24 14:24:11 +02:00
b3e6b2755c
UserBackendConfigForm: Replace isValid- with inspectUserBackend()
...
refs #7588
2015-07-24 11:45:49 +02:00
56759e7f21
Merge branch 'master' into feature/ldap-auth-backend-discovery-9602
2015-07-24 10:52:14 +02:00
12856da971
Merge branch 'bugfix/filter-custom-variables-9692'
...
fixes #9692
2015-07-24 09:27:05 +02:00
0448323697
InstanceConfigForm: Translate exceptions shown to the user
2015-07-23 16:18:44 +02:00
666c401a40
BackendConfigForm: Translate exceptions shown to the user
2015-07-23 16:18:35 +02:00
4e3da3a6eb
UserBackendConfigForm: Adjust how to process requests...
...
...and use sub-forms, finally.
refs #9602
2015-07-23 16:18:09 +02:00
1d3a0f63eb
BackendConfigForm: Fix that skipping the schema validation is not possible
...
fixes #9719
2015-07-23 12:25:30 +02:00
a75b1a35c6
monitoring: Don't fail when selecting custom variables while having a group by clause
...
refs #9692
2015-07-22 13:47:52 +02:00
63c51c01e0
monitoring: Auto-refresh tactical overview every 15 seconds
...
fixes #9626
2015-07-22 13:40:50 +02:00
15cb24c6dc
Throw an exception in IdoQuery::getCustomvarColumnName() in case the custom variable has not been joined
...
Queries extending IdoQuery and using the method getCustomvarColumnName() must be notified in case the custom variable has not been joined.
refs #9692
2015-07-22 12:03:34 +02:00
3ed13366a8
Remove duplicate line in IdoQuery
...
I introduced this w/ 4522cf5090
2015-07-22 12:03:34 +02:00
163911ffd7
Indicate empty icinga_programstatus table as problem
...
fixes #9695
2015-07-21 16:47:17 +02:00
4522cf5090
Add missing return to IdoQuery::getCustomvarColumnName()
...
Some filter combinations still seem to not work properly.
refs #9692
2015-07-21 15:27:01 +02:00
47fbc24f17
Merge branch 'master' into bugfix/improve-form-notifications-8983
...
Conflicts:
library/Icinga/Web/Form.php
modules/setup/application/forms/AdminAccountPage.php
2015-07-20 15:52:10 +02:00
9a90e2a183
Wizard: Be less hysteric to not to make users upset
...
fixes #9620
2015-07-15 08:50:39 +02:00
8b4c2c459a
comments overview: Improve link titles
2015-07-13 12:51:50 +02:00
d6f756c670
downtimes overview: Improve link titles
2015-07-13 12:51:12 +02:00
c90da0378d
downtimes overview: Fix detail links
2015-07-13 12:17:00 +02:00
3db81a8d0f
downtimes-header: Do not show links with a bold font
2015-07-10 15:46:24 +02:00
d0a588ef58
downtimes-header: Do not access a non-existent property, again
...
I don't get it..
2015-07-10 15:43:07 +02:00
ac8a2d1673
downtimes-header: Show proper times for fixed downtimes not yet started
2015-07-10 15:41:42 +02:00
831581471c
downtimes/show.phtml: Drop redundant link title
...
Such a title has not any advantage as it contains the same content
as the link label.
2015-07-10 15:17:25 +02:00
3091b8cf5c
downtimes/show.phtml: Do not show an (inappropriate) icon in the title
2015-07-10 15:16:16 +02:00
52bde67653
Link: Show the link's label in its title as well
2015-07-10 15:12:56 +02:00
9ca1a6dea6
downtimes-header: Add links for hosts and services
2015-07-10 15:11:59 +02:00
4fd5c43c70
downtimes-header: Show a line-break between an object's name and..
...
..a downtime's description
2015-07-10 14:44:24 +02:00
e8f16d112d
downtimes-header: We're listing downtimes rather than showing them
2015-07-10 14:43:36 +02:00
006d2cb537
downtimes-header: Be more efficient when listing downtimes
2015-07-10 14:39:30 +02:00
bba57d2bbc
downtimes-header: Use <strong> instead of <b>
2015-07-10 14:32:08 +02:00
5ded76536e
downtimes-header: Use the correct property to access a service's name
...
Seems to me that no-one has ever selected multiple service downtimes..
2015-07-10 14:30:07 +02:00
e5f62f017f
DeleteCommentCommandForm: Show a trash icon instead
...
The "cancel" icon is, like its name implies, supposed to abort/close
something..
2015-07-10 14:26:39 +02:00
39df25f043
Fix HTML detection in PluginOutput
...
refs #9036
2015-07-08 15:16:32 +02:00
fc8b51c4be
ObjectList: Register columns to select even if we're only counting
...
We should never apply any pseudo optimizations on a higher level if
already the lower level applies them, as the optimization might not
be valid in every circumstance.
fixes #9573
2015-07-07 15:50:40 +02:00
604ef87de8
Merge branch 'bugfix/plugin-output-always-escaped-9036'
...
fixes #9036
2015-07-07 10:24:54 +02:00
4f884b1529
Revert "Don't use HTMLPurifier in list views to improve performance"
...
Performance gain turned out to be insignificant. This reverts commit 17bb725f84#9036
2015-07-07 10:17:04 +02:00
17bb725f84
Don't use HTMLPurifier in list views to improve performance
...
refs #9036
2015-07-06 17:14:36 +02:00
b505101694
Comply to coding guidelines
2015-07-06 15:47:04 +02:00
7bda4ce42b
Do not escape certain HTML markup for plugin output
...
Use specialized escape functions for plugin output that allow certain HTML formatting to be allowed.
refs #9036
2015-07-06 15:36:43 +02:00
9d2f0be24c
Identify perfdata containing html markup properly
...
refs #9036
2015-07-06 14:43:32 +02:00
107c9ff533
Wizard: Use a unordered list to show requirements instead of nested tables
...
fixes #9533
2015-07-06 13:37:37 +02:00
c8c0e13184
Wizard: Show a textarea on the finish page instead of multiple paragraphs
...
refs #7911
2015-07-03 16:31:11 +02:00
cef9b58029
InstancePage: Show missing fields
...
fixes #9540
2015-07-03 15:07:58 +02:00
74a916d72a
Hide feature commands which are not supported by Icinga 2 from the user
...
fixes #7930
2015-07-03 14:17:06 +02:00
3e5e6ec64e
ToggleInstanceFeaturesCommandForm: Only issue a command for changes
2015-07-03 13:36:24 +02:00
56c4fdf8a1
Wizard: Fix db privilege checks, again
...
The wizard were not able to verify privileges if some or even all
privileges were granted on database level causing it to grant
redundant privileges on table level.
2015-07-03 10:28:09 +02:00
3aae1acc97
WebWizard: Validate the db schema correctly
...
This was being validated successfully no matter whether the
schema actually existed or not...
2015-07-02 17:02:12 +02:00
Johannes Meyer
Eric Lippmann
Matthias Jentsch
Alexander Fuhr