Commit Graph

199 Commits

Author SHA1 Message Date
Alexander Klimov 5a6995f67f Outsource `icinga2' stuff, `icinga2-mysql' stuff and `icinga2::feature' into modules
refs #6842
2014-08-22 13:37:27 +02:00
Eric Lippmann 114a648b4f deduplicate puppet code: Fix merge conflicts 2014-08-22 11:37:46 +02:00
Eric Lippmann 96dcc79f11 Merge branch 'master' into feature/deduplicate-puppet-code-6842
Conflicts:
	.vagrant-puppet/manifests/default.pp
2014-08-22 11:37:40 +02:00
Alexander Fuhr 36a275371f Delete unnecessary configurations files from .vagrant-puppet
fixes #5749
2014-08-20 16:26:52 +02:00
Alexander Fuhr e0b9730f17 Update configurations source paths in puppet default.pp
refs #5749
2014-08-20 16:01:08 +02:00
Alexander Fuhr bef639ecb8 Update deprecated output variable in puppet files 2014-08-20 15:16:42 +02:00
Alexander Klimov bb65fb396a Merge branch 'bugfix/sensitive-custom-vars-6641'
fixes #6641
2014-08-20 12:29:45 +02:00
Johannes Meyer 09dfcca0bc Merge branch 'master' into bugfix/styled-history-views-6637 2014-08-20 11:39:03 +02:00
Johannes Meyer 4eaf94cdf1 Show only acknowledgement and user comments by default 2014-08-20 11:33:22 +02:00
Alexander Klimov c6d4ab4c44 Vagrant/Puppet: add file '/etc/icingaweb/modules/monitoring/config.ini'
refs #6641
2014-08-19 15:04:43 +02:00
Eric Lippmann 1c74fd7028 Merge branch 'master' into feature/display-documentation-4820
Conflicts:
	modules/doc/library/Doc/DocParser.php
2014-08-19 13:39:48 +02:00
Alexander Fuhr c69af6c5d2 Move "modules" to "System" menu
resolves #6934
2014-08-19 11:14:18 +02:00
Alexander Fuhr aec0591001 Add monitoring-plugins Puppet module and drop direct download of the
plugins

fixes #6953
2014-08-18 16:52:59 +02:00
Alexander Klimov 59c5b70f71 Correct path to icinga2-ido-mysql's schema file 2014-08-18 13:51:06 +02:00
Alexander Klimov 67efe52141 Revert "Put always a ',' after a parameter because explicit is better than implicit"
This reverts commit 26205a76b3.
2014-08-18 11:00:30 +02:00
Alexander Klimov 0677105d45 Unify/Deduplicate some icinga2::features
refs #6842
2014-08-15 13:10:38 +02:00
Alexander Klimov 26205a76b3 Put always a ',' after a parameter because explicit is better than implicit
refs #6842
2014-08-15 11:10:47 +02:00
Alexander Klimov 392e725d8a Outsource specific parts into profiles icinga-mysql, icinga-pgsql, icinga2, icingaweb2 and nodejs
refs #6842
2014-08-06 13:27:16 +02:00
Alexander Klimov 05afbeebe0 Outsource 'icing_web' database creation into mysql::database::create
refs #6842
2014-08-05 16:29:44 +02:00
Alexander Klimov a110b25071 Outsource 'icingaweb' database creation into mysql::database::create
refs #6842
2014-08-05 16:29:02 +02:00
Alexander Klimov 73a29abac3 Outsource 'icinga_unittest' database creation into mysql::database::create
refs #6842
2014-08-05 16:16:05 +02:00
Alexander Klimov 2e1afd7194 Make privileges customizable in mysql::database::create (and mysql::database::populate)
refs #6842
2014-08-05 16:12:47 +02:00
Alexander Klimov 920a784beb Split mysql::database into mysql::database::create and mysql::database::populate
refs #6842
2014-08-05 15:43:23 +02:00
Alexander Klimov 538088d177 The name of pgsql::database::create MUST NOT be create-pgsql-*-db 2014-08-05 15:37:49 +02:00
Alexander Klimov ee711679e6 Outsource 'icingaweb' database creation into pgsql::database::create
refs #6842
2014-08-05 15:20:43 +02:00
Alexander Klimov 9a50cb8fa3 Outsource 'icinga_unittest' database creation into pgsql::database::create
refs #6842
2014-08-05 15:15:46 +02:00
Alexander Klimov ccbc1f5aa0 Split pgsql::database into pgsql::database::create and pgsql::database::populate
refs #6842
2014-08-05 15:15:01 +02:00
Alexander Klimov e42f400f38 Outsource Icinga database creation and population into pgsql::database
refs #6842
2014-08-05 14:42:01 +02:00
Alexander Klimov fe11ca4744 Merge branch 'master' into feature/deduplicate-puppet-code-6842 2014-08-05 13:50:23 +02:00
Alexander Klimov 82fa6e690f Outsource Icinga (2) database population into mysql::database 2014-08-05 13:09:33 +02:00
Alexander Klimov 8f23f61e00 Don't use `UNDEF' default values 2014-08-05 11:48:25 +02:00
Alexander Klimov 261a5dd43d Don't declare the variable $icinga_packages because it's used only once 2014-08-05 11:17:17 +02:00
Alexander Klimov 8806583289 Outsource Icinga (2) database creation into mysql::database
refs #6842
2014-08-04 13:40:11 +02:00
Michael Friedrich 3e4944c60a Vagrant: Update monitoring-plugins/livestatus
Move all hardcoded versions to the header too.

