tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,306 Commits 121 Branches 71 Tags 80 MiB
Commit Graph

4521 Commits

Author SHA1 Message Date
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
Alexander A. Klimov 196cdbe4af Implement event history detail view 
refs #3191
 2018-01-09 13:04:06 +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
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
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
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
Eric Lippmann 754963ac11 Support FPM config for Apache < 2.4 generated via icingacli 2017-11-29 14:31:47 +01:00
Eric Lippmann e376b137c7 Prepare release version 2.5.0 2017-11-27 16:18:13 +01:00
lippserd a5bf9e0175
Merge pull request #3029 from Icinga/bugfix/empty-host-and-service-groups-not-shown-2796 
Bugfix/empty host and service groups not shown 2796
 2017-11-27 14:24:11 +01:00
Eric Lippmann ca803e8f05 Fix monitoring health badge if programstatus has never been set 2017-11-22 11:12:24 +01:00
Eric Lippmann 3db9a1d77f Fix TacticalController if/else complexity 2017-11-22 11:12:24 +01:00
Jennifer Mourek d34ea588b1 Tactical overview: Add donut graphs 2017-11-21 23:38:04 +01:00
Eric Lippmann fd0fe9a403 Monitoring: Add icons and descriptions for second level menu items 2017-11-21 22:55:46 +01:00
Thomas Gelf c786cb9b7e doc/configuration: use late translation 2017-11-21 17:42:21 +01:00
Markus Frosch 762b4eeed2 de_DE: Extend and improve translation 
refs #3067
 2017-11-21 15:47:46 +01:00
Markus Frosch 2493cb8d63 Fix incorrect uses of translation around sprintf 2017-11-21 15:47:46 +01:00
Markus Frosch 67e207f781 Add translation TestCommand for DateFormatter 
To get examples for formatted dates and times
 2017-11-21 15:47:46 +01:00
lippserd 29364be810
Merge pull request #3118 from Icinga/fix/strip-doc-img-trailing-ws-3117 
DocSectionRenderer: trim trailing image url space
 2017-11-21 14:08:32 +01:00
Johannes Meyer e4fd8d5124 Setup: Only allow to validate the API transport configuration 
refs #3101
 2017-11-21 13:48:29 +01:00
Markus Frosch 22c6bf75e7 Setup: Fix that the API transport validation does not work 
refs #3101
 2017-11-21 13:48:17 +01:00
Thomas Gelf e32023bd71 DocSectionRenderer: trim trailing image url space 
fixes #3117
 2017-11-21 12:36:53 +01:00
lippserd 5aed51b1a2
Merge pull request #3094 from Icinga/feature/requirements 
Support and documentation changes for 2.5.0
 2017-11-17 11:44:34 +01:00
Markus Frosch 0a3ab14ca4 Fix ErrorDocument prefix for the Apache webserver 2017-11-17 11:41:04 +01:00
Markus Frosch 032622a4dc php-fpm: Add config file examples and templates 2017-11-17 11:37:36 +01:00
Eric Lippmann d11519ac49 pogsql: Group by custom variables when querying them 
Custom variables added via the URL parameters addColumns or sort must be added to the GROUP BY list when using PostgreSQL.

Credits to @nbuchwitz who came up with the initial fix for this.

refs #1873
 2017-11-16 09:20:22 +01:00
Florian Strohmaier 166f27b947 CSS: Optimize monitoring status bar spacing 2017-11-13 15:02:06 +01:00
cstegm bb794d6993 Detect UP and DOWN in plugin output to colorize output 
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
 2017-11-10 11:33:52 +01:00
Klaus Jrgensen fa9b2981d7 Fix PHP fatal error on monitoring/health/info when asking for JSON 
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
 2017-11-10 11:16:33 +01:00
Eric Lippmann 928185a144 Fix wrong unhandled services count in host views when restrictions are used 
The query for fetching the unhandled services count utilises the hosts query as subquery.
Restrictions are applied to both the hosts query and the query for the unhandled services count.
This leads to wrong results since the restrictions are already in place for the unhandled services count because we're using the hosts query as subquery.

