Commit Graph

4300 Commits

Author SHA1 Message Date
Johannes Meyer c9fa8905e6
Merge pull request #3741 from Icinga/fix/tactical-overview-legend-not-properly-affected-by-themes
Fix tactical overview legend badges not properly affected by themes
2019-04-12 09:38:04 +02:00
Johannes Meyer eb69a249d3 PluginOutputTest: Fix case testMultilineHtmlOutput 2019-04-11 14:16:10 +02:00
Alexander A. Klimov fff07144c3 Preserve <br>s in plugin output
refs #3662
2019-04-11 14:16:10 +02:00
Jennifer Mourek 0f101f9855 Use correct classes for the legend badges 2019-04-10 09:07:26 +02:00
Janne Heß d45c753409 Support temperatures (°C, °F) in perfdata 2019-04-05 15:28:51 +02:00
Johannes Meyer fc99865241
Merge pull request #3724 from dgoetz/feature/settings-doc
Add documentation for settings of the monitoring module
2019-04-05 11:10:23 +02:00
Dirk Goetz d5ac22234b Add documentation for settings of the monitoring module 2019-04-05 11:05:05 +02:00
Johannes Meyer affed19536
Merge pull request #3708 from Icinga/fix/html-entities-in-plugin-output-3707
Don't escape html entities in plugin output twice
2019-04-05 08:05:52 +02:00
Marc DeTrano e7d117e1b6 Improve Eventgrid performance by limititing query time range, and only querying for hosts or services as requested in the form. 2019-04-02 10:15:33 -06:00
Johannes Meyer b8c1934428 Introduce implementation for hook X509/Sni 2019-03-28 14:04:04 +01:00
Constantin Matheis 76cd8a0321 Added Check source to Details view.
refs #3687
2019-03-07 10:33:51 +01:00
Johannes Meyer 19231038a7 PluginOutput: Don't escape html entities twice
fixes #3707
2019-03-05 13:27:27 +01:00
Eric Lippmann 403c2d3495
Merge pull request #3481 from marianrh/feature/optionally-disable-mysql-server-certificate-validation
Allow disabling MySQL server certificate validation by setting ssl_do_not_verify_server_cert
2019-02-26 10:39:21 +01:00
Eric Lippmann 37de0edabf
Merge pull request #3663 from Al2Klimov/feature/plugin-output-span-style
Allow span and *[style] in plugin outputs
2019-02-26 10:35:33 +01:00
Johannes Meyer 07c48d63ee ServicesController: Already hide ignored services to reschedule in the preview list
refs #3665
2019-02-07 15:51:26 +01:00
Johannes Meyer f281cf0795 HostsController: Already hide ignored hosts to reschedule in the preview list
refs #3665
2019-02-07 15:51:26 +01:00
Johannes Meyer ac50992aab ScheduleServiceCheckCommandForm: Ignore services which have no active checks
refs #3665
2019-02-07 15:51:26 +01:00
Johannes Meyer 7bda65978c ScheduleHostCheckCommandForm: Ignore hosts which have no active checks
refs #3665
2019-02-07 15:51:26 +01:00
Johannes Meyer c2fc370273 CheckNowCommandForm: Ignore objects which have no active checks
refs #3665
2019-02-07 15:51:26 +01:00
Johannes Meyer 164555760b ServicesController: Don't allow to reschedule checks if no objects have active ones
refs #3665
2019-02-07 15:51:26 +01:00
Johannes Meyer f45b4640b0 HostsController: Don't allow to reschedule checks if no objects have active ones
refs #3665
2019-02-07 15:51:26 +01:00
Johannes Meyer 3d4fa0bcae MonitoredObjectController: Don't show `Check Now` if active checks are disabled
refs #3665
2019-02-07 15:51:26 +01:00
Johannes Meyer b275a1383d configuration.php: Introduce permission `monitoring/command/schedule-check/active-only`
refs #3665
2019-02-07 14:33:03 +01:00
Alexander A. Klimov 2625454e5d Allow span and *[style] in plugin outputs 2019-01-12 14:37:18 +01:00
Noah Hilverling 59b688e664 Fix that event detail view is not showing time in correct timezone 2019-01-10 09:54:25 +01:00
Eric Lippmann 63cb9d7283
Merge pull request #3622 from Icinga/fix/plugin-output-extra-spaces
Fix extra spaces in command outputs after a comma
2018-11-21 09:19:00 +01:00
Eric Lippmann 081b90e92f Raise version to 2.6.2 2018-11-20 12:39:21 +01:00
Eric Lippmann 0242c440ef
Merge pull request #3623 from Icinga/fix/some-links-in-group-overviews-dont-respect-filters
Respect filters for all links in the group overviews
2018-11-19 17:26:05 +01:00
Eric Lippmann a2697d9497
Merge pull request #3617 from Icinga/fix/contacts-hostgroup-filter
Fix SQL error in contact list when filtering for hostgroups
2018-11-19 17:25:38 +01:00
Eric Lippmann 4a0c1ccb03
Merge pull request #3624 from Icinga/fix/show-contact-with-restriction
Fix contact details if restriction is active
2018-11-19 17:24:43 +01:00
Eric Lippmann 9909584b91 Monitoring/de_DE: Fix typo in "Letze Aktualisierung"
fixes #3605
2018-11-19 12:26:52 +01:00
Eric Lippmann fe3de9458b Filter for contact name after adding restrictions
refs #3549
2018-11-15 17:23:40 +01:00
Eric Lippmann b4bae84ca4 Respect filters for all links in the group overviews
refs #3586
2018-11-15 16:36:44 +01:00
Eric Lippmann cd19625895 Use zero-width space instead of a real space char
refs #3562
2018-11-15 14:54:49 +01:00
Eric Lippmann 8300011c6f Use requireVirtualTable() 2018-11-15 11:10:31 +01:00
Eric Lippmann dda390b3d8 Require virtual table hosts
refs #3564
2018-11-14 10:22:17 +01:00
Michael Friedrich d1fb3b3674 Update URL to https://icinga.com 2018-10-18 11:02:57 +02:00
Markus Frosch 4753262589 DetailviewExtension: Integrate into multi-select views
refs #3072
2018-08-22 17:13:41 +02:00
Markus Frosch ecbfafd25a DetailviewExtension: Make sure data-icinga-module is set on container
To allow the eventhandler in JS to load and initialize the
corresponding module.
2018-08-22 17:04:41 +02:00
Eric Lippmann b3e0b5d587 Raise version to 2.6.1 2018-08-02 12:46:39 +02:00
Johannes Meyer dbfef34f6e Audit: Log a command's payload as json
$data may be arbitrarily nested.