fixes #6818
2014-07-30 14:04:57 +02:00
Michael Friedrich 0b1aee8a35 Vagrant: Fix Icinga 2 MySQL creation
refs #6741
2014-07-29 13:04:20 +02:00
Eric Lippmann a0867ce33a doc module/Vagrant: Add menu.ini
refs #4820
2014-07-28 19:26:39 +02:00
Eric Lippmann ce4fa1fd3d Vagrant/doc module: Add menu link to the documentation module
refs #4820
2014-07-28 19:14:50 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Johannes Meyer b046023623 Ensure that our menu inis are in sync and up2date
The menu configurations for vagrant missed the entries for the timeline,
applicationlog and contacts-view.

fixes #6512
2014-07-11 08:49:58 +02:00
Johannes Meyer d4a4cf90ad Fix vagrant provisioning for icinga1.x access 2014-07-02 08:39:49 +02:00
Thomas Gelf 79cdd8c94a servicematrix: show only problems per default
a) because it makes sense
b) because there seems to be a bug with unfiltered matrix

I'll investigate this, in the meantime it works like this - and is
more useful than it used to be.
2014-06-21 05:03:23 +02:00
Thomas Gelf f9b18828c1 menu/monitoring: get rid of raw_timestamp
We use this only internally, raw_timestamp should not be accessible
2014-06-20 19:07:43 +02:00
Marius Hein 89ae3713cd Vagrant/finalize: Do not remount /vagrant/var/log
If you do multiple provisioning calls mount point
/vagrant/var/log is mounted multiple times.
2014-06-06 11:01:20 +02:00
Marius Hein e3cd50ef16 Puppet: Remove stuff from manifest we do not need again 2014-06-06 10:50:58 +02:00
Marius Hein 58b509b8ee Puppet: Use /vagrant directory to deliver web files
Apache uses now /vagrant/public instead of /var/www/html
symlinks.

fixes #6421
2014-06-06 10:48:22 +02:00
Thomas Gelf 72a2ec41ba Vagrant: FollowSymlinks instead of ...IfOwnerMatch
Dirty like the rest of that setup :p
2014-06-05 15:07:41 +00:00
Thomas Gelf 176588c87d installation: get rid of .htaccess, less automake
Trying to remove a bunch of autoconf and .htaccess-related stuff.
This commit is the last one from a series now finally allowing to run
icingaweb directly from a git checkout.

refs #4075
2014-06-05 14:54:00 +00:00
Michael Friedrich 8fe804bbd4 Enable icinga snapshot repository and fetch latest icinga2 packages
Furthermore get rid of multiple 'exec' calls and use 'package' instead.
Additional refactoring for icinga 2 features.

fixes #6405
2014-06-04 16:09:50 +02:00
Marius Hein 29f593a357 Authentication: Add backend to handle external authentication
Drop external auth configuration from config.ini and move
implementation into a single backend provider named
'autologin'. This provider can strip realm names from
username with a custom regexp.

