Commit Graph

1049 Commits

Author SHA1 Message Date
Matthias Jentsch ab129d094b remove unneeded code 2015-06-02 17:50:31 +02:00
Matthias Jentsch 198834294f Fix table position for perfdata without piecharts
refs #8334
2015-06-02 17:30:24 +02:00
Matthias Jentsch 1e8151bed3 Limit perfdata label size
Add paratentheses when perfdata label size exceeds a certain limit. Display the full label as tooltip.

refs #8334
2015-06-02 17:09:40 +02:00
Matthias Jentsch 8e35bb446a Hide columns with useless information in perfdata table
Hide columns that don't provide any useful information, to reduce the size of the perfdata table.

refs #8334
2015-06-02 16:21:55 +02:00
Matthias Jentsch a5c3782de7 Do not display columns that don't include any values
refs #8334
2015-06-02 15:20:27 +02:00
Eric Lippmann 2da45d2e94 monitoring: Fix link to a host's services in the service grid
refs #7998
2015-06-02 10:07:43 +02:00
Eric Lippmann c01512d5e9 monitoring: Fix link to unhandled services of a host
refs #7998
2015-06-02 10:07:13 +02:00
Eric Lippmann 0ce2227385 monitoring: Don't add class active to followed links of a host's service summary
The links now open in the next container. Managing active state of followed links is not yet possible.

refs #7998
2015-06-02 10:06:54 +02:00
Eric Lippmann 9b4f3c9f60 monitoring: Readd link to all configured hosts 2015-06-01 17:25:10 +02:00
Eric Lippmann 34edf87461 monitoring: Readd link to all configured services 2015-06-01 17:24:34 +02:00
Eric Lippmann fa1a5c609d monitoring: Open links of a host's service summary in the next container
refs #7998
2015-06-01 17:21:11 +02:00
Matthias Jentsch 1901f0af98 Improve .ini file formatting
End every file with a newline, and only display 1 empty line between each section, to improve readabillity.

fixes #8706
2015-06-01 16:12:02 +02:00
Matthias Jentsch 29cc92a3f3 Display acknowledgement action for all unacknowledged objects
Instead of displaying the ack for all unhandled problem host, make acknowledgement possible for all monitored objects in multi views.

fixes #7931
2015-06-01 12:24:29 +02:00
Alexander A. Klimov d7e850da0e Show at most 5 pie charts in the services list
refs #8205
2015-05-29 18:41:07 +02:00
Alexander A. Klimov 9a141d5e3c Sort Perfdata by ::worseThan() DESC
refs #8205
2015-05-29 18:39:16 +02:00
Matthias Jentsch a298197e6c Fix layout of action lincs in view
refs #6392
2015-05-28 15:31:50 +02:00
Matthias Jentsch eb5c48ade9 Access correct resolver function in IconImage
refs #6392
2015-05-28 15:21:56 +02:00
Matthias Jentsch 3b601decc5 Remove unused ResolceMacro Helper
refs #6392
2015-05-28 15:15:07 +02:00
Matthias Jentsch a66949162b Resolve macros when accessing getters on MonitoredObjects
refs #6392
2015-05-28 15:01:10 +02:00
Matthias Jentsch 37f58e55d8 Move macro resolcing functionality into separate class
Make macro resolving functionality available to all code, instead of depending on a view

resf #6392
2015-05-28 14:44:16 +02:00
Eric Lippmann e0fe6440d2 monitoring: Show host's services in the next container
refs #7998
2015-05-28 12:26:22 +02:00
Eric Lippmann 8dbb215e27 monitoring: Remove services action from the ShowController
refs #7998
2015-05-28 12:25:31 +02:00
Matthias Jentsch 6c44f6a11a Deduplicate url-attribute parsing code
Use function to fetch all host links in MonitoredObject instead.
2015-05-28 10:47:44 +02:00
Matthias Jentsch a7135bad62 Resolve runtime macros in notes too
refs #8235
2015-05-26 16:49:08 +02:00
Matthias Jentsch 4ac7557c2f Show host and service notes in the host and service detail view
refs #8235
2015-05-26 16:40:32 +02:00
Eric Lippmann 1d22d0c989 monitoring: Fix wrong partial time when a downtime expires 2015-05-22 16:50:24 +02:00
Eric Lippmann 53ca68903a Merge branch 'bugfix/time-formatting-6778'
fixes #6778
2015-05-22 11:34:43 +02:00
Eric Lippmann 873bc22a1e monitoring: Fix date and time formatting for comments
refs #6778
2015-05-22 10:22:14 +02:00
Eric Lippmann da97523fa0 monitoring: Fix duration, date and time formatting for downtimes
refs #6778
2015-05-22 10:06:55 +02:00
Eric Lippmann d17842b485 monitoring: Fix usage of the dropped DateTimeRenderer
refs #6778
2015-05-22 09:33:30 +02:00
Eric Lippmann d187d77a7f monitoring: Use timeAgo in the comment-description partial
refs #6778
2015-05-22 09:29:33 +02:00
Matthias Jentsch 54f72377c5 Do not display mouse-over effect in comment multi-view 2015-05-21 16:28:00 +02:00
Matthias Jentsch f808d373ea Display image icon tooltip instantly
refs #9300
2015-05-21 15:02:23 +02:00
Matthias Jentsch 598ef1e8f4 Add alt-text to icon_images
Print alt-text as title and alt-attribute in the helper class and add the alt-column to the backend query.

