Eric Lippmann
b1f7923711
Ido: Allow custom variables to be mapped
...
If you filter by host custom variables and the query does not have the services table joined,
our query implementation calls the joinHosts method. Then, the column for the JOIN ON condition is
automatically set to h.host_object_id.
But it may be required by the query to call joinServices and use s.host_object_id instead of
h.host_object_id because the query does not use any host related table at all.
This is now possible when h.host_object_id is mapped to s.host_object_id:
class ServicesRelatedQuery
{
protected $columnMap = array(
'hosts' => array(
'h.host_object_id' => 's.host_object_id'
)
);
protected function joinHosts()
{
$this->requireVirtualTable('services');
}
}
2017-12-18 10:23:45 +01:00
lippserd
4b458fd719
Merge pull request #3214 from Icinga/bugfix/php-svg-lib-fix-missing-files
...
php-svg-lib: fix missing files
2017-12-15 11:37:49 +01:00
Alexander A. Klimov
02decd957a
php-svg-lib: fix missing files
2017-12-15 11:31:40 +01:00
lippserd
8656d27832
Merge pull request #3188 from Icinga/feature/docs-upgrading-db
...
Docs: Enhance upgrade chapter with DB update instructions
2017-12-15 10:15:36 +01:00
lippserd
83faa2671c
Merge pull request #3174 from Icinga/fix/fullscreen-layout
...
Don't discard fullscreen when detecting the layout
2017-12-15 10:13:05 +01:00
lippserd
7b4435102a
Merge pull request #3184 from Icinga/fix/session-timeout
...
JS: Always request application-state
2017-12-15 10:00:09 +01:00
lippserd
644cf0f1c3
Merge pull request #3183 from Icinga/doc/apache-fpm
...
Support basic auth on PHP-FPM
2017-12-15 09:59:50 +01:00
Michael Friedrich
402de9ff69
Docs: Enhance upgrade chapter with DB update instructions
...
Ported from the Icinga 2 docs.
fixes #3175
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-12-15 09:54:43 +01:00
lippserd
89da30f05f
Merge pull request #3209 from Icinga/bugfix/warnings-for-php-7-1-3208
...
PhpSession: conform to PHP 7.1
2017-12-15 09:22:22 +01:00
lippserd
a71037cd5a
Merge pull request #3211 from Icinga/feature/php-svg-lib-v0-3
...
Upgrade php-svg-lib to v0.3
2017-12-15 09:21:00 +01:00
Alexander A. Klimov
7e2761b277
php-svg-lib: fix interface compatibility
2017-12-14 15:12:35 +01:00
Alexander A. Klimov
4ce4ad1074
Upgrade php-svg-lib to v0.3
2017-12-14 15:12:35 +01:00
lippserd
fcd851d1e5
Merge pull request #3207 from Icinga/bugfix/markdown-doesn-t-ignore-comments-3200
...
Don't interpret shell comments inside fenced code blocks as MD headers
2017-12-14 14:46:41 +01:00
lippserd
fedf43239d
Merge pull request #3206 from Icinga/bugfix/pdf-export-error-3202
...
Upgrade dompdf to v0.8.2
2017-12-14 12:50:00 +01:00
Alexander A. Klimov
788272fad7
PhpSession: conform to PHP 7.1
...
refs #3208
2017-12-13 13:38:51 +01:00
Alexander A. Klimov
b3535481ff
Don't interpret shell comments inside fenced code blocks as MD headers
...
refs #3200
2017-12-13 13:27:15 +01:00
Alexander A. Klimov
9acc8ee7a9
Upgrade dompdf to v0.8.2
...
refs #3202
2017-12-13 11:19:45 +01:00
Eric Lippmann
cb83a7dea3
JS: Always request application-state
...
Icinga Web 2 version 2.5.0 suspends auto-refresh if the tab is inactive.
This also pauses the application-state requests which are intended to refresh the session and announcements.
If a tab is inactive for longer than the PHP session timeout (session.gc_maxlifetime in php.ini), users are automatically logged out.
With this patch Web 2 will always request application-state. Even if auto-refresh is disabled.
2017-12-04 14:25:23 +01:00
Markus Frosch
93464f5cd0
apache: Make sure to forward authentication credentials to FPM
...
This is needed for basic authentication against the Icinga Web 2 API.
2017-12-04 14:16:34 +01:00
Markus Frosch
eff3b7758c
apache: Include FPM comments in regular Apache config
2017-12-04 14:14:34 +01:00
Markus Frosch
208e49a616
Merge pull request #3172 from Icinga/fix/fpm-apache22-config
...
FPM Config: Support Apache < 2.4
2017-12-04 14:09:46 +01:00
Michael Friedrich
7641d3a373
Merge pull request #3178 from rgevaert/patch-1
...
Correct documentation about icingacli
2017-12-04 13:56:00 +01:00
Rudy Gevaert
83d5d9ee29
Correct documentation about icingacli
...
icingacli is its own package on Debian and Ubuntu too.
2017-12-03 15:26:51 +01:00
Eric Lippmann
e77c3c8169
Don't take fullscreen into account when detecting the layout
...
The fullscreen-layout class is just a layout modifier.
2017-11-29 15:12:51 +01:00
Eric Lippmann
350a3db7bf
FPM Doc: Distinct instructions for Apache versions
2017-11-29 14:32:30 +01:00
Eric Lippmann
754963ac11
Support FPM config for Apache < 2.4 generated via icingacli
2017-11-29 14:31:47 +01:00
Eric Lippmann
ae86dd2987
FPM Config: Support Apache < 2.4
2017-11-29 14:31:18 +01:00
lippserd
890013c639
Merge pull request #3166 from Icinga/fix/fpm-apache-config
...
Remove superfluous LocationMatch block from the Apache FPM config
2017-11-28 09:36:04 +01:00
Eric Lippmann
65ea398ff4
Remove superfluous LocationMatch block from the Apache FPM config
2017-11-28 09:12:51 +01:00
lippserd
ebe1917b15
Merge pull request #3164 from Icinga/prepare-v2.5.0
...
Prepare release version 2.5.0
2017-11-27 17:03:03 +01:00
lippserd
4937f30137
Merge pull request #3163 from Icinga/feature/screenshots
...
Update screenshots in README.md
2017-11-27 17:02:46 +01:00
Eric Lippmann
00974a9bf4
Update screenshots in README.md
2017-11-27 17:01:45 +01:00
Johannes Meyer
9e9b49a83e
Merge pull request #3165 from Icinga/bugfix/syslog-not-default-logging-anymore
...
setup: Don't show logging facility if webserver logging is selected
2017-11-27 17:01:24 +01:00
Alexander A. Klimov
48133aae91
Flyover: select #main instead of div#main
2017-11-27 16:51:55 +01:00
Johannes Meyer
17fa071d73
setup: Don't show logging facility if webserver logging is selected
...
Syslog used to be the default selection. Now it's the webserver log.
2017-11-27 16:43:51 +01:00
Alexander A. Klimov
59054dd01c
Collapse all expanded flyovers on any click not inside any flyover
2017-11-27 16:35:18 +01:00
Alexander A. Klimov
8afd2f8a32
Handle multiple toggles per flyover
2017-11-27 16:32:52 +01:00
Eric Lippmann
e376b137c7
Prepare release version 2.5.0
2017-11-27 16:18:13 +01:00
lippserd
fcd734ccbb
Merge pull request #3161 from Icinga/feature/doc-php-requirement
...
Document PHP version requirement
2017-11-27 16:04:49 +01:00
lippserd
33130a0419
Merge pull request #3159 from Icinga/feature/changelog-v2.5.0
...
Update ChangeLog for version 2.5.0
2017-11-27 16:04:39 +01:00
lippserd
9c3d6a3b6b
Merge pull request #3154 from Icinga/bugfix/themes-2.5.0
...
Update themes for 2.5.0
2017-11-27 16:04:24 +01:00
Eric Lippmann
d2e4967800
Document PHP version requirement
2017-11-27 15:58:58 +01:00
Johannes Meyer
0dd8390e52
Update high-contrast theme for new menu style
2017-11-27 15:51:47 +01:00
Johannes Meyer
80b0f165ac
Update winter theme for new menu style
2017-11-27 15:51:47 +01:00
Markus Frosch
9a4eb7268c
Update solarized-dark theme for new menu style
2017-11-27 15:51:47 +01:00
lippserd
bd4edfc89b
Merge pull request #3160 from Icinga/fix/sidebar-position
...
JS: Fix sidebar position
2017-11-27 15:13:45 +01:00
Eric Lippmann
47ca9bd32f
JS: Fix sidebar position
2017-11-27 15:12:15 +01:00
Eric Lippmann
ae75a8f730
Rename ChangeLog to CHANGELOG.md
2017-11-27 14:57:48 +01:00
Eric Lippmann
06b3b44727
Update ChangeLog for version 2.5.0
2017-11-27 14:57:46 +01:00
lippserd
8f1f8d4471
Merge pull request #3100 from Icinga/feature/expandable-content
...
Implement persistent "Show more" spoilers
2017-11-27 14:44:15 +01:00
