1469 Commits

Author SHA1 Message Date
Johannes Meyer
1e064a5379 Revert "Fix host and service multiselection"
This reverts commit 1f4b3aa8ea66ac51275d050c19f0801da033d2d7.
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 b93d18a0fc2507d360f122afdfb27317b7708fd4.
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 b9aee47d1f44893ef953bf9168e21f368b95ed7f.

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 09ab6019423e858d222a570c65f247bfcb09e62f.
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 cee189a5fc2b94173eda5587ab5a5ce4125a06d0.

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