refs #9300
2015-05-21 14:59:12 +02:00
Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/hostgroups.phtml
	modules/monitoring/application/views/scripts/process/info.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
	modules/monitoring/public/css/module.less
2015-05-21 14:57:01 +02:00
Matthias Jentsch ee6c669441 Deduplicate code and fix layout
Move icon rendering code into a separate for better maintainabillity.

refs #8665
2015-05-21 11:40:08 +02:00
Matthias Jentsch c0cf6e4918 Display icon_images in all host and service detail views
refs #8665
2015-05-19 18:08:26 +02:00
Eric Lippmann 0a8c9ad195 Merge branch 'feature/list-number-of-hosts-in-host-groups-8054'
resolves #8054
2015-05-19 15:10:20 +02:00
Eric Lippmann afe07f4814 Revert "Hostgroups view: reduce "Last Problem" column's width"
This reverts commit 8b08473341.

Common table style is subject of #8935.

refs #8054
2015-05-19 13:45:20 +02:00
Eric Lippmann 3296522d90 Merge branch 'feature/Allow-to-add-columns-to-monitoring-views-via-URL-4498'
resolves #4498
2015-05-19 13:35:04 +02:00
Eric Lippmann 979f16e5f6 Use date and time format view helper function in the monitoring health view
I'm about to drop the DateFormat view helper class.

refs #6778
2015-05-19 10:13:58 +02:00
Eric Lippmann 8f40d76cca Use date format view helper function in the event grid
I'm about to drop the DateFormat view helper class.

refs #6778
2015-05-19 10:11:12 +02:00
Eric Lippmann 7212c038f1 Don't show ago, since, ... for monitoring list views in the dashboard
refs #6778
2015-05-19 10:00:27 +02:00
Eric Lippmann 3fdf1d2a5c Use timeAgo in the event history overview
refs #6778
2015-05-19 09:57:46 +02:00
Matthias Jentsch 94555d7998 Streamline layout of all multi-views
Fix small inconsistencies between layout of downtime, comment, service and host multi-views.
2015-05-18 17:17:30 +02:00
Alexander A. Klimov 0bde465295 Rename ::extraColumns() to ::addColumns()
refs #4498
2015-05-18 16:29:33 +02:00
Matthias Jentsch 592d5eadc1 Merge branch 'feature/improve-multi-select-view-8565' 2015-05-18 16:00:52 +02:00
Matthias Jentsch 1f20ba1bc6 Fix state summary base target in multi views
refs #8565
2015-05-18 15:48:04 +02:00
Matthias Jentsch 342a8a39d1 Fix state summary in multi views
refs #8565
2015-05-18 14:58:51 +02:00
Matthias Jentsch e84491d438 Improve multi view layout
refs #8565
2015-05-18 14:49:06 +02:00
Eric Lippmann 9ffeffdf09 Show when an object's dowtime was added
refs #6778
2015-05-18 14:39:36 +02:00
Eric Lippmann 13a38c9d18 Revert "Add new line between comment author and creation time in the detail views"
This reverts commit 229e266daf.

