34edf87461
monitoring: Readd link to all configured services
2015-06-01 17:24:34 +02:00
fa1a5c609d
monitoring: Open links of a host's service summary in the next container
...
refs #7998
2015-06-01 17:21:11 +02:00
7b9983de38
Merge the menu entries for users, groups and roles into "Authentication"
2015-06-01 17:16:24 +02:00
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
c7ce1498bf
Introduce menu entry "Configuration"
2015-06-01 16:10:23 +02:00
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
d7e850da0e
Show at most 5 pie charts in the services list
...
refs #8205
2015-05-29 18:41:07 +02:00
9a141d5e3c
Sort Perfdata by ::worseThan() DESC
...
refs #8205
2015-05-29 18:39:16 +02:00
6e24cfd538
Implement ::worseThan()
...
refs #8205
2015-05-29 18:29:45 +02:00
1f36e545d9
Implement ::getState()
...
refs #8205
2015-05-29 17:26:56 +02:00
42d9f05c0f
monitoring: Apply host and service restrctions to the comments overview
...
refs #9009
2015-05-29 15:39:41 +02:00
46fdaf4698
monitoring: Fix select columns for the comment data views
...
refs #9009
2015-05-29 15:38:03 +02:00
54eb0eaf22
monitoring: Add restrictable filter columns to the comment data view
...
refs #9009
2015-05-29 15:37:05 +02:00
41bc4e3b21
monitoring: Provide downtime_author only as filter column
...
refs #9009
2015-05-29 15:36:42 +02:00
16ab26cb7c
monitoring: Remove unused alias from the downtime query
...
refs #9009
2015-05-29 15:36:03 +02:00
85c21b042d
monitoring: Use the host and service comment queries in the comment query
...
refs #9009
2015-05-29 15:35:39 +02:00
82644b6122
monitoring: Add service comment data view
...
refs #9009
2015-05-29 15:35:08 +02:00
3c15b2b972
monitoring: Add service comment query
...
refs #9009
2015-05-29 15:34:52 +02:00
a9680bfd68
monitoring: Add host comment data view
...
refs #9009
2015-05-29 15:34:38 +02:00
ebe8a409e3
monitoring: Add host comment query
...
refs #9009
2015-05-29 15:34:18 +02:00
bb97269c55
monitoring: Use the Hostdowntime data view in the HostList
...
refs #9009
2015-05-29 15:10:14 +02:00
f1bb064020
monitoring: Use the Servicedowntime data view in the ServiceList
...
refs #9009
2015-05-29 15:10:00 +02:00
2cbadbf957
Revert "monitoring: Don't select host last ack, comment and downtime"
...
This reverts commit e240f7b955#7344
refs #9009
2015-05-29 15:09:21 +02:00
0729973045
monitoring: Add last *comment columns to the host status queries
2015-05-29 15:07:06 +02:00
a93ef04d5d
Revert "Add new tab to switch between host and service multi-selection"
...
This reverts commit 45a0982beb
2015-05-29 13:30:02 +02:00
e71682ffb3
monitoring: Don't join downtimes in the servicestatus query
...
refs #9009
2015-05-29 13:20:01 +02:00
ba07077ca8
monitoring: Don't join downtimes in the hoststatus query
...
refs #9009
2015-05-29 13:13:28 +02:00
6e94755c4c
monitoring: Use host and service downtime query in the downtime query
...
refs #9009
2015-05-29 13:12:34 +02:00
b833a04110
monitoring: Add data view for service downtimes
...
refs #9009
2015-05-29 13:12:03 +02:00
02cabf3a50
monitoring: Add query for service downtimes
...
refs #9009
2015-05-29 13:11:48 +02:00
22a83b7388
monitoring: Add data view for host downtimes
...
refs #9009
2015-05-29 13:11:32 +02:00
3e53426ece
monitoring: Add query for host downtimes
...
refs #9009
2015-05-29 13:10:20 +02:00
3a69e8185f
monitoring: Add restrictable filter columns to the downtime data view
...
refs #9009
2015-05-29 11:44:34 +02:00
b1446fcb23
monitoring: Allow the hoststatus query to be filtered by restrictable columns
...
refs #9009
2015-05-29 11:43:41 +02:00
c17334deee
monitoring: Support restricting the downtimes overview
...
refs #9009
2015-05-29 11:42:05 +02:00
4544653c2e
monitoring: Don't apply restrictions in the downtime query
...
Restrictions should be applied from the controller.
refs #9009
2015-05-29 11:41:39 +02:00
7793b61e4c
monitoring: Combine restrictions w/ OR
...
If a user has more than one filter for the same restriction, the filters will be combined w/ or. The combined filters will then be applied w/ AND to the query.
refs #9009
2015-05-29 11:40:26 +02:00
41be32adff
monitoring: Provide only the monitoring/filter/objects restriction
...
We'll combine the hosts and services filter restrictions into a single restriction.
refs #9009
2015-05-29 11:23:47 +02:00
9f155ea99d
monitoring: Don't show SSH command when transporting a command to a remote command file failed
...
refs #8006
2015-05-28 16:33:35 +02:00
a4a1a296d1
monitoring: Reduce error output when transporting a command to a local command file failed
...
refs #8006
2015-05-28 16:13:35 +02:00
1a51368a76
Fix MacroTest
...
Pushing failing tests to the master is a mystery to me.
refs #6392
2015-05-28 16:08:21 +02:00
8309ab336d
Merge branch 'feature/resolve-runtime-macros-6392'
...
resolves #6392
2015-05-28 15:42:16 +02:00
c7261bd481
Add missing columns for macro expansion
...
refs #6392
2015-05-28 15:37:01 +02:00
a298197e6c
Fix layout of action lincs in view
...
refs #6392
2015-05-28 15:31:50 +02:00
eb5c48ade9
Access correct resolver function in IconImage
...
refs #6392
2015-05-28 15:21:56 +02:00
3b601decc5
Remove unused ResolceMacro Helper
...
refs #6392
2015-05-28 15:15:07 +02:00
2572842aa4
Add unit test cases for the new macro syntax
...
refs #6392
2015-05-28 15:07:46 +02:00
60e5608b40
Rename ResolveMacroTest
...
refs #6392
2015-05-28 15:02:58 +02:00
a66949162b
Resolve macros when accessing getters on MonitoredObjects
...
refs #6392
2015-05-28 15:01:10 +02:00
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
f3a37e9575
Update documentation for resources and instances
...
I've just only renamed the identity_key to the private_key thats it
refs #7595
2015-05-28 14:15:01 +02:00
49589128ef
Rename identity_key with private_key in ssh resource
...
refs #7595
2015-05-28 14:09:13 +02:00
58d78f59f3
DbQuery: Initialize self::$select as early as possible
...
I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query...
2015-05-28 13:49:36 +02:00
5fdaa2cd7e
monitoring: Fix command links when showing multiple selected hosts
...
fixes #9327
2015-05-28 13:17:00 +02:00
e0fe6440d2
monitoring: Show host's services in the next container
...
refs #7998
2015-05-28 12:26:22 +02:00
8dbb215e27
monitoring: Remove services action from the ShowController
...
refs #7998
2015-05-28 12:25:31 +02:00
b3e0851b62
monitoring: Remove the services tab when showing an object's history
...
refs #7998
2015-05-28 12:24:00 +02:00
646cffd62d
monitoring: Remove the services tab when showing host or service details
...
refs #7998
2015-05-28 12:22:57 +02:00
a47d05a038
Add identity key usage for a specific user in remote command
...
refs #7595
fixes #7447
2015-05-28 10:51:56 +02:00
558120e23b
Add resource ssh usage to resources and instances
...
refs #7595
2015-05-28 10:50:13 +02:00
6c44f6a11a
Deduplicate url-attribute parsing code
...
Use function to fetch all host links in MonitoredObject instead.
2015-05-28 10:47:44 +02:00
9fdf2a215c
Update instance documentation with the usage of a ssh resource
...
refs #7595
2015-05-28 10:43:30 +02:00
344e17a605
monitoring: Fix command links when showing multiple selected hosts
...
fixes #9327
2015-05-28 10:33:13 +02:00
38cecdb724
Setup Wizard: show how to add a system group "icingaweb2" and how to add the webserver's user to it
...
refs #8705
2015-05-27 11:39:13 +02:00
0c1df335fc
monitoring: Fix select columns for downtimes, again
...
refs #9009
refs #9319
2015-05-26 17:15:03 +02:00
61565543ab
monitoring: Fix downtime filter columns
...
refs #9009
refs #9319
2015-05-26 17:10:23 +02:00
cd1ee3e306
monitoring: Fix select columns for downtimes
...
refs #9009
refs #9319
2015-05-26 17:07:58 +02:00
bb9b9bc754
monitoring: Apply host and service restrictions to downtimes
...
refs #9009
refs #9319
2015-05-26 17:05:47 +02:00
788481e2b1
monitoring: Add Servicestatus query
...
refs #7344
refs #9009
2015-05-26 17:02:41 +02:00
18499a4a59
monitoring: Support joining downtimes on the Hoststatus query
...
refs #7344
refs #9009
2015-05-26 17:02:13 +02:00
b0576d93de
monitoring: Support selecting NULL as column
...
refs #9009
2015-05-26 17:00:56 +02:00
b24e3393f0
monitoring: Prohibit sorting the HostStatus data view by service columns
...
refs #7344
refs #9009
2015-05-26 17:00:48 +02:00
e240f7b955
monitoring: Don't select host last ack, comment and downtime
...
Where unsure whether or not we will still support this.
refs #7344
refs #9009
2015-05-26 17:00:39 +02:00
c81d13d77a
monitoring: Use the HostatusQuery in the HostStatus data view
...
refs #7344
refs #9009
2015-05-26 17:00:34 +02:00
e9dd69267c
monitoring: Prepare HoststatusQuery to be used when viewing hosts
...
The Hoststatusquery does not include the joins for last ack, comment and downtime as where unsure whether or not we will still support this.
refs #7344
refs #9009
2015-05-26 17:00:24 +02:00
a7135bad62
Resolve runtime macros in notes too
...
refs #8235
2015-05-26 16:49:08 +02:00
4ac7557c2f
Show host and service notes in the host and service detail view
...
refs #8235
2015-05-26 16:40:32 +02:00
ec556edc65
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-26 09:28:35 +02:00
ea8c497539
Fix exception when following command links for multiple selected hosts
2015-05-22 16:51:23 +02:00
1d22d0c989
monitoring: Fix wrong partial time when a downtime expires
2015-05-22 16:50:24 +02:00
59ff4221f6
CommandTransport: Make sure to reset the config before calling current()
2015-05-22 14:01:11 +02:00
53ca68903a
Merge branch 'bugfix/time-formatting-6778'
...
fixes #6778
2015-05-22 11:34:43 +02:00
8d6d52f9db
monitoring: Fix date and time formatting in the timeline
...
refs #6778
2015-05-22 10:59:17 +02:00
873bc22a1e
monitoring: Fix date and time formatting for comments
...
refs #6778
2015-05-22 10:22:14 +02:00
da97523fa0
monitoring: Fix duration, date and time formatting for downtimes
...
refs #6778
2015-05-22 10:06:55 +02:00
265725447d
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-22 10:06:31 +02:00
d17842b485
monitoring: Fix usage of the dropped DateTimeRenderer
...
refs #6778
2015-05-22 09:33:30 +02:00
d187d77a7f
monitoring: Use timeAgo in the comment-description partial
...
refs #6778
2015-05-22 09:29:33 +02:00
2bdb725370
Merge branch 'bugfix/monitoring-controllers-response-codes-6281'
...
fixes #6281
2015-05-22 09:27:51 +02:00
e137263c4b
monitoring: Fix HTTP response code when showing an invalid comment
...
refs #6281
2015-05-22 09:20:27 +02:00
8f42d7a1d3
monitoring: Fix HTTP response code when showing an invalid downtime
...
refs #6281
2015-05-21 17:17:25 +02:00
57abafd10b
Merge branch 'master' into bugfix/customvars-case-insensitive-8696
2015-05-21 16:51:04 +02:00
54f72377c5
Do not display mouse-over effect in comment multi-view
2015-05-21 16:28:00 +02:00
0b81a1130f
monitoring: Fix HTTP response code when showing an invalid host
...
refs #6281
2015-05-21 16:18:09 +02:00
e8c704b98d
monitoring: Fix HTTP response code when showing an invalid service
...
refs #6281
2015-05-21 16:18:09 +02:00
ce9110d22d
Revert "Add proper respond http codes to service and host controller"
...
This reverts commit 6df031dc78#6281
2015-05-21 16:14:02 +02:00
7c04664888
Make MySQL collation syntax default
...
Overwrite customVarsJoinTemplate for Postgres and Oracle.
refs #8696
2015-05-21 16:09:03 +02:00
8ce9989243
Merge branch 'feature/support-icon-image-alt-9300'
...
resolves #9300
2015-05-21 15:03:06 +02:00
f808d373ea
Display image icon tooltip instantly
...
refs #9300
2015-05-21 15:02:23 +02:00
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
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
e8e3b940af
Use CustomVariable names case insensitive
...
refs #8696
2015-05-21 14:42:09 +02:00
47f21eebaa
Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'
...
fixes #8241
2015-05-21 14:05:49 +02:00
57328aa6ed
monitoring: Make host group and service group alias columns case insensitive
...
The alias columns should be case insenstive because we now support them when searching.
refs #8241
2015-05-21 13:58:54 +02:00
0c72686ba1
monitoring: Make display_name columns case insensitive
...
The display_name columns should be case insenstive because we now support them when searching.
refs #8241
2015-05-21 12:46:47 +02:00
ad5ab16b3f
monitoring: Drop the Groupsummary data view
...
We have Hostgroupsummary and Servicegroupsummary now.
refs #8241
2015-05-21 12:43:27 +02:00
e0c6ce58c3
monitoring: Fix sort control columns for the service group summary
...
refs #8241
2015-05-21 12:42:53 +02:00
0db7cfca88
monitoring: Default to the sort rules of the service group summary
...
refs #8241
2015-05-21 12:41:59 +02:00
1a1f93db23
monitoring: Add sort rules to the service group summary
...
refs #8241
2015-05-21 12:41:29 +02:00
e7396ea49c
monitoring: Add services_severity to the service group summary data view
...
refs #8241
2015-05-21 12:38:58 +02:00
89bac33595
monitoring: Fix sort control columns for the host group summary
...
refs #8241
2015-05-21 12:38:20 +02:00
73eb8cc805
monitoring: Add sort rule for total services to the host group summary
...
refs #8241
2015-05-21 12:37:53 +02:00
4b9f7eb910
monitoring: Default to the sort rules of the host group summary
...
refs #8241
2015-05-21 12:36:05 +02:00
58b3192ce3
monitoring: Add sort rules to the host group summary
...
refs #8241
2015-05-21 12:26:27 +02:00
195275a716
monitoring: Don't hardcode sort direction of the severity columns
...
fixes #9059
2015-05-21 12:20:18 +02:00
82f9425b90
Revert "Make ascending sort by host or service severity initiatable"
...
This reverts commit 386d4db851#9059
2015-05-21 12:20:18 +02:00
87a46ea5b1
Merge branch 'feature/show-icon-images-in-detail-view-8665'
...
fixes #8665
2015-05-21 11:42:57 +02:00
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
a52264aa32
monitoring: Sort by hosts_severity when sorting the host group summary by severity
...
refs #8241
2015-05-21 11:26:10 +02:00
37abc724de
monitoring: Let the host group summary provide the column hosts_severity
...
refs #8241
2015-05-21 11:24:31 +02:00
bbed2cffae
monitoring: Add column hosts_severity to the group summary query
...
refs #8241
2015-05-21 11:23:55 +02:00
ce463d16ef
Reorder group summary query's columns by name
...
refs #8241
2015-05-21 11:19:58 +02:00
cfb819ec61
monitoring: Add missing column to the host group summary data view
...
refs #8241
2015-05-20 17:03:23 +02:00
b9a6e1042d
Merge branch 'master' into bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241
...
Conflicts:
modules/monitoring/application/controllers/ListController.php
2015-05-20 17:02:49 +02:00
80b174f526
monitoring: Servicegroupsummary must not extend Groupsummary which is subject to remove
...
refs #8241
2015-05-20 16:16:21 +02:00
f9952cf231
monitoring: Don't sort the service group summary by service severity
...
refs #8241
2015-05-20 16:15:38 +02:00
a9d6a94957
monitoring: Use the groupsummary query for the service group summary view
...
refs #8241
2015-05-20 16:09:30 +02:00
2dc6d5467d
monitoring: Don't select unnecessary columns in the host group summary
...
refs #8241
2015-05-20 16:07:49 +02:00
d379b27c24
monitoring: Hostgroupsummary must not extend Groupsummary which is subject to remove
...
refs #8241
2015-05-20 15:50:19 +02:00
5efbad3a71
monitoring: Don't sort the host group summary by service severity
...
refs #8241
2015-05-20 15:50:13 +02:00
41e72396ee
monitoring: Use the groupsummary query for the host group summary view
...
refs #8241
2015-05-20 15:50:06 +02:00
2493535ac7
Revert "Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery"
...
This reverts commit 9b4f08eb43#8241
2015-05-20 15:29:45 +02:00
71fa736144
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-20 10:46:55 +02:00
9b4f08eb43
Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery
...
Without this the Hostgroupsummary and Servicegroupsummary DataViews would not work
refs #8241
2015-05-20 10:43:54 +02:00
0b937c86dc
Get columns for FilterEditor::setSearchColumns() from DataView::getSearchColumns()
...
refs #8241
2015-05-19 18:17:41 +02:00
93db1d15cb
Override ::getSearchColumns()
...
refs #8241
2015-05-19 18:17:40 +02:00
6ba07b089d
Implement and use Hostgroupsummary and Servicegroupsummary
...
refs #8241
2015-05-19 18:17:40 +02:00
c0cf6e4918
Display icon_images in all host and service detail views
...
refs #8665
2015-05-19 18:08:26 +02:00
2ed1d6c66b
Implement ::getSearchColumns()
...
refs #8241
2015-05-19 17:36:24 +02:00
36713fb519
Rename parameter $query of ::filterQuery() to $dataView
...
refs #8241
2015-05-19 17:36:23 +02:00
b1b2e3fc21
Revert "Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'"
...
This reverts commit 75b004dc42bd7c7f9636
2015-05-19 17:13:46 +02:00
0a8c9ad195
Merge branch 'feature/list-number-of-hosts-in-host-groups-8054'
...
resolves #8054
2015-05-19 15:10:20 +02:00
fb07f0b94c
Merge branch 'master' into feature/user-and-group-management-8826
...
Conflicts:
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +02:00
a2b262eab1
Take display_name into account when searching for host and service names
...
refs #8241
2015-05-19 14:04:23 +02:00
85dd496d35
Add parameter $searchColumns to ::filterQuery()
...
refs #8241
2015-05-19 14:01:18 +02:00
4cedfce07f
DataView: Fix that method getOffset() calls parent::hasOffset()
2015-05-19 13:57:20 +02:00
a629adb448
DataView: Remove method paginate()
2015-05-19 13:57:20 +02:00
afe07f4814
Revert "Hostgroups view: reduce "Last Problem" column's width"
...
This reverts commit 8b08473341#8935 .
refs #8054
2015-05-19 13:45:20 +02:00
3296522d90
Merge branch 'feature/Allow-to-add-columns-to-monitoring-views-via-URL-4498'
...
resolves #4498
2015-05-19 13:35:04 +02:00
b5a0f7950e
Use PHP's DateTime instead of our DateTimeFactory in the TimeLineController
...
I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.
refs #6778
2015-05-19 11:17:00 +02:00
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
d539a0e017
Add PHPDoc to ::addColumns()
...
refs #4498
2015-05-19 10:11:54 +02:00
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
7212c038f1
Don't show ago, since, ... for monitoring list views in the dashboard
...
refs #6778
2015-05-19 10:00:27 +02:00
3fdf1d2a5c
Use timeAgo in the event history overview
...
refs #6778
2015-05-19 09:57:46 +02:00
f305a334d5
DbConnection: Drop param $columnIndex in fetchColumn(), it's unused
2015-05-19 09:48:20 +02:00
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
0bde465295
Rename ::extraColumns() to ::addColumns()
...
refs #4498
2015-05-18 16:29:33 +02:00
52d1cb8c8f
Merge branch 'bugfix/Toggle-FeaturesCommandForm-make-notifications-more-verbose-9023'
...
fixes #9023
2015-05-18 16:09:07 +02:00
7caba93a28
Replace `...' w/ `..'
...
refs #9023
2015-05-18 16:07:28 +02:00
0e0341f78a
It's the connection which provides a cursor, not the query
2015-05-18 16:01:58 +02:00
592d5eadc1
Merge branch 'feature/improve-multi-select-view-8565'
2015-05-18 16:00:52 +02:00
1f20ba1bc6
Fix state summary base target in multi views
...
refs #8565
2015-05-18 15:48:04 +02:00
c3129890aa
Improve multi-view tabs
...
Display the current object count next to the tab title, to clarify that those views display a summary of multiple items. Only display the current tab for hosts or services, to avoid confusion.
refs #8565
2015-05-18 15:25:12 +02:00
0d48ddcc06
ToggleObjectFeaturesCommandForm::onSuccess(): show a notification for each feature about whether it has been enabled or disabled
...
refs #9023
2015-05-18 15:18:26 +02:00
742dfcaf41
Revert "Fetchable: Add method fetch() which returns an iterator"
...
This reverts commit 7a6837de0e
2015-05-18 15:17:22 +02:00
342a8a39d1
Fix state summary in multi views
...
refs #8565
2015-05-18 14:58:51 +02:00
729fb9a4d1
ToggleInstanceFeaturesCommandForm::onSuccess(): notifications: show which feature has been enabled or disabled
...
refs #9023
2015-05-18 14:51:22 +02:00
e84491d438
Improve multi view layout
...
refs #8565
2015-05-18 14:49:06 +02:00
9ffeffdf09
Show when an object's dowtime was added
...
refs #6778
2015-05-18 14:39:36 +02:00
13a38c9d18
Revert "Add new line between comment author and creation time in the detail views"
...
This reverts commit 229e266daf
2015-05-18 14:36:35 +02:00
e49f938f56
Use timeSince and timeUntil when displaying object downtimes
...
refs #6778
2015-05-18 14:33:49 +02:00
4fbadaea2c
ToggleInstanceFeaturesCommandForm::createElements(): make form labels shorter
...
refs #9023
2015-05-18 14:20:17 +02:00
bd51bed9d7
Use timeSince and timeUntil in the dowtimes overview
...
refs #6778
2015-05-18 14:18:22 +02:00
e1f6aee2e7
Use timeAgo in the notifications overview
...
refs #6778
2015-05-18 14:17:48 +02:00
f4d25a71c8
Merge branch 'master' into feature/service-actions-9284
2015-05-18 14:07:41 +02:00
00bbb762a1
Integrate comments and downtimes into MonitoredObjectsController
...
Add option to list all related commends and downtimes into the specific hosts and serivces views.
refs #8565
2015-05-18 14:03:10 +02:00
7a6837de0e
Fetchable: Add method fetch() which returns an iterator
2015-05-18 13:59:16 +02:00
fe2ee3617b
Remove pie charts from multi-views
...
refs #8565
2015-05-18 13:56:35 +02:00
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
62d8c441f8
Add ServiceActionsHook
...
refs #9284
2015-05-18 11:45:39 +02:00
524c449649
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-18 11:28:07 +02:00
533c980a29
Show only three significant digits in check execution time
...
fixes #8849
2015-05-15 17:32:13 +02:00
58434d9743
ToggleInstanceFeaturesCommandForm::onSuccess(): show a notification for each feature about whether it has been enabled or disabled
...
fixes #9023
2015-05-15 17:01:28 +02:00
2cbcea25cb
Merge branch 'feature/ido-resource-validation-9203'
...
fixes #9214
resolves #9203
2015-05-15 15:59:18 +02:00
e6ba3d6470
Add descriptive message to custom validations
...
refs #9203
2015-05-15 15:49:57 +02:00
d0cc2ae704
ShowController: Use a default limit of 50 for an object's history listing
...
refs #8337
2015-05-15 15:23:49 +02:00
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
5faebb4a88
DataView: Implement interface IteratorAggregate
...
I'd like to foreach such.
2015-05-15 14:37:41 +02:00
3770741ba5
DataView: Implement QueryInterface
...
An instance of DataView should implement the full interface, not only
parts of it.
2015-05-15 14:37:41 +02:00
3b7f27f614
Revert "ListController: set up sort control before paginating a query"
...
This reverts commit ca79b020e3
2015-05-15 14:37:41 +02:00
df7b56881f
Add IDO instance validation
...
refs #9203
2015-05-15 13:06:33 +02:00
8b08473341
Hostgroups view: reduce "Last Problem" column's width
2015-05-15 12:34:59 +02:00
c7d1a7211f
Show host states in host groups
2015-05-15 11:28:16 +02:00
386d4db851
Make ascending sort by host or service severity initiatable
...
fixes #9059
2015-05-15 11:19:52 +02:00
149e893ecd
Revert "Make ascending sort by host or service severity initiatable"
...
This reverts commit 7e1f9f6dcc
2015-05-15 10:54:30 +02:00
e879ba445d
List number of hosts in host groups
...
refs #8054
2015-05-13 18:15:04 +02:00
ead0a64244
GroupsummaryQuery: add column `hosts_total'
...
refs #8054
2015-05-13 18:10:18 +02:00
7e1f9f6dcc
Make ascending sort by host or service severity initiatable
...
fixes #9059
2015-05-13 17:48:34 +02:00
ab2f8e09d6
Calculate states for host group view from host states
...
refs #8860
2015-05-13 16:31:25 +02:00
43d8968bd2
GroupsummaryQuery: add columns
...
hosts_up_last_state_change
hosts_pending_last_state_change
hosts_down_last_state_change_handled
hosts_unreachable_last_state_change_handled
hosts_down_last_state_change_unhandled
hosts_unreachable_last_state_change_unhandled
refs #8860
2015-05-13 16:22:47 +02:00
ca79b020e3
ListController: set up sort control before paginating a query
2015-05-13 14:33:48 +02:00
aa466ae721
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-13 08:11:59 +02:00
9e3d65e4e9
Display performance data metrics with value 0
...
fixes #8744
2015-05-12 17:44:53 +02:00
9e4c00506d
Revert "Display performance data metrics with value 0"
...
This reverts commit 3c73f28157
2015-05-12 17:22:25 +02:00
3c73f28157
Display performance data metrics with value 0
...
fixes #8744
2015-05-12 17:19:20 +02:00
7353c0d287
IdoQuery::initializeForPostgres(): cast only valid IP addresses to inet
...
fixes #7165
2015-05-12 16:35:14 +02:00
c91d3e52ac
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-12 15:39:02 +02:00
dd58f1466c
Don't apply sort rules in Monitoring_ListController::filterQuery()
...
refs #9220
2015-05-12 10:17:38 +02:00
399bbf0795
AuthenticationStep: Adjust usage of a DbUserBackend's insert capability
...
refs #8826
2015-05-11 16:01:20 +02:00
6658415b6f
Remove uneeded use statements
2015-05-11 14:40:23 +02:00
152c6a8f7f
Merge Monitoring_ListController::hasBetterUrl() into Icinga\Web\Controller::init()
...
refs #9220
2015-05-11 13:36:58 +02:00
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
c3b4ea71d3
Add ido schema and instance availability validation
...
refs #9203
2015-05-11 10:32:34 +02:00
8c5f2662ea
Fix redirects in downtime multi view
...
refs #8624
2015-05-07 17:33:38 +02:00
fff2d5c816
Use consistent controller names
...
refs #8624
2015-05-07 17:29:46 +02:00
83efc3a4a3
Conform to coding guidelines
2015-05-07 17:23:50 +02:00
c6c78989a5
Fix redirects after deleting a comment
...
refs #8624
2015-05-07 17:02:34 +02:00
1fa550838d
Coding guidelines and cleanup
2015-05-07 16:37:35 +02:00
7cf2cb034e
Remove unused and redundant controller actions
...
refs #8624
2015-05-07 16:22:17 +02:00
ac599e642a
Add submit button label to multi comment form
...
refs #8624
2015-05-07 16:21:34 +02:00
b314c074cc
Fix downtime and comment form redirects
...
refs #8624
2015-05-07 16:20:59 +02:00
4463f16f04
Add abbillity to remove multiple comments by id
...
refs #8624
2015-05-07 15:11:54 +02:00
ffd12e325c
Improve up downtime command form properties
...
Use a flag instead of a enumeration in delete downtime command form, to remove needless boilerplate.
refs #8624
2015-05-07 14:05:16 +02:00
b35dd4ddfe
Separate forms for deleting single and multiple comments
...
refs #8624
2015-05-07 14:03:09 +02:00
7c8ff44fd1
Fix comment and downtime list inline forms
...
refs #8903
refs #8902
2015-05-07 10:59:37 +02:00
11c9cde557
Remove dashboard action from multi view
...
refs #8903
2015-05-07 10:59:36 +02:00
3187975553
Conform to coding guidelines
2015-05-07 10:59:36 +02:00
1586275521
Conform to coding guidelines in downtime controller
2015-05-07 10:59:36 +02:00
e5e3e80300
Conform to coding guidelines
2015-05-07 10:59:36 +02:00
5477a2f18e
Escape missing variables
...
refs #8903
2015-05-07 10:59:36 +02:00
e6740c5093
Set link target to next page in all comment views
...
refs #8903
2015-05-07 10:59:36 +02:00
c71786a624
Remove useless comments
2015-05-07 10:59:36 +02:00
6ff903c8a9
Remove useless comments
2015-05-07 10:59:36 +02:00
0c7d8ab481
Add controlle for handling multiple comments
...
refs #8903
2015-05-07 10:59:36 +02:00
ca839d5123
Display amount of selected rows
...
refs #8903
2015-05-07 10:59:36 +02:00
cab198eadc
Fix whitespaces and unused comments
2015-05-07 10:59:36 +02:00
32da02c162
Deduplicate comment views
...
Move comment detail and description into separate partial to reduce code duplication
2015-05-07 10:59:36 +02:00
dedc175967
Add basic comment detail view
...
refs #8903
2015-05-07 10:59:36 +02:00
d316b31cbb
Fix downtime removal command in detail view
...
Use removal command for single downtimes in detail view. Move removing single and multiple downtimees into seperate forms.
refs #8902
2015-05-07 10:34:06 +02:00
a46dece136
Provie link to detail view in downtime partial
...
refs #8902
2015-05-07 10:34:06 +02:00
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
6ddb004230
Move removal command actions into the downtime controllers
...
refs #8902
2015-05-07 10:34:06 +02:00
b186ce2cac
Handle non-existed downtime ids with exceptions
...
refs #8902
2015-05-07 10:34:06 +02:00
400f351ea5
Improve detail view layout
...
refs #8902
2015-05-07 10:34:06 +02:00
07c5e67304
Display additional downtime info in multiselection detail view
...
refs #8902
2015-05-07 10:34:06 +02:00
a87e1f91d9
Implement detail view for multiple downtimes
...
refs #8902
2015-05-07 10:34:06 +02:00
20b25e656b
Show better error message for unknown downtimes
...
refs #8902
2015-05-07 10:34:06 +02:00
9114a34223
Display host and service state in downtime detail area
...
refs #8902
2015-05-07 10:34:06 +02:00
ab0720fe95
Add support for multi-selection to downtime list
...
refs #8902
2015-05-07 10:34:06 +02:00
bb7afd9b2b
Add tooltips to downtime detail view
...
refs #8902
2015-05-07 10:34:06 +02:00
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
7b6641dc84
Add basic downtime controller and views
...
refs #8902
2015-05-07 10:34:06 +02:00
6df031dc78
Add proper respond http codes to service and host controller
...
fixes #6281
2015-05-06 14:21:46 +02:00
defda53ff5
Show icinga program version in Monitoring Health
...
Also emphasize on the backends used.
fixes #9207
2015-05-05 17:02:45 +02:00
d1f1f5d7d7
ProgrammStatusQuery: Add fallback if ido_version is older than required
...
resolves #9223
2015-05-05 16:32:18 +02:00
0e4201a997
Add info about the active ido endpoint to monitoring health overview
...
resolves #9223
2015-05-05 15:20:25 +02:00
993cb31572
Fix the permission for the toggle object feature assertion
...
fixes #9198
2015-05-04 14:39:12 +02:00
437090d2b1
AdminAccountPage: Backends do provide a unified interface now, use it
...
refs #8826
refs #7693
2015-05-04 12:21:17 +02:00
c441117324
LdapUserBackend: Extend Repository and implement UserBackendInterface
...
refs #8826
2015-05-04 12:18:25 +02:00
d43f4729f1
Monitoring_ListController::filterQuery(): preserve parameter `_dev'
...
resolves #8453
2015-04-30 17:25:59 +02:00
32f657bc01
Merge branch 'master' of git.icinga.org:icingaweb2
2015-04-30 16:19:02 +02:00
8484a27b56
Add a backend problem menu item renderer to system menu
...
refs #4139
2015-04-30 16:13:10 +02:00
880b1eb21a
Add better styling for backend-not-running class
...
refs #4139
2015-04-30 16:12:36 +02:00
5075ccdf38
Add ProblemMenuItemRenderer to system menu as renderer
...
refs #4139
2015-04-30 16:10:44 +02:00
d09ea2845d
Merge branch 'master' into feature/user-and-group-management-8826
2015-04-30 15:20:40 +02:00
3da144f199
Revert "Sort LDAP user list"
...
This reverts commit d4dc0177c0
2015-04-28 15:57:33 +02:00
d27b94dcec
Revert "Don't fetchAll() and loop afterwards in the alert summary report"
...
This reverts commit f3ca80ffce
2015-04-28 12:52:59 +02:00
f3ca80ffce
Don't fetchAll() and loop afterwards in the alert summary report
...
refs #8340
2015-04-27 14:44:19 +02:00
6f0fd7d44d
Remove right petrol border from plugin output in the host and service detail views
...
resolves #8967
2015-04-27 13:06:55 +02:00
a976d777b3
Show custom variables visually separated in the host and service detail views
...
resolves #8966
2015-04-23 13:31:02 +02:00
e4a9843021
Show Icinga 2 boolean variables in the host and service detail views
...
resolves #8747
2015-04-23 12:38:29 +02:00
6ba6cb7940
Improve layout of dictionaries in the host and service detail views
...
resolves #8474
2015-04-23 11:58:54 +02:00
6ca68f438d
Move concrete UserBackend classes to Icinga\Authentication\User
...
refs #8826
2015-04-21 12:51:31 +02:00
5f3aafd3bd
Merge branch 'bugfix/menu-item-renderer-deduplication-7658'
...
fixes #7658
2015-04-20 17:15:21 +02:00
9ebf4742de
Use the MenuItemRenderer render() implemnetations
...
refs #7658
2015-04-20 17:07:34 +02:00
1e064a5379
Revert "Fix host and service multiselection"
...
This reverts commit 1f4b3aa8ea
2015-04-20 16:13:03 +02:00
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
894457a1c1
Revert "Adjust command links so that they'll use `host_name' instead of `host'"
...
This reverts commit b9aee47d1f
2015-04-20 16:11:08 +02:00
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
9bbb23ae7d
Revert "Adjust command links so that they'll use `service_description'"
...
This reverts commit cee189a5fc
2015-04-20 16:08:51 +02:00
da7aa23820
Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876
2015-04-20 15:20:23 +02:00
b68fd93529
Timeline: Add dashboard action
...
refs #7876
2015-04-20 15:00:01 +02:00
a3eb6e37f2
Tactical overview: Add dashboard action
...
refs #7876
2015-04-20 14:59:54 +02:00
48f9cf61e7
Monitoring health view: Add dashboard action
...
refs #7876
2015-04-20 14:59:44 +02:00
a4f08067e4
Applicationlog: : Add dashboard action
...
refs #7876
2015-04-20 14:59:32 +02:00
41222fd34e
Service multiselection view: Add dashboard action
...
refs #7876
2015-04-20 14:59:20 +02:00
4e27ff962c
Host multiselection view: Add dashboard action
...
refs #7876
2015-04-20 14:59:05 +02:00
48df225f98
Alertsummary: Add dashboard action
...
refs #7876
2015-04-20 14:58:47 +02:00
0997eaf459
Host detail view: Fix that the list of services is missing all tabs
...
refs #7876
2015-04-20 14:56:30 +02:00
6b3dd63bb3
Doc module: Fix div.controls of the index controller's index action
...
refs #7876
2015-04-20 14:55:18 +02:00
0be8b8997b
Timeline: Do not enable infinite scrolling when shown in the dashboard
...
refs #7876
2015-04-20 13:25:29 +02:00
e812bed241
Merge branch 'bugfix/move-monitoring-menu-renderers-7642'
...
fixes #7642
2015-04-20 13:22:55 +02:00
8b18c5a60a
Fix parameters to ignore when setting a filter for the ServiceList
...
refs #7876
2015-04-20 13:18:36 +02:00
c43947d666
Update renderer property definition for problems section
...
refs #7642
2015-04-20 13:11:52 +02:00
c76e4e3583
Change the global namespace to the module specific namespace
...
refs #7642
2015-04-20 13:05:23 +02:00
4b43fbe527
Host- and Service multiselection: Ensure dashboard compliance
...
refs #7876
2015-04-20 13:03:13 +02:00
593ea7add5
Move monitoring module renderers from global module to monitoring module
...
refs #7642
2015-04-20 13:02:12 +02:00
423b92f8dc
Remove gravity settings from servicegrid
...
refs #9025
2015-04-20 12:02:17 +02:00
54a370ca22
Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876
2015-04-20 11:15:04 +02:00
dbf471feac
Use the helper to setup the FilterEditor widget
...
refs #7876
2015-04-17 16:21:14 +02:00
14a555629d
servicegrid: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:20:29 +02:00
c099b7ddd7
eventgrid: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:20:22 +02:00
78e4df2ce9
monitoring health views: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:20:06 +02:00
b9f9ea6142
service/show: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:19:38 +02:00
b2246c2aff
host/show: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:19:30 +02:00
58b93101c7
multiselect views: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:18:56 +02:00
7be00791a7
list/eventhistory: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:15:58 +02:00
faa29e3dee
list/hostgroups: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:14:59 +02:00
7ae7bf38c4
list/servicegroups: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:14:46 +02:00
2190e553be
list/comments: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:14:29 +02:00
b9249dac4e
list/contactgroups: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:14:13 +02:00
d725b2feb7
list/contacts: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:13:56 +02:00
a09e41e3b8
list/notifications: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:13:36 +02:00
5f19ec1b2e
list/downtimes: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:13:22 +02:00
29648191e4
list/services: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:12:56 +02:00
74cf3cf375
list/hosts: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:12:35 +02:00
073dc31128
Timeline: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:11:06 +02:00
3f092ffb2d
show/contact: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:10:49 +02:00
9388944283
show/history: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:10:21 +02:00
5f4a61f36e
Alertsummary: Ensure dashboard compliance
...
refs #7876
2015-04-17 16:09:50 +02:00
6d0870ad2e
Adjust padding and margin of .content and .controls
...
refs #7876
2015-04-17 10:04:24 +02:00
0974b70e0e
Display service grid tooltips on the top
...
fixes #9025
2015-04-16 18:32:47 +02:00
0f70701034
Use timeSince() in the monitoring list command
...
refs #6778
2015-04-15 15:46:12 +02:00
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
229e266daf
Add new line between comment author and creation time in the detail views
...
refs #6778
2015-04-15 15:40:40 +02:00
e500715bda
Use timeAgo() when displaying comments in the detail views
...
refs #6778
2015-04-15 15:33:44 +02:00
675d070b86
Set the view property `compact' exactly once
...
refs #7876
2015-04-15 15:33:00 +02:00
eb77fff012
Capitalize status change information in tables via CSS
...
refs #6778
2015-04-15 15:28:34 +02:00
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
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
32e8b606b4
Monitoring\Controller: Drop `compactView' property, as it's not used anywere
2015-04-15 15:17:59 +02:00
5e92171ab7
Drop the `inline' view property, as it's not used anywhere
2015-04-15 15:15:03 +02:00
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
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
a4d815051c
Add missing break statements in the comments list view
2015-04-15 14:59:30 +02:00
a8ce3abca7
Fix code compliance in the SendCustomNotificationCommandForm
2015-04-15 14:59:29 +02:00
9d4460d02f
Use inheritdoc in the ScheduleServiceCheckCommand
2015-04-15 14:59:29 +02:00
b8849c0ac9
Return $this in the setters of the SendCustomNotificationCommand
...
Further fixed bad PHPDoc.
2015-04-15 14:59:29 +02:00
d02c078e4a
Wizard: Ensure that privileges are checked only once
...
Another entry in the "The provided credentials cannot be
used to create the database and/or the user" story...
2015-04-15 09:26:39 +02:00
923bc11b39
GroupsummaryQuery: Provide case insensitive filter columns for group names
...
I've renamed those and made them case sensitive as part of #8613 but
missed that they are required by the global search.
fixes #9056
2015-04-14 12:44:24 +02:00
2618d4a468
DataView\Contact: Add missing query columns
...
fixes #9057
2015-04-14 12:27:54 +02:00
9ef414c9ed
Add separator when listing downtimes in the detail view
...
fixes #9046
2015-04-14 09:20:43 +02:00
638c00d685
Merge branch 'master' into feature/non-collated-ido-queries-8613
2015-04-13 15:55:32 +02:00
9cc5469305
NotificationQuery: Provide case-insensitive filter column `contact'
...
refs #8613
2015-04-13 15:33:33 +02:00
29f05bf878
NotificationQuery: Provide case-insensitive filter column `service'
...
refs #8613
2015-04-13 15:33:19 +02:00
3653ec810a
NotificationQuery: Provide case-insensitive filter column `host'
...
refs #8613
2015-04-13 15:32:52 +02:00
644a386bf8
NotificationQuery: Use query column `notification_contact_name'
...
...instead of `notification_contact'.
refs #8613
2015-04-13 15:26:06 +02:00
15399d77ce
NotificationQuery: Use query column `service_description' instead of `service'
...
refs #8613
2015-04-13 15:25:10 +02:00
96954ea9a1
NotificationQuery: Use query column `host_name' instead of `host'
...
refs #8613
2015-04-13 15:24:15 +02:00
Eric Lippmann
Johannes Meyer
Matthias Jentsch
Alexander A. Klimov
Alexander Fuhr
Marius Hein
Michael Friedrich