Commit Graph

963 Commits

Author SHA1 Message Date
Marius Hein 9465c3ffb6 Show/Contact: Add commands to view
Create a new command query and join contact information into.

refs #4804
2014-08-27 16:38:29 +02:00
Alexander Klimov 8b0df6c9f7 UnsupportedBackendException: extend IcingaException
refs #6931
2014-08-27 16:29:56 +02:00
Alexander Klimov 45638b218c Throw IcingaException rather than Exception
fixes #7014
2014-08-27 16:03:15 +02:00
Alexander Klimov 7ff51caed0 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 15:51:49 +02:00
Alexander Fuhr 968fa36cfd Fixes dashboard title configuration
fixes #7011
2014-08-27 15:03:28 +02:00
Alexander Fuhr 236d384bab Fixes unaccepted behavior in module configuration
fixes #7011
2014-08-27 14:57:08 +02:00
Eric Lippmann 1dea19504f Revert "Remove leading backslashes from the targets of use statements"
This reverts commit 87a5967501.

At least 'modules/doc/run.php' issues a warning about "The use statement with non-compound name 'Zend_Controller_Router_Route' has no effect"
2014-08-27 12:24:11 +02:00
Marius Hein 88698cb05d Hook/TopBar: Rework interface for monitoring top bar
refs #6929
2014-08-27 11:31:48 +02:00
Alexander Klimov 87a5967501 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 11:16:44 +02:00
Marius Hein 89541f5727 Merge branch 'bugfix/hook-interface-6932'
fixes #6932
fixes #6928
2014-08-27 09:39:56 +02:00
Marius Hein 7e5b5a0b30 Hook/Grapher: Rework hook interface
Rework interface based on specification and changed consumer calls.