The new line does not help for improving the layout but makes it more confusing.
2015-05-18 14:36:35 +02:00
Eric Lippmann e49f938f56 Use timeSince and timeUntil when displaying object downtimes
refs #6778
2015-05-18 14:33:49 +02:00
Eric Lippmann bd51bed9d7 Use timeSince and timeUntil in the dowtimes overview
refs #6778
2015-05-18 14:18:22 +02:00
Eric Lippmann e1f6aee2e7 Use timeAgo in the notifications overview
refs #6778
2015-05-18 14:17:48 +02:00
Marius Hein f4d25a71c8 Merge branch 'master' into feature/service-actions-9284 2015-05-18 14:07:41 +02:00
Matthias Jentsch fe2ee3617b Remove pie charts from multi-views
refs #8565
2015-05-18 13:56:35 +02:00
Alexander A. Klimov 4ff7d7a845 Don't parse $object->check_execution_time w/ regex as it's always a float (or null) 2015-05-18 13:37:38 +02:00
Marius Hein 62d8c441f8 Add ServiceActionsHook
refs #9284
2015-05-18 11:45:39 +02:00
Alexander A. Klimov 533c980a29 Show only three significant digits in check execution time
fixes #8849
2015-05-15 17:32:13 +02:00
Johannes Meyer fbf0ad4339 Drop interface Browsable
We're not required to handle objects of Zend_Paginator in any way, so
creating such as part of a query is not necessary since QueryAdapter
accepts any instance of QueryInterface. (gets enforced in the near future)

refs #8339
2015-05-15 14:37:41 +02:00
Alexander A. Klimov 8b08473341 Hostgroups view: reduce "Last Problem" column's width 2015-05-15 12:34:59 +02:00
Alexander A. Klimov c7d1a7211f Show host states in host groups 2015-05-15 11:28:16 +02:00
Alexander A. Klimov e879ba445d List number of hosts in host groups
refs #8054
2015-05-13 18:15:04 +02:00
Alexander A. Klimov ab2f8e09d6 Calculate states for host group view from host states
refs #8860
2015-05-13 16:31:25 +02:00
Alexander A. Klimov 9e4c00506d Revert "Display performance data metrics with value 0"
This reverts commit 3c73f28157.
2015-05-12 17:22:25 +02:00
Alexander A. Klimov 3c73f28157 Display performance data metrics with value 0
fixes #8744
2015-05-12 17:19:20 +02:00
Matthias Jentsch 25f397042b Merge branch 'master' into feature/improve-multi-select-view-8565
Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php
	modules/monitoring/application/views/scripts/hosts/show.phtml
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
	modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
	modules/monitoring/application/views/scripts/services/show.phtml
	modules/monitoring/public/css/module.less
	public/js/icinga/behavior/tooltip.js
2015-05-11 13:28:43 +02:00
Matthias Jentsch fff2d5c816 Use consistent controller names
refs #8624
2015-05-07 17:29:46 +02:00
Matthias Jentsch 83efc3a4a3 Conform to coding guidelines 2015-05-07 17:23:50 +02:00
Matthias Jentsch b314c074cc Fix downtime and comment form redirects
refs #8624
2015-05-07 16:20:59 +02:00
Matthias Jentsch 4463f16f04 Add abbillity to remove multiple comments by id
refs #8624
2015-05-07 15:11:54 +02:00
Matthias Jentsch b35dd4ddfe Separate forms for deleting single and multiple comments
refs #8624
2015-05-07 14:03:09 +02:00
Matthias Jentsch 7c8ff44fd1 Fix comment and downtime list inline forms
refs #8903
refs #8902
2015-05-07 10:59:37 +02:00
Matthias Jentsch e5e3e80300 Conform to coding guidelines 2015-05-07 10:59:36 +02:00
Matthias Jentsch 5477a2f18e Escape missing variables
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch e6740c5093 Set link target to next page in all comment views
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch 0c7d8ab481 Add controlle for handling multiple comments
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch ca839d5123 Display amount of selected rows
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch cab198eadc Fix whitespaces and unused comments 2015-05-07 10:59:36 +02:00
Matthias Jentsch 32da02c162 Deduplicate comment views
Move comment detail and description into separate partial to reduce code duplication
2015-05-07 10:59:36 +02:00
Matthias Jentsch dedc175967 Add basic comment detail view
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch a46dece136 Provie link to detail view in downtime partial
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch be566746a9 Provide downtime header in remove and remove-all commands
Add new show script for downtimes and move downtime headers into partials to deduplicate code.

refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch b186ce2cac Handle non-existed downtime ids with exceptions
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 400f351ea5 Improve detail view layout
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 07c5e67304 Display additional downtime info in multiselection detail view
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch a87e1f91d9 Implement detail view for multiple downtimes
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 20b25e656b Show better error message for unknown downtimes
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 9114a34223 Display host and service state in downtime detail area
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch ab0720fe95 Add support for multi-selection to downtime list
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch bb7afd9b2b Add tooltips to downtime detail view
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch ff47b892e9 Improve order and content of downtime properties
Add rows for missing properties, reorder and group related properties.

refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 7b6641dc84 Add basic downtime controller and views
refs #8902
2015-05-07 10:34:06 +02:00
Michael Friedrich defda53ff5 Show icinga program version in Monitoring Health
Also emphasize on the backends used.

fixes #9207
2015-05-05 17:02:45 +02:00
Alexander Fuhr 0e4201a997 Add info about the active ido endpoint to monitoring health overview
resolves #9223
2015-05-05 15:20:25 +02:00
Alexander A. Klimov a976d777b3 Show custom variables visually separated in the host and service detail views
resolves #8966
2015-04-23 13:31:02 +02:00
Alexander A. Klimov e4a9843021 Show Icinga 2 boolean variables in the host and service detail views
resolves #8747
2015-04-23 12:38:29 +02:00
Alexander A. Klimov 6ba6cb7940 Improve layout of dictionaries in the host and service detail views
resolves #8474
2015-04-23 11:58:54 +02:00
Johannes Meyer 1e064a5379 Revert "Fix host and service multiselection"
This reverts commit 1f4b3aa8ea.
2015-04-20 16:13:03 +02:00
Johannes Meyer f11ea04557 Revert "Require `host_name' instead of `host' to show or list particular objects"
This reverts commit b93d18a0fc.
2015-04-20 16:11:22 +02:00
Johannes Meyer 894457a1c1 Revert "Adjust command links so that they'll use `host_name' instead of `host'"
This reverts commit b9aee47d1f.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-04-20 16:11:08 +02:00
Johannes Meyer 96fb0370a4 Revert "Require `service_description' instead of `service' to show a particular service"
This reverts commit 09ab601942.
2015-04-20 16:09:14 +02:00
Johannes Meyer 9bbb23ae7d Revert "Adjust command links so that they'll use `service_description'"
This reverts commit cee189a5fc.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-04-20 16:08:51 +02:00
Johannes Meyer da7aa23820 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 15:20:23 +02:00
Johannes Meyer 0997eaf459 Host detail view: Fix that the list of services is missing all tabs
refs #7876
2015-04-20 14:56:30 +02:00
Matthias Jentsch 423b92f8dc Remove gravity settings from servicegrid
refs #9025
2015-04-20 12:02:17 +02:00
Johannes Meyer 54a370ca22 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 11:15:04 +02:00
Johannes Meyer 14a555629d servicegrid: Ensure dashboard compliance
refs #7876
2015-04-17 16:20:29 +02:00
Johannes Meyer c099b7ddd7 eventgrid: Ensure dashboard compliance
refs #7876
2015-04-17 16:20:22 +02:00
Johannes Meyer 78e4df2ce9 monitoring health views: Ensure dashboard compliance
refs #7876
2015-04-17 16:20:06 +02:00
Johannes Meyer b9f9ea6142 service/show: Ensure dashboard compliance
refs #7876
2015-04-17 16:19:38 +02:00
Johannes Meyer b2246c2aff host/show: Ensure dashboard compliance
refs #7876
2015-04-17 16:19:30 +02:00
Johannes Meyer 58b93101c7 multiselect views: Ensure dashboard compliance
refs #7876
2015-04-17 16:18:56 +02:00
Johannes Meyer 7be00791a7 list/eventhistory: Ensure dashboard compliance
refs #7876
2015-04-17 16:15:58 +02:00
Johannes Meyer faa29e3dee list/hostgroups: Ensure dashboard compliance
refs #7876
2015-04-17 16:14:59 +02:00
Johannes Meyer 7ae7bf38c4 list/servicegroups: Ensure dashboard compliance
refs #7876
2015-04-17 16:14:46 +02:00
Johannes Meyer 2190e553be list/comments: Ensure dashboard compliance
refs #7876
2015-04-17 16:14:29 +02:00
Johannes Meyer b9249dac4e list/contactgroups: Ensure dashboard compliance
refs #7876
2015-04-17 16:14:13 +02:00
Johannes Meyer d725b2feb7 list/contacts: Ensure dashboard compliance
refs #7876
2015-04-17 16:13:56 +02:00
Johannes Meyer a09e41e3b8 list/notifications: Ensure dashboard compliance
refs #7876
2015-04-17 16:13:36 +02:00
Johannes Meyer 5f19ec1b2e list/downtimes: Ensure dashboard compliance
refs #7876
2015-04-17 16:13:22 +02:00
Johannes Meyer 29648191e4 list/services: Ensure dashboard compliance
refs #7876
2015-04-17 16:12:56 +02:00
Johannes Meyer 74cf3cf375 list/hosts: Ensure dashboard compliance
refs #7876
2015-04-17 16:12:35 +02:00
Johannes Meyer 073dc31128 Timeline: Ensure dashboard compliance
refs #7876
2015-04-17 16:11:06 +02:00
Johannes Meyer 3f092ffb2d show/contact: Ensure dashboard compliance
refs #7876
2015-04-17 16:10:49 +02:00
Johannes Meyer 9388944283 show/history: Ensure dashboard compliance
refs #7876
2015-04-17 16:10:21 +02:00
Johannes Meyer 5f4a61f36e Alertsummary: Ensure dashboard compliance
refs #7876
2015-04-17 16:09:50 +02:00
Matthias Jentsch 0974b70e0e Display service grid tooltips on the top
fixes #9025
2015-04-16 18:32:47 +02:00
Eric Lippmann 796cbffbd7 Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
2015-04-15 15:43:39 +02:00
Eric Lippmann 229e266daf Add new line between comment author and creation time in the detail views
refs #6778
2015-04-15 15:40:40 +02:00
Eric Lippmann e500715bda Use timeAgo() when displaying comments in the detail views
refs #6778
2015-04-15 15:33:44 +02:00
Johannes Meyer 675d070b86 Set the view property `compact' exactly once
refs #7876
2015-04-15 15:33:00 +02:00
Eric Lippmann 2440308699 Use timeSince() in the host groups view
Instead of prefixedTimeSince() which will be removed.

refs #6778
2015-04-15 15:22:26 +02:00
Eric Lippmann 9b9975bd73 Use timeSince() in the service groups view
Instead of prefixedTimeSince() which will be removed.

refs #6778
2015-04-15 15:21:19 +02:00
Johannes Meyer 5e92171ab7 Drop the `inline' view property, as it's not used anywhere 2015-04-15 15:15:03 +02:00
Eric Lippmann a6a9bd28eb Use timeSince() for the last status change in the service's detail view
Instead of using prefixedTimeSince() which will be removed.

