Commit Graph

4667 Commits

Author SHA1 Message Date
Eric Lippmann 303637df3c
Merge pull request #3452 from Icinga/feature/drop-php-lt-56-support
Drop support for PHP < 5.6
2018-07-09 09:18:18 +02:00
Carsten Koebke 55072ac840 Render multiline in custom variables correct
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2018-07-04 15:28:38 +02:00
Eric Lippmann 8990d6f46e Drop support for PHP < 5.6 2018-07-03 13:11:36 +02:00
Alexander A. Klimov 6da5d4173e icingacli test php unit: include the tests of all installed modules
refs #3494
2018-06-28 16:05:18 +02:00
Alexander A. Klimov fd239fa40c Separate framework and modules tests logically
refs #3494
2018-06-28 14:26:37 +02:00
Eric Lippmann d19d888d9e
Merge pull request #3458 from Icinga/feature/host-and-service-group-grid-1017
Host- and servicegroup grid
2018-06-28 11:40:52 +02:00
Eric Lippmann 88c2fe44e3 Link from the host and service group lists to their grids and vice versa
refs #1017
2018-06-28 11:27:46 +02:00
Johannes Meyer 61103ae359 monitoring/list: Introduce action servicegroup-grid
refs #1017
2018-06-28 11:27:45 +02:00
Johannes Meyer 917827a87b monitoring/list: Introduce action hostgroup-grid
refs #1017
2018-06-28 11:27:45 +02:00
Eric Lippmann 74d1c78465 Respect persistent when acknowledging over API
refs #3467
2018-06-27 09:47:08 +02:00
Alexander A. Klimov 906c1668a4 Split Json::encode() into Json::encode() and Json::sanitize()
refs #2635
2018-06-21 16:01:53 +02:00
Alexander A. Klimov 02b60633ff Auto-sanitize only in the monitoring module
refs #2635
2018-06-20 18:05:12 +02:00
Alexander A. Klimov 1a94a21263 Prefer Json::encode() over json_encode()
refs #2635
2018-06-20 18:05:11 +02:00
Eric Lippmann 23248a4f3b
Merge pull request #3325 from Icinga/bugfix/unreachable-pdf-export-documentation-1716
Doc: make PDF export action reachable
2018-06-08 08:42:49 -04:00
Eric Lippmann 96303f53f8
Merge pull request #3213 from Icinga/feature/drop-php-5-3-support
Drop PHP 5.3 support
2018-05-08 03:03:36 -04:00
Eric Lippmann 8a4ae535aa
Merge pull request #3449 from Icinga/feature/flippable-service-grid-axes-2640
Flippable service grid axes
2018-05-08 02:57:25 -04:00
Eric Lippmann ca895fd5e9
Merge pull request #3451 from Icinga/feature/interpret-performance-data-threshold-ranges-8194
Interpret performance data threshold ranges
2018-05-08 02:56:36 -04:00
Johannes Meyer 9b76ff5539 servicegrid: Properly handle `?flipped=0`
refs #2640
2018-05-07 14:14:34 +02:00
Johannes Meyer bb37d7e2f9 Introduce test ThresholdRangeTest
refs #1298
2018-05-07 14:01:39 +02:00
Alexander A. Klimov fc1f6e13ab Drop PHP 5.3 support 2018-05-07 11:36:54 +02:00
Eric Lippmann 4b7dc0c350
Merge pull request #3392 from Mikesch-mp/list-notifications
Always show full date + time on history list for notifications
2018-05-07 04:39:21 -04:00
Eric Lippmann e74b1fc5eb
Merge pull request #3440 from Icinga/feature/secure-detailviewextensionhook-gethtmlforobject-3393
Secure DetailviewExtensionHook::getHtmlForObject()
2018-05-07 04:19:32 -04:00
Eric Lippmann 60295f3407
Merge pull request #3443 from Icinga/fix/search-over-customvars-results-in-sql-error-2508
Fix search over customvars results in sql error 2508
2018-05-07 04:18:22 -04:00
Johannes Meyer 273b0f2f94 PerfdataTest: Update case which explicitly checks thresholds for null
It's not important whether null or not, as long as it properly detects
that no threshold is set. Further tests specifically for ThresholdRange
should accommodate this case by verifying we don't detect any WARNING.