fixes #6081
2014-06-03 17:59:22 +02:00
Marius Hein 9b5c704da8 Puppet/Icinga2: Fix installation for Icinga2-2.0.0beta2 2014-06-03 14:44:13 +02:00
Eric Lippmann 274fc58d0f Vagrant: Fix file permissions of mount.vboxsf
refs #5982
2014-06-03 13:17:07 +02:00
Eric Lippmann 02007cf9fb Vagrant: No longer remount the config/ directory
The virtual machine uses its own config files beneath /etc/icingaweb.
2014-06-03 13:11:28 +02:00
Eric Lippmann 473d986dfb Revert "Vagrant/finalize.sh: Remove dmode and fmode options from mount.vboxsf"
This reverts commit 3a25f019c5.

The "wrong" permissions do of course come from fmode=775 rather than dmode=775. I'm just blind.

refs #5982
2014-06-02 18:15:19 +02:00
Eric Lippmann 3a25f019c5 Vagrant/finalize.sh: Remove dmode and fmode options from mount.vboxsf
The dmode and fmode options seem to set the execute bit even when the mode is 775.

refs #5982
2014-06-02 10:47:44 +02:00
Michael Friedrich 9a8965510a Install icingacli and bash completion in Vagrant VM
fixes #6264
refs #5803
2014-05-23 15:26:46 +02:00
Gunnar Beutner 4a5fa5f17b Update Icinga 2 version in the Puppet manifest
fixes #6219
2014-05-16 13:33:30 +02:00
Gunnar Beutner be6844c458 Fix problems with the Puppet manifest when PostgreSQL's default encoding isn't UTF-8
fixes #6211
2014-05-15 13:44:21 +02:00
Michael Friedrich f6d42944f7 Update Vagrant Icinga 2 test config
refs #6127
2014-05-14 17:45:40 +02:00
Gunnar Beutner 87054c8121 Make sure line-endings for Puppet manifests are LFs only.
fixes #6181
2014-05-10 09:34:21 +02:00
Marius Hein d681031b7b Vagrant/Icinga2: Add dependencies for test config
refs #6127
2014-05-09 18:40:46 +02:00
Marius Hein 8d42914a84 Vagrant/Icinga2: Upgrade to snapshots and optimize configuration
refs #6127
2014-05-09 18:36:35 +02:00
Marius Hein fb44940dea Vagrant/Icinga2: Optimize test configuration 2014-05-09 18:36:34 +02:00
Marius Hein 5dd85a7ee1 Vagrant: Add Icinga2 and test configuration
refs #6127
2014-05-09 18:36:34 +02:00
Marius Hein c4e36ec467 Puppet: File resources.ini set replace to false
fixes #6016
2014-04-30 13:23:50 +02:00
Marius Hein eeb399a4d4 Revert "Puppet: Change of icingaweb2 configuration deploy"
This reverts commit f98a39fd5a.
2014-04-30 13:04:41 +02:00
Johannes Meyer f209393711 Add Mockery when provisioning vagrant
resolves #5623
2014-04-15 10:07:48 +02:00
Marius Hein f98a39fd5a Puppet: Change of icingaweb2 configuration deploy
- Only ensure presence no replacement if changed
- Config files pulled out of the working tree
- To restore, delete icingaweb configuration directory
2014-04-01 10:18:10 +02:00
Thomas Gelf 8d29620350 Rename state history links 2014-03-27 09:47:52 +00:00
Thomas Gelf b677a631f0 Use new web router for Vagrant box too 2014-03-27 07:27:28 +00:00
Thomas Gelf cb5d90ad41 Simplify pre-bootstrapping web routing 2014-03-27 07:25:53 +00:00
Thomas Gelf b0c2d9a0ac Symlink svg dir in vagrant box 2014-03-21 13:57:58 +00:00
Johannes Meyer 617b6822d7 Add pagination support to the servicematrix
refs #4180
2014-03-19 09:11:24 +01:00
Thomas Gelf 58248c34a9 Remove width & height settings from dashboard components 2014-03-17 17:43:45 +00:00
Thomas Gelf 431cb9a4b4 Add new process info link to System menu 2014-03-10 00:51:36 +01:00
Thomas Gelf 6d6d1d7a33 We need php-gd for PDF generation in our Vagrant box 2014-03-08 12:45:15 +01:00
Thomas Gelf edd03d3e55 Move "temporary logout" to menu 2014-03-07 17:29:04 +00:00
Thomas Gelf 13f827a0ef Cleanup preferences, add them to the menu 2014-03-07 17:03:43 +00:00
Thomas Gelf a8e4a6a0f3 Vagrant box had old dashboard.ini 2014-03-06 17:49:32 +00:00
Thomas Gelf 7a712c1f98 Default menu cleanup 2014-03-06 10:29:32 +00:00
Thomas Gelf 8730360de7 One more menu.ini... we should clean up some duplicated files 2014-03-04 16:37:16 +00:00
Thomas Gelf c50d000845 Vagrant config files 2014-03-04 16:16:07 +00:00
Thomas Gelf a404b62cdb Add css and js.php to vagrant. You need a Puppet training, guys! 2014-03-04 15:22:37 +00:00
Eric Lippmann 07d04628cf Merge branch 'feature/installation-and-configuration-cleanup-5638'
Conflicts:
	config/config.ini.in
	library/Icinga/Application/ApplicationBootstrap.php
	library/Icinga/Application/Cli.php
	library/Icinga/Application/EmbeddedWeb.php
	library/Icinga/Application/Logger.php
	library/Icinga/Application/Modules/Manager.php
	library/Icinga/Application/Web.php
	library/Icinga/Authentication/Backend/DbUserBackend.php
	library/Icinga/Authentication/Manager.php
	library/Icinga/User/Preferences/IniStore.php
	test/php/library/Icinga/Application/LoggerTest.php