refs #6778
2015-04-15 15:06:15 +02:00
Eric Lippmann b84452140c Use timeSince() for the last status change in the host's detail view
Instead of using prefixedTimeSince() which will be removed.

refs #6778
2015-04-15 15:02:27 +02:00
Eric Lippmann a4d815051c Add missing break statements in the comments list view 2015-04-15 14:59:30 +02:00
Johannes Meyer 9ef414c9ed Add separator when listing downtimes in the detail view
fixes #9046
2015-04-14 09:20:43 +02:00
Johannes Meyer 644a386bf8 NotificationQuery: Use query column `notification_contact_name'
...instead of `notification_contact'.

refs #8613
2015-04-13 15:26:06 +02:00
Johannes Meyer 15399d77ce NotificationQuery: Use query column `service_description' instead of `service'
refs #8613
2015-04-13 15:25:10 +02:00
Johannes Meyer 96954ea9a1 NotificationQuery: Use query column `host_name' instead of `host'
refs #8613
2015-04-13 15:24:15 +02:00
Johannes Meyer c10617d409 Servicegroups: Use query column `servicegroup_name' instead of `servicegroup'
refs #8613
2015-04-10 16:28:57 +02:00
Johannes Meyer c59d5ac7d5 Hostgroups: Use query column `hostgroup_name' instead of `hostgroup'
refs #8613
2015-04-10 16:28:33 +02:00
Eric Lippmann 291c6bf167 Remove superfluous <br /> after state pending in the hosts overview 2015-04-10 15:36:09 +02:00
Eric Lippmann 19cae4b751 Don't show last status change for services if they're in state pending 2015-04-10 15:31:20 +02:00
Johannes Meyer 1f4b3aa8ea Fix host and service multiselection
refs #8613
2015-04-10 15:04:59 +02:00
Eric Lippmann 2854859a67 Use timeSince() for displaying status changes of services instead of prefixedTimeSince()
Note that only the services view excluded the prefix from time diffs when being displayed in the dashboard. I'll readd that for both hosts and services later on.
Further, note that only the hosts view excludes the date of the status change when in state pending. I'll add that for the services view too.

refs #6778
2015-04-10 14:27:34 +02:00
Johannes Meyer 1c32d8ebe5 DowntimeQuery: Add _name suffix to the query column `downtime_author'
...to indicate that it's a case-sensitive column.

refs #8613
2015-04-10 14:23:05 +02:00