refs #3535

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2018-07-24 10:16:30 +02:00
Johannes Meyer c0f99539ff Raise version to v2.6.0 2018-07-19 09:27:11 +02:00
Johannes Meyer dab9fea0d4
Merge pull request #3457 from Icinga/feature/proper-results-when-filtering-for-linked-objects-2934
Proper results when filtering for linked objects
2018-07-19 09:15:58 +02:00
Eric Lippmann 7f21e14afc Add command audit 2018-07-19 00:35:28 +02:00
Eric Lippmann 7624d99070 Use subquery filters for contacts if appropriate
refs #2934
2018-07-18 17:47:40 +02:00
Eric Lippmann 424f687f5d
Merge pull request #3532 from Icinga/bugfix/ido-check_interval
Fetch check_interval property of monitored objects, too
2018-07-18 16:32:37 +02:00
Eric Lippmann c168ebfe3a Fix subquery joins for host and service group views
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 3a434320e2 Fix subquery joins for negative filters
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann b7f0270a24 Use SELECT 1 for subquery filters
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 28e68f8f8a Fix group base 2018-07-18 15:50:37 +02:00
Eric Lippmann c3d25e1a59 Use subquery filters for service groups if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 61d325fa8a Use subquery filters for host groups if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann a3ec0df7c5 Use subquery filters for service flapping history if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann c4de14eb05 Use subquery filters for host flapping history if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 1d4ee7824a Use subquery filters for service comment history if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 2ee0f99ed1 Use subquery filters for host comment history if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann df7b5d663a Use subquery filters for service downtime history if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 0ca97d191f Use subquery filters for host downtime history if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 81b6b0129b Use subquery filters for service state history if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann bdb73ec06e Use subquery filters for host state history if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 27f4fe82cd Use subquery filters for service notifications if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 84c6055a17 Use subquery filters for service comments if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann a84cc40aa8 Use subquery filters for host notifications if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann db50d40068 Use subquery filters for host comments if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 271a1d72f1 Use subquery filters for contact groups if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann f7f02bdc8f Use subquery filters for service downtimes if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Eric Lippmann 9f7b9edffe Use subquery filters for host downtimes if appropriate
refs #2934
2018-07-18 15:50:37 +02:00
Johannes Meyer 186ef5a5a7 Use subquery filters for services if appropriate
refs #2934

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2018-07-18 15:50:37 +02:00
Johannes Meyer 824fa870a2 Use subquery filters for hosts if appropriate
refs #2934

