Commit Graph

11412 Commits

Author SHA1 Message Date
lippserd 02391e648b
Merge pull request #3136 from Icinga/bugfix/sort-resources
/config/resource: sort resources by name
2018-01-15 09:33:17 +01:00
Alexander A. Klimov fd489f861c Merge branch 'feature/vagrant-upgrade-php-7-1-2989'
fixes #2989
2018-01-12 11:32:55 +01:00
Alexander A. Klimov 2ac605800f Install PHP 7.1 from RedHat SCL
refs #2989
2018-01-12 11:30:45 +01:00
lippserd b6ea97090a
Merge pull request #3254 from Icinga/feature/drop-icinga-gui
Puppet: don't install icinga-gui
2018-01-12 11:26:55 +01:00
Alexander A. Klimov 4e49152c9f Puppet: don't install icinga-gui 2018-01-12 10:06:51 +01:00
lippserd 44b490e4b5
Merge pull request #3224 from Icinga/bugfix/custom-menu-item-log-message-3189
Fix unneccessary log message
2018-01-11 11:43:17 +01:00
lippserd 20916509bc
Merge pull request #3222 from Icinga/Fix-typo-in-Automating-the-Installation-of-Icinga-Web-2
20-Advanced-Topics.de Fix typo
2018-01-11 11:42:16 +01:00
lippserd 6abb91421a
Merge pull request #3220 from Icinga/fix/filter-by-custom-variables
Fix filter by host custom variables
2018-01-11 11:40:22 +01:00
lippserd fe0c569b13
Merge pull request #3197 from Icinga/feature/event-history-detail-view-3191
Implement event history detail view
2018-01-11 11:39:50 +01:00
Alexander A. Klimov 196cdbe4af Implement event history detail view
refs #3191
2018-01-09 13:04:06 +01:00
Michael Friedrich 7e5f5405aa
Merge pull request #3241 from Icinga/fix/vagrant-base-box
Vagrant: Use bento base box
2018-01-03 12:14:06 +01:00
Michael Friedrich 8da7b3f0bc Vagrant: Use bento base box
fixes #3240
2018-01-03 12:10:29 +01:00
Alexander A. Klimov 0b6336c623 Separate reachability and check source info in detail views
refs #2953
2017-12-19 17:57:04 +01:00
Alexander A. Klimov a1709a0670 Fix unneccessary log message
refs #3189
2017-12-19 15:58:25 +01:00
Jennifer Mourek b32dae075c
Update 20-Advanced-Topics.md 2017-12-19 12:50:42 +01:00
Eric Lippmann 93ec798c6b Ido: Map h.host_object_id to s.host_object_id in the ServicegroupQuery
This is required to make filters work which filter by host custom variables without using any host related table.
2017-12-18 10:35:16 +01:00
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
Alexander A. Klimov 72592fcccf Merge branch 'bugfix/no-module-less-break-lesscompiler-3149'
fixes #3149
2017-12-18 10:10:13 +01:00
Alexander A. Klimov ba9d286567 Remove leading and trailing blanks from ip addresses
refs #2494
2017-12-15 13:08:14 +01:00
Alexander A. Klimov a5e75554ad Don't require module.less
refs #3149
2017-12-15 11:58:54 +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
Alexander A. Klimov 810c02a41f Url: prefer static over self 2017-12-04 10:48:52 +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