refs #1298
2018-05-03 16:07:30 +02:00
Alexander A. Klimov 259bafea35 Perfdata::format(): handle ThresholdRanges
refs #8194
2018-05-03 15:12:42 +02:00
Alexander A. Klimov 392231dc81 Perfdata: return ThresholdRange from getWarningThreshold() and getCriticalThreshold()
refs #8194
2018-05-03 15:11:52 +02:00
Alexander A. Klimov bc5d3b64c4 ThresholdRange::fromString(): compare non-strictly
refs #8194
2018-05-03 15:11:52 +02:00
Alexander A. Klimov 81601e6303 ThresholdRange::fromString(): drop default
refs #8194
2018-05-03 15:11:52 +02:00
Alexander A. Klimov b706792c9b Preserve threshold ranges in ThresholdRange, not in Perfdata
refs #8194
2018-05-03 15:11:52 +02:00
Alexander A. Klimov 881267d829 ThresholdRange::fromString(): default to -∞:∞
refs #8194
2018-05-03 15:11:52 +02:00
Alexander A. Klimov 54002cb3e5 Perfdata: print warn and crit human-readable if the start is -∞
refs #8194
2018-05-03 15:11:52 +02:00
Alexander A. Klimov 2270e250d3 Perfdata: use ThresholdRange
refs #8194
2018-05-03 15:10:31 +02:00
Alexander A. Klimov cdb1db89e2 ThresholdRange: trim(floatval()) -> floatval(trim())
refs #8194
2018-05-03 15:00:48 +02:00
Alexander A. Klimov 7865db9053 Perfdata: simplify code design
refs #8194
2018-05-03 15:00:48 +02:00
Alexander A. Klimov e006902254 ThresholdRange::setInverted(): default to true
refs #8194
2018-05-03 15:00:48 +02:00
Alexander A. Klimov 7273959007 ThresholdRange: reword doc
refs #8194
2018-05-03 15:00:48 +02:00
Alexander A. Klimov 746eb07862 ThresholdRange: use substr() instead of strpos() where more performant
refs #8194
2018-05-03 15:00:48 +02:00
Alexander A. Klimov ddde4b447c ThresholdRange: trim() raw ranges
refs #8194
2018-05-03 15:00:48 +02:00
Alexander A. Klimov 5df6eeaeaf Implement ThresholdRange
refs #8194
2018-05-03 15:00:48 +02:00
Johannes Meyer bc398bc8df list/servicegrid: Increase joystick size to make it more apparent
Also increases x-axis label length by 30% since we're now showing
hostnames which are usually longer than service descriptions. Also
this makes room for actually being able to increase the joystick size.

refs #2640
2018-05-03 10:40:30 +02:00
Johannes Meyer 589d1bb75c list/servicegrid: Use a different view script when axes are flipped
refs #2640
2018-05-03 10:40:17 +02:00
Johannes Meyer e6cb82b34b list/servicegrid: Push sort control to the right
That's where all of our sort controls are located.
Confuses users like me otherwise and violates one
of the basic ui design principles..

refs #2640
2018-05-03 10:40:17 +02:00
Johannes Meyer 9ce5e2aa60 list/servicegrid: Allow to flip the grid's axes
Still missing:
* Flipped quick search columns
* Non-hardcoded axis labels

Probably make this a dedicated view?

refs #2640
2018-05-03 10:40:02 +02:00
Johannes Meyer d5686d4a18 tactical: Avoid displaying weird empty donuts if nothing is found
refs #3334
2018-05-02 11:27:12 +02:00
Johannes Meyer 3606e5a514 tactical: Allow to filter what is displayed
refs #3334
2018-05-02 11:14:27 +02:00
Johannes Meyer 4ec783b75e IdoQuery: Use a dynamic collation when joining custom variables
refs #2508
2018-04-27 15:33:42 +02:00
Alexander A. Klimov 2da7ef0eb2 Secure DetailviewExtensionHook::getHtmlForObject()
refs #3393
2018-04-27 12:55:17 +02:00
Johannes Meyer f893f4953b modules: Raise versions to 2.5.3 2018-04-27 10:24:18 +02:00
Johannes Meyer 1c29b03b84 Revert "Merge pull request #3413 from Icinga/bugfix/filter-contacts-assigned-to-services-3088"
This reverts commit 33247237af, reversing
changes made to 37aeb83cd9.