(EL): Alternative service group subquery filter:

```php
$this->joinVirtualTable('services');
$query->joinVirtualTable('members');
return ['sgm.service_object_id', 'so.object_id'];
```

But I think the committed solution is better.

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2018-07-18 15:50:37 +02:00
Eric Lippmann 4b80b3e7ee IdoQuery: Support & and != for subquery filters
refs #2934
2018-07-18 15:50:37 +02:00
Johannes Meyer 5c8cf64658 IdoQuery: Use subqueries to filter linked objects
refs #2934

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2018-07-18 15:50:37 +02:00
Alexander A. Klimov 0b5620d2b5 Fetch check_interval property of monitored objects, too 2018-07-18 15:42:34 +02:00
Eric Lippmann d5d336884c Fix grouping in the new contact queries
refs #3088
2018-07-18 15:20:23 +02:00
Johannes Meyer 5befab6a2b ContactQuery: Don't use a UNION query if not necessary
Speeds up the db's response time significantly in huge
environments.

refs #3088

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2018-07-18 15:20:23 +02:00
Johannes Meyer 2fbbf3da58 DataView\Contact: Make `instance_name` a static filter column
It's not queryable by its accompaniying query.

refs #3088
2018-07-18 15:20:23 +02:00
Eric Lippmann e684c6d18e Split contact query into subqueries
One can't fetch host and service contacts with a reasonable single
query.

refs #3088
2018-07-18 15:20:23 +02:00
Eric Lippmann 658cc72141
Merge pull request #3502 from Icinga/feature/plugin-output-hook
Introduce monitoring/PluginOutputHook
2018-07-18 14:18:27 +02:00
Matthias 4c9dac5fb8 Display all Grapher hooks not just the first one
refs #3473

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2018-07-18 13:49:32 +02:00
Eric Lippmann becd7d0504 Introduce monitoring/PluginOutputHook
refs #3257
2018-07-16 14:19:28 +02:00
Marian Rainer-Harbach 5e40405a12 Allow disabling MySQL server certificate validation by setting ssl_do_not_verify_server_cert
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2018-07-16 11:41:13 +02:00
Johannes Meyer 6f5edf132c monitoring: Introduce run.php and provide the new ApplicationStateHook
fixes #3523
2018-07-12 13:55:05 +02:00
Johannes Meyer 4f2a6dd9aa i18n/monitoring: Update german translation 2018-07-12 11:09:11 +02:00
Johannes Meyer d26ac3c5fb i18n/monitoring: Correct german translation 2018-07-12 10:31:58 +02:00
Eric Lippmann 5f3da9d5e9
Merge pull request #3515 from Icinga/fix/shaky-monitoring-health-layout-3434
monitoring/health: Cleanup layout and make it dashboard compliant
2018-07-10 09:25:25 +02:00
Eric Lippmann 12b17d4b0a Reduce font-weight for badges in monitoring/health
refs #3434
2018-07-10 09:23:38 +02:00
Eric Lippmann b88c6b0a6e
Merge pull request #3516 from Icinga/feature/application-state-hook
Application state hook
2018-07-10 09:14:26 +02:00
Eric Lippmann 45468b7a8e Introduce app state for the monitoring module
refs #2835
2018-07-09 16:28:28 +02:00
Eric Lippmann ea722484b0 Introduce 'problems' columns for CLI usage
refs #3512
2018-07-09 16:10:07 +02:00
Eric Lippmann b3fcbbee97 Revert "Fix icingacli monitoring list --problems"
This reverts commit 855e7f7120.
2018-07-09 16:08:02 +02:00
Johannes Meyer 1cb105b52a monitoring/health: Cleanup layout and make it dashboard compliant
fixes #3434
2018-07-09 13:50:17 +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 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 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
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
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
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 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
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
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
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
Alexander A. Klimov 5f443af14d Accept /monitoring/list/eventgrid?format=*
refs #2678
2017-11-24 17:16:33 +01:00
Alexander A. Klimov 667f3cca01 Fix typo "existance"
refs #3062
2017-11-23 16:28:19 +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
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
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
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 c3ef50978a style: Fix minor styleguide issues for PHPCS 2017-11-08 10:06:45 +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
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
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
Nicolai Buchwitz bd5de0949d Remove array syntax from default comment filter
Added comment types 'comment' and 'ack' as separate fields and removed
the array syntax due to problems with the filter editor.

