tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,672 Commits 117 Branches 71 Tags 80 MiB
Commit Graph

2590 Commits

Author SHA1 Message Date
Johannes Meyer cd0c418854 Merge branch 'master' into feature/user-and-group-management-8826 2015-06-02 10:44:13 +02:00
Johannes Meyer 2490d0ae67 ConfigController: We're configuring user backends from now on 
refs #8826
 2015-06-02 09:58:57 +02:00
Michael Friedrich cf95994ff5 Documentation: Add config overview as first draft 
refs #7153
 2015-06-01 19:16:35 +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
Johannes Meyer 7b9983de38 Merge the menu entries for users, groups and roles into "Authentication" 2015-06-01 17:16:24 +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
Johannes Meyer c7ce1498bf Introduce menu entry "Configuration" 2015-06-01 16:10:23 +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
Eric Lippmann 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
Eric Lippmann 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
Eric Lippmann 1a51368a76 Fix MacroTest 
Pushing failing tests to the master is a mystery to me.

refs #6392
 2015-05-28 16:08:21 +02:00
Matthias Jentsch 8309ab336d Merge branch 'feature/resolve-runtime-macros-6392' 
resolves #6392
 2015-05-28 15:42:16 +02:00
Matthias Jentsch c7261bd481 Add missing columns for macro expansion 
refs #6392
 2015-05-28 15:37:01 +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 2572842aa4 Add unit test cases for the new macro syntax 
refs #6392
 2015-05-28 15:07:46 +02:00
Matthias Jentsch 60e5608b40 Rename ResolveMacroTest 
refs #6392
 2015-05-28 15:02:58 +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
Johannes Meyer 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
Eric Lippmann 5fdaa2cd7e monitoring: Fix command links when showing multiple selected hosts 
fixes #9327
 2015-05-28 13:17:00 +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
Johannes Meyer ec556edc65 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-26 09:28:35 +02:00
Eric Lippmann ea8c497539 Fix exception when following command links for multiple selected hosts 2015-05-22 16:51:23 +02:00
Eric Lippmann 1d22d0c989 monitoring: Fix wrong partial time when a downtime expires 2015-05-22 16:50:24 +02:00
Johannes Meyer 59ff4221f6 CommandTransport: Make sure to reset the config before calling current() 2015-05-22 14:01:11 +02:00
Eric Lippmann 53ca68903a Merge branch 'bugfix/time-formatting-6778' 
fixes #6778
 2015-05-22 11:34:43 +02:00
Eric Lippmann 8d6d52f9db monitoring: Fix date and time formatting in the timeline 
refs #6778
 2015-05-22 10:59:17 +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
Johannes Meyer 265725447d Merge branch 'master' into feature/user-and-group-management-8826 2015-05-22 10:06:31 +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
Eric Lippmann 2bdb725370 Merge branch 'bugfix/monitoring-controllers-response-codes-6281' 
fixes #6281
 2015-05-22 09:27:51 +02:00
Eric Lippmann e137263c4b monitoring: Fix HTTP response code when showing an invalid comment 
refs #6281
 2015-05-22 09:20:27 +02:00
Eric Lippmann 8f42d7a1d3 monitoring: Fix HTTP response code when showing an invalid downtime 
refs #6281
 2015-05-21 17:17:25 +02:00
Marius Hein 57abafd10b Merge branch 'master' into bugfix/customvars-case-insensitive-8696 2015-05-21 16:51:04 +02:00
Matthias Jentsch 54f72377c5 Do not display mouse-over effect in comment multi-view 2015-05-21 16:28:00 +02:00
Eric Lippmann 0b81a1130f monitoring: Fix HTTP response code when showing an invalid host 
refs #6281
 2015-05-21 16:18:09 +02:00
Eric Lippmann e8c704b98d monitoring: Fix HTTP response code when showing an invalid service 
refs #6281
 2015-05-21 16:18:09 +02:00
Eric Lippmann ce9110d22d Revert "Add proper respond http codes to service and host controller" 
This reverts commit 6df031dc78.

I revert this commit for the following reasons:
- MissingParameterException must not be thrown manually because we have UrlParams::getRequired() which was UrlParams::req() before.
- The commit introduces the untranslated string 'host or service'.
- 4xx are client, not server errors.
- Copy and paste code for the stack trace handling in the ErrorController.

refs #6281
 2015-05-21 16:14:02 +02:00
Marius Hein 7c04664888 Make MySQL collation syntax default 
Overwrite customVarsJoinTemplate for Postgres and Oracle.

refs #8696
 2015-05-21 16:09:03 +02:00
Matthias Jentsch 8ce9989243 Merge branch 'feature/support-icon-image-alt-9300' 
resolves #9300
 2015-05-21 15:03:06 +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