Commit Graph

4939 Commits

Author SHA1 Message Date
Eric Lippmann 0a1668acf6 Fix tab names in the RolesController 2014-11-25 16:11:01 +01:00
Eric Lippmann 2f02ac2f01 Fix the RolesController's class name 2014-11-25 16:11:01 +01:00
Eric Lippmann e5d8fc7208 Rename the 'Permissions' tab to 'Roles' 2014-11-25 16:11:01 +01:00
Eric Lippmann 974357c84f Rename /permissions to /roles 2014-11-25 16:11:01 +01:00
Eric Lippmann f0ece3d88a Revert "Remove permissions and restrictions for now"
This reverts commit 8335bdcb32.

Readd permissions and restrictions.
2014-11-25 16:11:01 +01:00
Eric Lippmann df42eba69a Revert "Use /usr/bin/env instead of hard-coding paths"
This reverts commit 42b0469a96.

Packaged verions of our scripts must use a system installation of the interpreter for obvious reasons.
I also disapprove using env in our Git. We want to use a system installation of the interpreter too. Not something that's supposed to be the interpreter.
Also, potential incomplete or defective local versions of the interpreter must not be our concern.
That installations from source using /usr/bin/php do not work out of the box on FreeBSD for example is of course an issue. But that should not be fixed by blindly using env.

refs #7789
2014-11-25 16:11:01 +01:00
Eric Lippmann d41602a67c Rearrange imports in Menu.php 2014-11-25 16:11:01 +01:00
Johannes Meyer a288535347 Use the `host' and `port' directives when using a zend adapter in DbTool
fixes #7781
fixes #7798
2014-11-25 16:03:06 +01:00
Alexander Klimov dbf8527fc9 git_cmmi: don't clone a git repo more than once 2014-11-25 15:42:15 +01:00
Alexander Klimov 31a49a7c95 Don't start ido2db-*sql 2014-11-25 15:24:32 +01:00
Alexander Klimov c737f18162 Don't install jQuery 2014-11-25 15:07:43 +01:00
Alexander Klimov fbe603c23f Merge branch 'master' into feature/deduplicate-puppet-code-6842 2014-11-25 13:58:35 +01:00
Gunnar Beutner b2ba8e3576 Update example config for 2.3 2014-11-25 13:54:43 +01:00
Alexander Klimov edd8eced5d icingaweb2_dev: update SQL schema file paths 2014-11-25 12:55:51 +01:00
Alexander Klimov 1ce99d277a Merge branch 'master' into feature/deduplicate-puppet-code-6842
Conflicts:
	.vagrant-puppet/manifests/default.pp
	packages/rpm/etc/icingaweb2/resources.ini
2014-11-25 12:29:42 +01:00
Alexander Klimov ba7fa85cff Vagrantfile: complete puppet.module_path 2014-11-25 12:17:00 +01:00
Alexander Klimov de8dc64b69 Rename successor.pp -> default.pp 2014-11-25 11:49:59 +01:00
Alexander Klimov a1ccd01776 Rename default.pp -> default.pp.old 2014-11-25 11:48:12 +01:00
Alexander Klimov c982ef4f9a Add successor for '.vagrant-puppet/manifests/default.pp'
refs #7321
2014-11-25 11:45:05 +01:00
Alexander Klimov 607b0fc0c4 icingaweb2_dev: include and require Class[icinga_packages]
refs #6842
2014-11-24 14:44:17 +01:00
Alexander Klimov 30ee6c9411 Ensure that every package's latest version is installed
refs #6842
2014-11-24 14:42:07 +01:00
Gunnar Beutner 42b0469a96 Use /usr/bin/env instead of hard-coding paths
fixes #7789
2014-11-21 21:59:14 +01:00
Eric Lippmann eed10159fd Menu: Don't render sub menus when a dot appears in the label
I guess this was intended to be a feature. Turns out to be a bug though :)

