Commit Graph

937 Commits

Author SHA1 Message Date
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
Eric Lippmann d5427f03ab Use timeSince() for displaying status changes of hosts instead of prefixedTimeSince()
refs #6778
2015-04-10 14:22:06 +02:00
Johannes Meyer fda261bf22 Use case-sensitive query columns when filtering downtimes by object
refs #8613
2015-04-10 14:19:38 +02:00
Eric Lippmann 1dcb3b3ad2 Use timeUntil() for the comment expiration date and time
refs #6778
2015-04-10 13:20:41 +02:00
Eric Lippmann dc757e3b19 Use timeAgo() for the comment creation date and time instead of prefixedTimeSince()
refs #6778
2015-04-10 12:56:49 +02:00
Johannes Meyer 0fe59aa519 Revert "ContactQuery: Provide ci query columns for aliases and email addresses"
This reverts commit f00adc2138.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
2015-04-10 12:23:35 +02:00
Johannes Meyer 5ec4919aa6 Do not filter for `contactgroup' in case the concrete group name is known
refs #8613
2015-04-10 12:14:47 +02:00
Eric Lippmann df3caa61e9 Improve notifications view component for objects
The old view did not show a hyphen if the user lacked the permissions to send a notification and if viewing a host or service not currently in a problem state.
Further the tooltip for send notification was bad English and the view generated a superfluous <br>.
2015-04-10 10:46:19 +02:00
Eric Lippmann 5efc343f03 Add full stop to sentences in the notifications view component for objects
refs #6778
2015-04-10 10:28:17 +02:00
Eric Lippmann d6374d4770 Use timeAgo() instead of timeSince() for an object's last check
refs #6778
2015-04-10 10:27:57 +02:00
Eric Lippmann 613de61e6d Improve English for "The last one occured %s ago" in the notifications view component for objects
fixes #8950
2015-04-10 10:24:15 +02:00
Eric Lippmann 80ab64e2b4 Fix typos in the notifications view partial for objects 2015-04-10 10:21:54 +02:00
Eric Lippmann e6f070d068 Use timeAgo() instead of timeSince() when displaying object notifications
refs #6778
2015-04-10 10:20:10 +02:00