refs #3436
2018-04-27 10:13:58 +02:00
Johannes Meyer 77787c3ac1 modules: Raise versions to 2.5.2 2018-04-25 13:03:24 +02:00
Johannes Meyer 2fdaca9c90
Merge pull request #3383 from Icinga/fix/pluginoutput-3382
PluginOutput: Fix text splicing for status tags in HTML output

fixes #3382
2018-04-25 11:51:53 +02:00
Johannes Meyer 33247237af
Merge pull request #3413 from Icinga/bugfix/filter-contacts-assigned-to-services-3088
IDO: treat contacts of services of hosts as direct contacts of the hosts
2018-04-24 17:00:46 +02:00
Christoph Niemann 44da032535 monitoring: Fix typo in german translation file 2018-04-24 13:56:43 +02:00
Alexander A. Klimov bbca113adc IDO: treat contacts of services of hosts as direct contacts of the hosts
refs #3088
2018-04-06 15:16:36 +02:00
Alexander A. Klimov 96aac70109 Check contact existence before using its email address
refs #3088
2018-04-06 12:30:46 +02:00
Johannes Meyer 973dff5f41 monitoring/de_DE: Add missing tactical overview translations
refs #3375
2018-04-05 13:46:16 +02:00
Johannes Meyer c4bc4c0769 tactical/index.phtml: Re-use already localized terms
refs #3375
2018-04-05 13:45:03 +02:00
Johannes Meyer bbec6caf2d TacticalController: Uppercase first letter in donut titles
refs #3375
2018-04-05 13:43:14 +02:00
Alexander A. Klimov 4995df8336 Make host and service groups sortable by the members' severities
refs #3395
2018-04-04 10:05:27 +02:00
Carsten Koebke b73da48c16 Always show full date + time on history list for notifications 2018-03-15 13:16:44 +01:00
Markus Frosch b0ecbe079f PluginOutput: Fix text splicing for status tags in HTML output
Trailing text was lost in processing.

Also add tests to check this behavior plus some basics.

fixes #3382
2018-03-07 15:59:14 +01:00
Michael Friedrich 6f9e046220 Send the correct 'force' attribute for 'check now' to the Icinga 2 API transport
refs icinga/icinga2#6140
2018-03-02 14:54:29 +01:00
Gunnar Beutner b19ae23f7a
Merge pull request #3368 from Icinga/feature/tactial-ovierview-can-handle-format-request
TacticalController: Add OutputFormat json and csv
2018-02-22 15:12:02 +01:00
lippserd a89d8fb604
Merge pull request #3350 from xam-stephan/hostgroup-service-url-filter
hostgroups url filter also for services
2018-02-21 09:21:17 +01:00
Jennifer Mourek 2902f3330c TacticalController: Remove UI tab element for exports 2018-02-20 12:30:56 +01:00
Jennifer Mourek 4074d7b3ac Apply requested changes 2018-02-19 15:37:52 +01:00
Jennifer Mourek 44abd01ffc TacticalController: Add OutputFormat and tab creation handling
Mimics the behaviour of the ListController
2018-02-19 11:04:39 +01:00
Michael T. DeGuzis 91678eec83
protocol is wrong, fcgi, not fgci 2018-02-11 18:04:19 -05:00
Max Stephan 493409b5d7
url filter also for services
use the url filter also for services
2018-02-08 12:01:36 +01:00
Alexander A. Klimov 7a444df040 Doc: make PDF export action reachable
refs #1716
2018-01-26 12:12:27 +01:00
Alexander A. Klimov c717ebeb94 Make Plugin class loadable 2018-01-24 10:21:37 +01:00
Eric Lippmann 56d28a6c14 Prepare release version 2.5.1 2018-01-22 13:47:41 +01:00
Alexander A. Klimov ff6fbdf5f2 Censor arguments in stack traces
refs #2810
2018-01-22 10:28:47 +01:00
Johannes Meyer e8fa99f913 PluginOutput: Use new PluginOutputPurifier helper instead 2018-01-19 16:16:35 +01:00
Johannes Meyer 42b685d336 Introduce class Icinga\Module\Monitoring\Web\Helper\PluginOutputPurifier 2018-01-19 16:16:35 +01:00
Johannes Meyer 2a959af9c2 ConfigCommand: Add fpm socket commandline switch
Allows to pass a different socket path than the default
when generating a webserver's configuration.