refs #6932
2014-08-27 09:35:43 +02:00
Eric Lippmann 6b88f1c98e Move Commandpipe/* classes from Icinga Web 2's library to the monitoring module
refs #6593
2014-08-26 16:35:30 +02:00
Goran Rakic 746f53fd20 Do not hide OK hosts and services from the Pie Chart
Having a single hostgroup, and all hosts and services up, landing page Pie Chart is empty. This restores display of OK hosts and services.
2014-08-26 15:20:15 +02:00
Marius Hein 376e9aa160 Rename hook base classes
Adding suffix "Hook" to every base class. This simplifies development
because you don't need to alias bases classes in your concrete
hook classes

refs #6928
2014-08-26 14:29:55 +02:00
Alexander Klimov 1f7d4cb61b Merge branch 'master' into bugfix/exceptions-with-printf-params-6931 2014-08-26 11:24:33 +02:00
Alexander Klimov febb2d1ae2 ProgrammingError: extend IcingaException
refs #6931
2014-08-26 11:15:19 +02:00
Alexander Fuhr bae5ba2352 Add self provided configuration for dashlets in monitoring module
refs #6639
2014-08-26 10:34:35 +02:00
Thomas Gelf 70fe22dfad monitoring/tactical: fix missing translations 2014-08-22 18:08:20 +02:00
Thomas Gelf 5c46355474 translation: refresh de_DE 2014-08-22 17:58:53 +02:00
Thomas Gelf c31972b99c translation: refresh monitoring module 2014-08-22 17:26:20 +02:00
Johannes Meyer 7b221e2aba It should not be a form's responsibility how its submit button should look..
...in case it's a standard button. No need to be DRY here.

refs #5525
2014-08-22 15:20:54 +02:00
Johannes Meyer 5028ec7b0b Avoid NIH
It's useless to have specific getters and setters if generic methods from the
baseclass can be used as well to accomplish the same task.

refs #6641
2014-08-22 12:30:13 +02:00
Johannes Meyer 75a0c17933 Ensure that all forms have a name
refs #5525
2014-08-22 12:15:02 +02:00
Johannes Meyer 2b879b344f Do not populate using createElements() and fix documentation blocks
refs #5525
2014-08-22 12:04:14 +02:00
Alexander Klimov 9c5878cbbe ConfigurationError: extend IcingaException
refs #6931
2014-08-22 11:46:11 +02:00
Alexander Fuhr 20cead67a6 Merge branch 'master' into bugfix/modules-menu-provider-6639 2014-08-22 11:44:10 +02:00
tgelf da821fd952 list/hosts: add missing host_attempt column 2014-08-22 05:23:45 -04:00
Alexander Fuhr 7e0047d00e Add Menu configuration in Monitoring Module
refs #6639
2014-08-22 11:07:49 +02:00
Thomas Gelf 49cd55eddd list/hosts: cleanup, should look like list/services
Quite some changes here:

* Compact view should show icons too
* Ignore host icons with legacy HTML hacks
* Remove duplicate code
* Reduce HTML
* Reduce intendation for better readability
* Show attempts on soft states only, even in compact view
* Use the same HTML tags and styles as in list/services
* Fixes nesting error on compact view
2014-08-22 11:06:45 +02:00
Alexander Klimov 30d0ebcdfd Make 'modules/monitoring/config.ini' doesn't have to exist 2014-08-21 12:36:28 +02:00
Alexander Klimov d1b1bc368f Monitoring_ConfigController: don't use SecurityForm::isSubmittedAndValid()
refs #5525
2014-08-21 11:51:49 +02:00
Alexander Klimov b81e96574a SecurityForm: replace create() with createElements() and add addSubmitButton()
refs #5525
2014-08-21 11:48:07 +02:00
Johannes Meyer 11063495b2 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	modules/monitoring/application/controllers/ConfigController.php
2014-08-21 10:22:16 +02:00
Thomas Gelf a8d33d90e2 Monitoring\Object: fix a couple of cv-related issues
* Don't throw exceptions with no config
* Provide a secure default if not configured
* Improve code readability
2014-08-20 13:36:03 +02:00
Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ConfigController.php
	application/forms/Authentication/LoginForm.php
	application/forms/Preference/GeneralForm.php
	modules/monitoring/application/controllers/ChartController.php
2014-08-20 13:13:50 +02:00
Alexander Klimov bb65fb396a Merge branch 'bugfix/sensitive-custom-vars-6641'
fixes #6641
2014-08-20 12:29:45 +02:00
Alexander Klimov 78b98a7d67 SecurityForm: Add helptext
refs #6641
2014-08-20 12:21:11 +02:00
Johannes Meyer 09dfcca0bc Merge branch 'master' into bugfix/styled-history-views-6637 2014-08-20 11:39:03 +02:00
Johannes Meyer 4ceecf1146 Let comment view look more standardized and add limit control
refs #6637
2014-08-20 11:34:24 +02:00
Alexander Klimov 071937910b Monitoring/Object: filter protected customvars
Move the responsibility from the viewscript to Monitoring/Object

refs #6641
2014-08-19 18:46:37 +02:00
Alexander Fuhr ba748cbc4a Refactor multiSelect and highlight
refs #6705
2014-08-19 18:33:28 +02:00
Alexander Klimov ea0248ecf4 Remove '{{SAVE_ICON}}', tiny design fixes
refs #6641
2014-08-19 17:54:22 +02:00
Alexander Fuhr 6fe47bf5b0 Fix rows highlighting after refresh
fixes #6705
2014-08-19 17:32:17 +02:00
Johannes Meyer 3573908071 Let downtime view look more list-like and fix downtime end calculation
refs #6637
2014-08-19 17:03:35 +02:00
Alexander Klimov 3e079efe2a SecurityForm: replace `customvars' with `protected_customvars'
refs #6641
2014-08-19 14:51:30 +02:00
Alexander Fuhr 7035099468 Fix the host_unhandled_service_count error
fixes #6833
2014-08-19 14:43:24 +02:00
Alexander Klimov 65473ac8ee Monitoring config: use SecurityForm
refs #6641
2014-08-19 14:04:00 +02:00
Alexander Klimov 1ba3954b95 Monitoring config: implement SecurityForm
refs #6641
2014-08-19 14:02:26 +02:00
Alexander Klimov 6b468b7f9b Monitoring_ConfigController: make writeConfiguration's parameter `file' non-required
refs #6641
2014-08-19 13:51:10 +02:00
Alexander Klimov 0464099764 Monitoring: implement "Security" config tab 2014-08-19 11:19:30 +02:00
Johannes Meyer 332be22f7e Fix object history dates make output look similar to the event history
refs #6637
2014-08-18 15:32:12 +02:00
Johannes Meyer bbddb9ed87 Add limit-control and fix indentation of the eventhistory view
refs #6637
2014-08-18 15:30:59 +02:00
Johannes Meyer 043688e514 Make event history view more fancier
refs #6637
2014-08-15 17:03:03 +02:00
Johannes Meyer cae84a5d7f Fix float formatting of timeline circle margins and widths
fixes #6926
2014-08-15 13:39:02 +02:00
Johannes Meyer 54461f9319 Treat hard states more severe than soft states
fixes #6571
2014-08-15 12:40:56 +02:00
Johannes Meyer dc8181cdc5 Escape linefeeds and carriage returns in commands and show them as html
fixes #6088
2014-08-14 10:23:04 +02:00
Johannes Meyer b5d6481c12 Make it possible to translate the process info view
refs #6610
2014-08-13 15:52:33 +02:00
Johannes Meyer 7311ab964e Do not set the full url from the request as action with form parameters
Setting an url with parameters named like form elements in a form with
method POST causes Zend to ignore any POST data because GET will be
processed with higher priority.

fixes #6806
2014-08-13 14:50:21 +02:00
Johannes Meyer fe63ce664f Make use if 'ignore´ instead of explicitly unsetting array keys
refs #5525
2014-08-12 13:57:28 +02:00
Johannes Meyer f23bf912eb Remove obsolete use statements 2014-08-12 09:49:52 +02:00
Johannes Meyer be14844fa8 Merge EditInstanceForm with CreateInstanceForm and rename it
As with the backend form, a user might like to change the name of an
instance. The new form and its actions are also adjusted to suit the new form interface.

refs #5525
2014-08-11 14:49:42 +02:00
Thomas Gelf 96925487bd CLI/monitoring/list: fix DataView-related exception
This uses the renamed DataView serviceStatus instead of the former
status and fixes the problem that CLI still assumed to have fetch
and count function on the DataView.

fixes #6777
2014-07-31 17:24:56 +02:00
Thomas Gelf 51484ebf88 monitoring/Perfdata: ignore invalid min/max
key=23;0;0;0;0 and key=23;;;; lead to division by zero exceptions
This should fix this by ignoring empty strings for min/max (formerly
it got "converted" to float(0)) and also ignores min == max.

fixes #6828
2014-07-31 16:52:34 +02:00
Johannes Meyer 5a738112ea Remove isExistingBackend/-Instance
It is more efficient to access configuration files only once instead of
accessing them multiple times in different locations.

refs #5525
2014-07-25 16:02:13 +02:00
Johannes Meyer d7ed6bd249 Adjust removebackend-action to suit the new backend form interface
Drops additionally the ConfirmRemovalForm of the monitoring module
as there is already one in icingaweb2's form-set.

refs #5525
2014-07-25 16:00:38 +02:00
Johannes Meyer a78d11345b Adjust createbackend-action to suit the new backend form interface
refs #5525
2014-07-25 15:58:44 +02:00
Johannes Meyer b743cf8143 Adjust editbackend-action to suit the new backend-form interface
refs #5525
2014-07-25 14:55:36 +02:00
Johannes Meyer 488ea4633d Merge EditBackendForm with CreateBackendForm and rename it
It is not necessary to distinct between whether a backend is created or
edited as a user perhaps likes to change the name of a backend directly
instead of the need to remove and recreate it.

refs #5525
2014-07-25 14:50:53 +02:00
Johannes Meyer af5a3262be Revert backslash removal in front of namespace-less use statement 2014-07-25 09:12:12 +02:00
Johannes Meyer 26d42da635 Re-add getResourcesByType as simplified version
refs #5525
2014-07-25 08:58:50 +02:00
Johannes Meyer a6bd802e3e Remove unnecessary properties and its getters/setters
refs #5525
2014-07-25 08:58:11 +02:00
Johannes Meyer 5f7652133e Fix code-style and documentation 2014-07-25 08:39:27 +02:00
Alexander Klimov a4b7204e23 Contactgroups view: correct links to contacts detail pages
fixes #6514
2014-07-23 13:10:09 +02:00
Alexander Klimov a2809552f2 Do not use htmlspecialchars in view scripts
fixes #6759
2014-07-23 12:41:05 +02:00
Eric Lippmann 9269a0cbd5 Revert "Do not use htmlspecialchars in view scripts"
This reverts commit 607aa9b203.

`Perfdata::escape()' does not exist. But `Perfdata::view::escape()' does.
2014-07-23 12:29:27 +02:00
Alexander Klimov 607aa9b203 Do not use htmlspecialchars in view scripts
fixes #6759
2014-07-23 12:12:49 +02:00
Matthias Jentsch cb27a3d0f1 Do not use height and width in bar charts, to avoid layout errors 2014-07-22 17:57:40 +02:00
Matthias Jentsch 0a500efd8a Determine the max value in LinearUnit dynamically
The range between min and max should always be divisable by the amount of
ticks, to ensure that the vertical lines are always at a full discrete value.

fixes #6769
2014-07-21 17:21:54 +02:00
Matthias Jentsch 53c9292b41 Fix BarChart padding in Dashboard
Use max-width instead of width in the chart layout to make better use of the available space, but prevent the charts from growing too big. Use a bigger weight and height in the default dashboard configuration.

fixes #6744
2014-07-21 13:06:35 +02:00
Alexander Klimov f9a274d079 Add contact detail view
refs #4804
refs #6514
2014-07-18 17:35:24 +02:00
Alexander Klimov 96d3406446 Prefer style="clear: both;" rather than Bootstrap's class="clearfix" 2014-07-17 17:46:28 +02:00
Alexander Klimov 882699201d Contacts: replace foreach loop with hardcoded HTML and move the styles to a CSS file 2014-07-17 17:33:45 +02:00
Alexander Klimov eca0d50bae Don't use printf format strings as array keys
An array with printf format strings as keys looks pretty ugly
2014-07-17 11:26:18 +02:00
Johannes Meyer 4d199180b3 We do not want to access $_POST directly if it is possible to avoid it 2014-07-17 09:28:10 +02:00
Johannes Meyer b7f5c8a84d Fix that the default sort order of a view is not being applied
fixes #6644
2014-07-17 09:28:10 +02:00
Alexander Klimov b23e36aa1a Swap array keys and values
Non-hardcoded keys may be not unique
2014-07-16 17:54:06 +02:00
Alexander Klimov 62da942159 Don't close and re-open php tags, remove unneeded spaces
To close and re-open php tags makes no sense if there's nothing between them
2014-07-16 17:54:06 +02:00
Alexander Klimov 1ad263170e Revert "Small fixes"
This reverts commit 8086292b1b.

The commit included too many changes.
2014-07-16 15:30:20 +02:00
Johannes Meyer f1d7cd8b50 Remove forgotten coding standards annotation 2014-07-16 13:59:43 +02:00
Alexander Klimov cb04c42bab Use htmlspecialchars to prevent attacks 2014-07-16 13:10:28 +02:00
Alexander Klimov 8086292b1b Small fixes 2014-07-15 18:00:52 +02:00
Alexander Klimov 4c415aac5c Make contacts' view look more like contactgroups' view 2014-07-15 16:17:02 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Alexander Klimov d021ddebee Make contacts' view work like the downtimes' one
fixes #6513
2014-07-15 10:47:12 +02:00
Johannes Meyer bacea36ad9 Improve piechart limitation and show non-piechart perfdata as well
The perfdata helper did an improper limitation as it might have skipped
valid values due to applying the limit before the filter. When not in compact
view the helper now also shows non-piechart values by using their raw
representation.

refs #6515
2014-07-14 13:48:30 +02:00
Johannes Meyer 5908e9fc70 Do not show pie charts for perfdata values when no percentage is available
refs #6515
2014-07-11 16:32:05 +02:00
Johannes Meyer ec2d1daa6b Perfdata plugin should also have a knowledge about labels
Prior to this change the PerfdataSet only knew the labels of a performance
data value which prevented the Perfdata object from being used
individually.

refs #6515
2014-07-11 16:31:00 +02:00
Johannes Meyer b4dc0f38b3 Fix monitoring backend configuration not showing resource selection fields
fixes #6448
2014-07-10 15:50:52 +02:00
Johannes Meyer 53f3d74103 Fix word wrapping in perfdata labels and values
fixes #6377
2014-07-10 14:54:53 +02:00
Matthias Jentsch b85ac3ab45 Translate labels in the ChartController 2014-07-09 18:13:40 +02:00