fixes #7772
2014-11-21 17:39:18 +01:00
Eric Lippmann d84318d8b8 Fix Menu's PHPDoc
Don't use @var and don't use @return self for fluent interfaces.
2014-11-21 17:13:39 +01:00
Eric Lippmann 2843490250 monitoring: Translate "Plugin Output" 2014-11-21 16:45:39 +01:00
Eric Lippmann c626762b5d commands: Fix wrong flag for sticky acks
It's 2 not 1. But who knows why :)

fixes #7783
2014-11-21 16:33:46 +01:00
Gunnar Beutner 59c2d27e4e Fix spelling for "Plugin Output" 2014-11-21 15:14:47 +01:00
Gunnar Beutner 4d480b316e Fix incorrect paths in the Apache config for the RPM package 2014-11-21 00:01:47 +01:00
Gunnar Beutner 48ca70f1db Make sure RPM packaging files are included in Git archives
If these files are missing the build jobs on build.icinga.org fail
2014-11-20 23:44:41 +01:00
Gunnar Beutner 799e020278 Fix some more problems with the RPM spec file 2014-11-20 17:40:48 -05:00
Gunnar Beutner d888bf043c Fix path for the Apache config file in the spec file 2014-11-20 23:24:39 +01:00
Eric Lippmann 95b3d41b12 Add VERSION file 2014-11-20 17:49:43 +01:00
Eric Lippmann 9f109f9b93 Fix redirect after submitting commands to multiple objects
fixes #7711
2014-11-20 17:47:08 +01:00
Thomas Gelf dad2aab482 doc/style: fix tab activation 2014-11-20 17:25:58 +01:00
Thomas Gelf d5450598f0 list/eventhistory: add flapping stopped support 2014-11-20 17:24:01 +01:00
Eric Lippmann eddb00cbc1 monitoring: Remove filter widgets in the event overview / history view
They did not work.
2014-11-20 17:19:26 +01:00
Eric Lippmann dc699058b9 doc: Remove superfluous newlines 2014-11-20 17:01:14 +01:00
Eric Lippmann 909efb35a9 doc: Update authentication.md 2014-11-20 17:00:54 +01:00
Eric Lippmann 8335bdcb32 Remove permissions and restrictions for now
Our first beta release will not include permissions and restrictions.
We'll better test it before making it public.
2014-11-20 16:14:00 +01:00
Eric Lippmann bf33c9c13b Permissions: Show restrictions in the permissions list 2014-11-20 16:12:02 +01:00
Eric Lippmann e48935f487 Permissions: Add class avp to index table 2014-11-20 15:54:46 +01:00
Eric Lippmann e67d937642 Permissions: Allow to set restrictions too 2014-11-20 15:54:00 +01:00
Eric Lippmann 55d6a96fdc doc: Style tables, pre > code and code 2014-11-20 15:52:47 +01:00
Eric Lippmann a7b16bc4a2 doc: Don't use $this->_helper->viewRenderer
This somehow breaks our postDispatch logic. But $this->render does not.
2014-11-20 15:29:46 +01:00
Eric Lippmann f470e66884 monitoring: Fix view monitoring health when Icinga is not running
If Icinga is not running, the view Monitoring Health simply shows a message about the backend not being up and running.
This is of course not so useful as it lacks performance and last runtime information but is does not error.
2014-11-20 15:23:08 +01:00
Marius Hein 50c2c02e09 Dashboard: Keep get params through requests
This avoid errors if a user manually refresh an edit dialog.

refs #7751
2014-11-20 14:38:19 +01:00
Johannes Meyer 5f37739227 Fix that selecting a x-axis link in the service grid produces an invalid filter
I've just fixed this quick and dirty as implementing the complete x IN y
syntax requires too much effort as currently available.

refs #7169
2014-11-20 14:26:35 +01:00
Eric Lippmann 99ad72a0da Remove the Help decorator 2014-11-20 13:50:40 +01:00
Eric Lippmann 9c8c81c201 Permissions: Use icon for the remove permission link 2014-11-20 13:49:33 +01:00
Eric Lippmann 462153fdf2 Fix label help icon when label gets too long 2014-11-20 13:48:49 +01:00