refs #2862
2018-01-19 10:15:22 +01:00
Johannes Meyer 94ea42f30d module/doc: End output buffering before serving module images
refs #3223
2018-01-18 15:23:12 +01:00
lippserd 226cc2c810
Merge pull request #3274 from Icinga/bugfix/inner-donut-labels-firefox-3226
Donut: place HTML tags outside <svg>
2018-01-18 10:15:49 +01:00
Michael Friedrich 4dfc309e12 Fix command transport documentation for inline comments
fixes #3281
2018-01-17 17:02:50 +01:00
lippserd 21d1e0d3cd
Merge pull request #3142 from Icinga/bugfix/icingacli-monitoring-list-host-without-services-3050
Split icingacli monitoring list
2018-01-17 16:03:06 +01:00
Alexander A. Klimov 0ad153a223 Tactical overview: always show the problems amount
refs #3226
2018-01-17 15:01:02 +01:00
lippserd f4c46cde19
Merge pull request #3278 from Icinga/bugfix/drop-obsolete-aggregates-from-event-history-query-2860
EventHistory: Drop obsolete SUM aggregates
2018-01-17 14:07:20 +01:00
Johannes Meyer 0610718930 PluginOutput: Allow ordered and unordered lists in html output
refs #2846
2018-01-17 13:02:11 +01:00
Johannes Meyer dff6c16bf8 PluginOutput: Properly handle whitespace for html output
refs #2846
2018-01-17 13:02:11 +01:00
Johannes Meyer b07e4b409f EventHistory: Drop obsolete SUM aggregates
Not used anywhere and not working for a long time already,
at least as filter columns.

refs #2860
2018-01-17 12:41:10 +01:00
lippserd 375b140c48
Merge pull request #3126 from mapa82/master
Monitoring: add setting acknowledge_expire_time
2018-01-17 12:18:00 +01:00
mapa82 9b81492e8b Monitoring: add setting acknowledge_expire_time
Signed-off-by: Alexander A. Klimov <alexander.klimov@icinga.com>
2018-01-17 12:07:03 +01:00
Alexander A. Klimov 4e57fa1dd7 Split icingacli monitoring list
refs #3050
2018-01-16 11:02:19 +01:00
lippserd 2fb9ce9f93
Merge pull request #3145 from Icinga/bugfix/history-eventgrid-format-2678
Accept /monitoring/list/eventgrid?format=*
2018-01-16 10:43:09 +01:00
lippserd 30e5ee9d79
Merge pull request #3227 from Icinga/feature/separate-reachability-and-check-source-2953
Separate reachability and check source info in detail views
2018-01-16 10:24:14 +01:00
lippserd e529b9b2ba
Merge pull request #3218 from Icinga/bugfix/remove-leading-and-trailing-blank-from-ip-address-2494
Remove leading and trailing blanks from ip addresses
2018-01-16 09:20:37 +01:00
lippserd 5b069bace4
Merge pull request #3138 from Icinga/bugfix/typo-existance-3062
Fix typo "existance"
2018-01-16 09:03:48 +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
Alexander A. Klimov 196cdbe4af Implement event history detail view
refs #3191
2018-01-09 13:04:06 +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
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 ba9d286567 Remove leading and trailing blanks from ip addresses
refs #2494
2017-12-15 13:08:14 +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