refs #2822
 2017-11-10 10:17:32 +01:00
Johannes Meyer 23066d2cc4 ServicegroupQuery: Use left joins instead of inner joins 
refs #2796
 2017-11-09 09:42:46 +01:00
Johannes Meyer 4ef085bdcd HostgroupQuery: Use left joins instead of inner joins 
refs #2796
 2017-11-09 09:42:46 +01:00
Eric Lippmann 121fdaadb0 Allow to search for host and servicegroups by their case insensitive names too 
refs #2971
 2017-11-08 15:40:43 +01:00
Eric Lippmann f4ce2a5d82 Fix code style issues 2017-11-08 11:29:33 +01:00
Eric Lippmann 73a6750489 Make phpcs and PhpStorm happy w/ intentional switch, case fall-throughs 
Unfortunately, PhpStorm does not regonise PSR2 fall-through comments.
On the other hand, phpcs does not support the @noinspection phpdoc comment (/**).
The fix is a mix of PSR2 comments and @noinspection tags in code comments.
 2017-11-08 10:25:28 +01:00
Markus Frosch 9921ebc2f8 test: Align icingacli test commands with default settings 
We cleaned the default settings for travis, the CLI commands now
use the same default.

The following issue should be fixed for issues:
https://github.com/Icinga/icinga-packaging/issues/50
 2017-11-08 10:07:37 +01:00
Markus Frosch c3ef50978a style: Fix minor styleguide issues for PHPCS 2017-11-08 10:06:45 +01:00
Markus Frosch 389b23af81 GettextTranslationHelper: Avoid descending into symlinks 
This basically avoids loops...

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
 2017-11-08 09:53:19 +01:00
Markus Frosch 43423f9453 GetTextTranslationHelper: Make sure we ignore any dotfile or vendor dir 
If you are using composer, or ship any other code in dotfile or vendor
directories, we should not parse that for translation.

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
 2017-11-08 09:53:19 +01:00
lippserd 37275ee799
Merge pull request #3034 from Icinga/bugfix/doc-module-sends-wrong-content-type-for-images-2918 
ModulesController: use setter for headers and response code
 2017-11-07 09:05:11 +01:00
lippserd 2caa07ce9b
Merge pull request #3027 from Icinga/bugfix/respect-limits-and-sort-order-for-format-requests-2967 
Respect limits and sort orders for format requests
 2017-11-06 09:51:19 +01:00
lippserd 28bd928678
Merge pull request #3052 from Icinga/fix/cli-monitoring-update-help 
Fix help for icingacli monitoring list (--unhandled is --problems, etc.)
 2017-11-06 09:49:52 +01:00
Alexander A. Klimov ee7fa2c48c Merge branch 'bugfix/wizard-ldap-connection-settings-discovery-failure-reasons-are-silented-2865' 
fixes #2865
 2017-10-26 11:14:51 +02:00
Alexander A. Klimov d13856eb39 Wizard: show LDAP connection settings discovery failure reasons 
refs #2865
 2017-10-26 10:25:37 +02:00
Jennifer Mourek 12a694787b ModuleController: Rename ETag to etag and change Response headers (imageAction) 2017-10-25 14:36:41 +02:00
Michael Friedrich 1748b3df9d Fix help for icingacli monitoring list (--unhandled is --problems, etc.) 
The help text still showed the wrong paramter, while it was not documented
as possible parameter either. In addition to that #562 unveils that a
custom --format parameter requires selected columns to do so.

This patch adds that into the documentation which is rendered as CLI command
help text then.

refs #562
 2017-10-24 21:05:39 +02:00
Johannes Meyer 37aeff7791 Respect limits and sort orders for format requests 
fixes #2967
 2017-10-23 15:49:12 +02:00
Nicolai 1cbaff76d9 Doc: Fix module name in translation example 
Changed module name from module to yourmodule according to the example description.

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
 2017-10-23 11:26:38 +02:00
tfylling 46a82c2739 Monitoring: Make downtime for all services checkbox configurable 
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
 2017-10-23 11:17:25 +02:00