refs #2925

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-10-23 10:45:21 +02:00
Mikesch-mp c17c1b876c Export JSON with .json extension
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-10-18 13:47:08 +02:00
lippserd 91948a5a37 Merge pull request #2983 from Mikesch-mp/csv-export
Export CSV files with .csv extension
2017-10-18 13:21:59 +02:00
Mikesch-mp d76a18dd91 Export CSV files with .csv extension
refs #2808

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-10-18 13:21:19 +02:00
Blerim Sheqa 3b7147af16 Fix broken links in docs of monitoring and translation module 2017-10-09 15:52:10 +02:00
Eric Lippmann 8de0b80f9e Fix contact group member count
fixes #2837
2017-10-05 14:35:15 +02:00
lippserd 773dae3750 Merge pull request #2978 from Icinga/fix/drop-livestatus
Remove unsupported livestatus functionality
2017-09-29 11:15:54 +02:00
lippserd 4cadc90c92 Merge pull request #2972 from Icinga/feature/enhance-docs-add-missing-bits
Enhance the documentation, add missing bits and fix outdated information
2017-09-29 11:15:17 +02:00
Michael Friedrich 36b5c949fd Add documentation for addColumns in host/service list views
fixes #2579
2017-09-29 11:01:45 +02:00
Michael Friedrich 34bd8e14c3 Enhance the documentation and fix outdated information (preferences, etc.)
This applies a new structure for the main doc/ and modules/*/doc tree with

01-About.md
02-Installation.md
...

This allows us to link from the main doc directory into module specific
documentation entries.

Furthermore table formatting, examples, and missing settings have been added
where applicable.

This patch also takes care about proper URL anchors and file names and directories.

fixes #2950
2017-09-29 11:01:37 +02:00
Michael Friedrich ab364e0fc7 Remove unsupported livestatus functionality
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-09-29 10:33:55 +02:00
Eric Lippmann 3790fd0819 Bump version to 2.4.2
(cherry picked from commit 13e86b6320)
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-09-28 14:24:00 +02:00
lippserd 624fab8194 Merge pull request #2960 from Icinga/bugfix/host-severity-order-2926
Adjust host severity
2017-09-25 17:11:36 +02:00
Jennifer Mourek 0b30fbd15d Adjust host severity
refs #2926

Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-09-25 17:03:33 +02:00
Alexander A. Klimov 467fc79095 Style monitored objects' detailview extensions as expected
refs #2949
2017-09-20 14:49:14 +02:00
Alexander A. Klimov c2ee3bef06 DetailviewExtensionHook: provide the concrete implementation's module
refs #2949
2017-09-20 14:49:08 +02:00
Michael Friedrich 2c312adf94 API Commands: Only send acknowledgement expire time if not null
Icinga 2 v2.7.0 is more strict with the `expiry` attribute if sent
(cannot be null, or in the past).

While acknowledgments with expire time worked well (and do so with this patch),
the command renderer did not check whether the value is actually not null
before setting it into the data form. The boolean value from the checkbox is
not available in the command renderer unfortunately.

@lippserd: Verified working with and without expire time inside the Vagrant boxes.

fixes #2911
2017-08-08 12:53:39 +02:00
Eric Lippmann 2b3853d01c Doc: Relax Icinga 2 API user permissions
Fixes #2884
2017-07-28 11:28:35 +02:00
Eric Lippmann adc2f90f74 Show DOWN hosts before UNREACHABLE when sorting by host_severity
refs #2034
2017-07-27 16:08:29 +02:00
Eric Lippmann 7c88ee70d2 Remove sort rules from Programstatus
Sort is not necessary here.
2017-07-27 15:03:12 +02:00
Eric Lippmann 1621755103 Don't call UNIX_TIMESTAMP when sorting by host_severity 2017-07-27 15:03:12 +02:00
Eric Lippmann 9b7a155db2 Don't call UNIX_TIMESTAMP when sorting by service_severity 2017-07-27 15:03:12 +02:00
Eric Lippmann 8a6240fe02 Reduce service_severity order by columns
Ordering by host and service display_name too here reduces performance and is not necessary.
2017-07-27 15:03:12 +02:00
Eric Lippmann c5f2fc5aa5 Reduce service_display_names order by columns
Ordering by host_display_name too here reduces performance as it forces MySQL to use a temp table.
2017-07-27 15:03:12 +02:00
Eric Lippmann ee429f54d0 Reduce host_severity order by columns
Ordering by host_display_name too here reduces performance and is not necessary.
2017-07-27 15:03:12 +02:00
Eric Lippmann e7776d08a9 Don't call UNIX_TIMESTAMP when sorting by host_last_state_change
Else possible indices can't be used.
2017-07-27 15:03:12 +02:00
Eric Lippmann 3a1afb3511 Don't call UNIX_TIMESTAMP when sorting by service_last_state_change
Else possible indices can't be used.
2017-07-27 15:03:12 +02:00
Eric Lippmann 9b529bcd15 Flip base tables in HoststatusQuery
This has no performance impact but all our queries should start w/ select from icinga_objects.
2017-07-27 15:03:12 +02:00
Eric Lippmann 370d148072 Optimize imports in HoststatusQuery 2017-07-27 15:03:12 +02:00
Eric Lippmann e42d86a4e1 Remove unncessary column definitions in the Hostgroupsummary and Servicegroupsummary data views 2017-07-27 15:03:12 +02:00
Eric Lippmann 0a3da99e7f Reduce filter columns of the Hostgroup and Servicegroup data views
Its not necessary to expose those columns because these data views do not directly accept user input.
2017-07-27 15:03:12 +02:00
Eric Lippmann 44da318109 Remove no-op order columns Hosts Severiy and Services Severity from the host group and service group views 2017-07-27 15:03:12 +02:00
Eric Lippmann b4df81e75a Optimize queries used for fetching the service group summaries 2017-07-27 15:03:12 +02:00
Eric Lippmann 06cb980308 Don't add GROUP BY for unjoined tables 2017-07-27 15:03:12 +02:00
Eric Lippmann 30cc51a823 Optimize queries used for fetching the host group summaries
refs #1883
2017-07-27 11:43:13 +02:00
Eric Lippmann f5a9016dea Optimize queries for creating the host and service problem badges in the menu
We now use two fast count queries w/ an appropriate filter instead of fetching a whole bunch of unnecessary host and service counters.
2017-07-27 11:38:00 +02:00
Eric Lippmann a9f3f99049 Don't hide errors in the BackendAvailabilityNavigationItemRenderer
If an exception occurs when fetching the dataview, we will now log the exception and display a badge in state unknown.
2017-07-27 11:35:40 +02:00
Eric Lippmann 439d78a982 Don't hide errors in the MonitoringBadgeNavigationItemRenderer
If an exception occurs when fetching the dataview, we will now log the exception and display a badge in state unknown.
2017-07-27 11:31:10 +02:00
Eric Lippmann 28790d254b Remove caching form the MonitoringBadgeNavigationItemRenderer
Caching will be no longer necessary because we will replace the queries used to fetch the problem badges.
2017-07-27 11:29:57 +02:00
Eric Lippmann c0d359fbbd Fix base class of MonitoringBadgeNavigationItemRenderer
The MonitoringBadgeNavigationItemRenderer extended the SummaryNavigationItemRenderer before which does not make sense because they have nothing in common.
2017-07-27 09:33:44 +02:00
Alexander A. Klimov 6848ed6c1e Merge branch 'bugfix/can-t-progress-in-wizard-due-to-error-2842'
fixes #2842
2017-07-05 14:40:10 +02:00
Alexander A. Klimov 5460465e07 Fix null->setDecorators()
refs #2842
2017-07-05 14:34:17 +02:00
Eric Lippmann d208b48b72 Monitoring: Fix permission for the 'Process check result' action
fixes #2878
2017-07-04 17:24:57 +02:00
Markus Frosch 3d3b1cdf4f RestRequestTest: Fully qualify expected exception 2017-06-13 11:07:16 +02:00
Tobias von der Krone a7f5278aee Timeline: fix link to acknowledgements
refs #2850
2017-05-26 12:28:34 +02:00
Eric Lippmann a4a0f9f5e6 Allow to filter notifications by notification_reason
refs #2698
2017-05-04 14:38:00 +02:00
Eric Lippmann b900a01d02 Add sort by severity to the servicegroup links in the servicegroups overview 2017-05-04 14:37:43 +02:00
Eric Lippmann c36b2661b1 Add sort by severity to the hostgroup links in the hostgroups overview 2017-05-04 14:03:57 +02:00