2014-03-03 19:03:39 +01:00
Eric Lippmann 7bf888a554 Vagrant: Add monitoring module config 2014-03-03 18:16:07 +01:00
Eric Lippmann 39c80dccaf Decouple authentication backend creation from Icinga\Authentication\Manager
Add authentication backend type msldap with default values for user_class
and user_name_attribute. Backend type ldap now logs an error when user_class
and user_name_attribute ist not configured. Rename membership.ini to
memberships.ini since all our INI configuration files are in the plurar
where it makes sense. The AuthenticationController now handles
authentication

refs #5685
refs #5638
fixes #5218
2014-03-03 17:21:17 +01:00
Eric Lippmann 25665dec24 Vagrant: Add authentication.ini and resources.ini to /etc/icingaweb
refs #5638
2014-02-21 10:16:16 +01:00
Eric Lippmann 7fa6668b64 Make Icinga Web 2 work without any config file
refs #5638
fixes #5523
2014-02-20 13:53:28 +01:00
Eric Lippmann 76769865da Vagrant: Fix public paths for the dev environment
refs #5638
refs #5554
2014-02-18 17:41:31 +01:00
Eric Lippmann 2b7f11a752 Vagrant: Set up dev environment without any config file yet
refs #5638
resolves #5554
2014-02-18 16:41:53 +01:00
Eric Lippmann 99cccac052 Vagrant: Temporary disable Icinga2 2014-02-04 17:37:24 +01:00
Eric Lippmann 8e645d0410 Vagrant: Fix first boot+provisioning of the virtual machine 2014-01-28 15:54:13 +01:00
Eric Lippmann 12fb3a73bd Vagrant: Rename nagios-plugins to monitoring-plugins
https://bugzilla.redhat.com/show_bug.cgi?id=1054340

fixes #5548
2014-01-22 13:44:53 +01:00
Eric Lippmann ca1d50ae53 Rename Icinga 2 Web to Icinga Web 2 2013-10-23 15:11:06 +02:00
Eric Lippmann f228e03c3a Vagrant VM: Update icinga-mysql to 1.10-beta and install icinga-web 1.10-beta
If you've already got a provisioned vm, you've to run
    vagrant ssh -c 'sudo mysql -e "drop database icinga;"'
before reprovisioning the machine
2013-10-23 12:46:34 +02:00
Marius Hein 115d07fb81 Vagrant manifest bugfix
refs #4941
2013-10-22 18:14:39 +02:00
Marius Hein 8c640cbab7 Fix missing database dependencies for vagrant/puppet
refs #4941
2013-10-22 17:50:21 +02:00
Marius Hein f770075276 Autoconf: Fix database validation
refs #4941
2013-10-22 17:50:20 +02:00
Marius Hein 7c6355613f Change default path in tools and documentation
refs #4926
2013-10-22 11:56:36 +02:00
Marius Hein 8b419e15c4 Vagrant box configure icingaweb source
refs #4926
2013-10-22 11:39:06 +02:00
Eric Lippmann b47a4d7864 Vagrant: Update nagios-plugins to version 1.5 2013-10-08 11:37:39 +02:00