Commit Graph

380 Commits

Author SHA1 Message Date
Christian Gut 0f0b6f1df9 Notification scripts: More readable & redundancy cleanup 2017-08-14 17:27:39 +02:00
Michael Friedrich f0fbcbba5b Update documentation for optional arguments and add old updated command config
See https://www.icinga.com/docs/icinga2/latest/doc/03-monitoring-basics/#notification-commands-in-27

refs #5474
2017-08-14 17:11:57 +02:00
pv2b 7dabf2fe93 Notification scripts: Make the `-4` parameter optional
Not all hosts may have the `address` attribute set, or just use
`address6` instead.

refs #5474
2017-08-14 17:11:57 +02:00
Michael Friedrich e188686ed4 Merge pull request #5392 from ekohl/cache-dir
Ensure the cache directory exists
2017-08-09 18:22:07 +02:00
Michael Friedrich 874e005284 Systemd: Add DefaultTasksMax=infinity to service file
This solves the problem with Systemd >= 226 and fork errors with
Icinga 2. Seen on SLES 11 SP2.

fixes #4918
2017-08-08 16:11:40 +02:00
Ewoud Kohl van Wijngaarden e83c43435d
Ensure the cache directory exists
As suggested in https://github.com/Icinga/icinga2/issues/4414
2017-07-01 13:59:58 +02:00
Michael Friedrich 6397fedc3d Remove experimental redis feature before 2.7 release 2017-06-20 11:52:24 +02:00
Michael Friedrich f5d3428563 Notification Scripts: Ensure that mail from address works on Debian/RHEL/SUSE (mailutils vs mailx)
fixes #5299
2017-06-16 20:54:24 +02:00
Marianne Spiller 8f670fd96a notification_type mandatory
Make $notification_type$ mandatory in mail-service-notification, too.
2017-06-07 09:54:30 +02:00
Michael Friedrich 1e153f14d7 zones.conf: Add global-templates & director-global by default
This makes it easier for cluster and client setups with or
without the Icinga Director.

Note: Clients will still not receive synced configuration if
accept_config is not enabled (which is the default, and can be changed
during setup).

fixes #5106
2017-06-02 10:54:35 +02:00
Michael Friedrich 6cee5331ec DEPRECATE icinga2-classicui-config package and files
refs #5102
2017-05-29 20:32:40 +02:00
Michael Friedrich aa2408f2c7 Fix verbose mode in notifications scripts
Otherwise it just spams the syslog on frequent notifications

refs #5170
2017-05-24 14:36:52 +02:00
Michael Friedrich 52d986d02b Revert "Add LogstashWriter feature"
This reverts commit f5a971f5b0.

refs #4054
2017-05-23 12:05:01 +02:00
Michael Friedrich 4c7660190f Revert "Review LogstashWriter feature implementation"
This reverts commit bd5ff814f2.

refs #4054
2017-05-23 12:04:08 +02:00
Michael Friedrich 7b9f478bc1 Check for required parameters in notification scripts; add error helpers
refs #5170
2017-05-10 13:23:39 +02:00
Michael Friedrich 91ab8551c7 First review of notification script changes
refs #5170
2017-05-09 17:53:52 +02:00
Marianne M. Spiller 82a5c5a624 Add notification command parameters to the default mail notification script
Replace the previous notification scheme - now using getops in place of ENV
variables, giving the ability to integrate with the Icinga Director.

refs #5170

Signed-off-by: Michael Friedrich <michael.friedrich@icinga.com>
2017-05-09 17:53:52 +02:00
Michael Friedrich 3649a5a0d7 InfluxdbWriter: Use a work queue for async message processing; add stats log/api 2017-05-05 17:56:51 +02:00
Dirk Goetz 7608acd0e2 improve systemd service file 2017-04-04 09:27:19 +02:00
Michael Friedrich 8842aa9b0c Add network requirement to init script
fixes #4921
2017-03-30 18:47:04 +02:00
Michael Friedrich bd5ff814f2 Review LogstashWriter feature implementation
refs #4054
2017-03-20 14:30:03 +01:00
Kai Goller f5a971f5b0 Add LogstashWriter feature
This adds the UdpSocket class.

refs #4054
2017-03-20 14:30:03 +01:00
Michael Friedrich 3e98e3fb2c Better error handling and fixes
refs #4991
2017-03-14 15:18:39 +01:00
Gunnar Beutner 31650b0beb Add RedisWriter class
refs #4991
2017-02-09 16:40:11 +01:00
Michael Friedrich b7caf0820d Ensure that *.icinga.com is used everywhere
fixes #13897
fixes #13277
2017-01-10 17:19:12 +01:00
Gunnar Beutner 78cd56e277 Implement support for default templates
fixes #12575
2016-08-28 10:27:43 +02:00
Gunnar Beutner aba62ec0b3 Fix missing constants on Windows
refs #10722
2016-08-23 13:30:50 +02:00
Michael Friedrich 9a455f0c3d icinga2.conf: Include plugins-contrib, manubulon, windows-plugins, nscp by default
This helps a lot when configuring client checks as command endpoint
where the check command definitions are both used on the master
and the client.

fixes #10722
2016-08-16 11:17:29 +02:00
Dirk Goetz bc06ff18e5 Mute chcon during safe-reload
Removes the error message on systems with SELinux enabled but without icinga2 policy.

fixes #11648
2016-08-15 13:33:47 +02:00
Berthold Cogel 47726d7701 Init script: condrestart should only restart a running service
fixes #11650

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>
2016-08-08 17:55:11 +02:00
Gunnar Beutner 256d936661 Increase systemd startup timeout
fixes #12237
2016-07-27 07:44:11 +02:00
Gunnar Beutner 1c6c4859e1 Fix incorrect variable name in the hosts.conf example config for Windows
fixes #11894
2016-06-06 09:53:43 +02:00
Simon Murray 79c1e883d1 Add InfluxDB Writer
Adds an Icinga2 object to directly interface with InfluxDB's native HTTP API.
This supports optional basic authorization, and TLS transport.  InfluxDB didn't
appear to like having the TLS stream kept open, so instead this object buffers
data points which are then flushed to InfluxDB as a batch write, either driven
by a configurable timeout or threshold.

As InfluxDB is a schema-less database the host and service templates are user
configurable allowing both the measurement field and tags to be set by the
end user via macro expansion.  This allows access to tag fields from arbitrary
data associated with host.vars or service.vars.  If a particular value is
unable to be resolved, the tag will be dropped and not transmitted to InfluxDB.

Also alters URL handling to omit array brackets when only a single value is
attached to a key, otherwise InfluxDB has a strop with non-standard syntax.

fixes #10480

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>
2016-05-03 14:12:51 +02:00
Gunnar Beutner 327d12295c Implement support for upgrading NSIS-based installations
refs #11449
2016-04-01 08:42:58 +02:00
Louis Sautier 4970c459ee Re-add the 'su' directive to logrotate if supported
- try to detect a recent logrotate version which supports the 'su'
directive (added in 3.8.0, see
5be96cf182 (diff-e4eb329834da3d36278b1b7d943b3bc9R6))
- if logrotate can't be found, assume an old version is used
- allow the parameter to be forced by the user

fixes #9249

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2016-03-29 14:59:06 +02:00
Lee Clemens 7bf012ca50 Reload logs after logrotate across distros
Signed-off-by: Jean Flach <jean-marcel.flach@netways.de>

fixes #10935
2016-01-21 10:12:43 +01:00
Lee Clemens 984eaf5a1f Add network.target to unit file
Icinga2 fails with 'Cannot bind TCP socket for host',
if other services requiring network.target are not installed.

Signed-off-by: Jean Flach <jean-marcel.flach@netways.de>

fixes #10968
2016-01-14 10:11:38 +01:00
Gunnar Beutner 599929b0f6 Update copyright headers for 2016 2016-01-12 08:29:59 +01:00
Daniil Yaroslavtsev d739675799 GelfWriter: Add additional fields for 'CHECK RESULT' events
fixes #9858
2015-12-18 11:05:38 +01:00
Dirk Goetz c7c3cceba8 Only execute chcon if selinux is enabled and use full context
fixes #10773
2015-12-07 10:13:40 +01:00
Michael Friedrich ef0f4ca4b4 Fix obsolete file installation
refs #10140
2015-11-26 20:02:17 +01:00
Michael Friedrich 9289971829 Remove IcingaStatusWriter feature
fixes #10140
2015-11-26 19:30:40 +01:00
Gunnar Beutner 9f44fadb65 Fix typo in prepare-dirs / safe-reload
fixes #10663
2015-11-18 20:18:04 +01:00
Gunnar Beutner 991bb0cd7e Don't use 'which' in the 'prepare-dirs' script
refs #10417
2015-11-06 17:43:08 +01:00
Gunnar Beutner 2a2da04af6 Fix: 'which' isn't available on minimal CentOS installs
fixes #10417
2015-10-21 14:41:48 +02:00
Michael Friedrich 84536da221 Implement global modified attributes for the IcingaApplication class
fixes #9859
2015-09-23 15:02:53 +02:00
Michael Friedrich fcf2f0ef5d Deprecate IcingaStatusWriter feature
fixes #8741
2015-09-14 10:36:06 +02:00
Michael Friedrich fca7a33aac Implement config file management for the API
refs #9083

fixes #9102
fixes #9103
fixes #9104

fixes #9705
2015-07-23 17:57:24 +02:00
Gunnar Beutner ccd63b9d15 Implement the include_zones directive
refs #9083
2015-07-21 09:32:17 +02:00
Dirk Goetz 167f43a231 added chcon to systemd safe-reload script
Selinux: Added support for notifications

refs #8332
2015-06-01 13:25:58 +02:00
Dirk Goetz 5d93b968fe added restorecon to systemd prepare-dirs script
refs #8332
2015-06-01 13:25:58 +02:00
Gunnar Beutner eadd516116 Include <nscp> in the default Windows config
fixes #9260
2015-05-13 08:45:04 +02:00
Gunnar Beutner 867ed87892 Re-add disk and icinga services in the Windows config
fixes #9259
2015-05-13 08:43:58 +02:00
Michael Friedrich da4ed19fc4 Remove wrong 'ignore where' expression from 'ssh' apply example
fixes #9188
2015-04-27 14:34:50 +02:00
Jean Flach 1664430c9f Do not create syslog.conf on Windows
fixes #9109
2015-04-24 14:47:21 +02:00
Gunnar Beutner 4214329bb6 logrotate: Check whether the PID file exists
refs #8808
2015-04-20 11:25:10 +02:00
Michael Friedrich 5baa837c8d Fix logrotate install
refs #8808
2015-04-20 10:11:48 +02:00
Michael Friedrich 0d9dfeeb93 Configuration: Default max_check_attempts should be lower for hosts than for services
fixes #8894
2015-04-17 17:53:27 +02:00
Jean-Marcel Flach a28369593a Fix logrotate configuration
refs #8868 fixes #8808
2015-03-31 12:18:20 +02:00
Jean Flach a7a0eca8b2 Add CheckCommands and documentation on Windows plugins
fixes #8180
fixes #8850
2015-03-26 10:56:06 +01:00
Louis Sautier 2d455efcd8 Make default notifications include users from host.vars.notification.mail.users
fixes #8830

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2015-03-20 15:58:19 +01:00
Jean Flach d490b0f15c Remove http_vhosts config from Windows
There is no check_http planed for Windows

fixes #8762
2015-03-16 13:15:54 +01:00
Tobias von der Krone 2a076e8283 Remove leading slash and extra blank line in constants.conf.cmake
refs #7209
2015-02-24 16:36:05 +01:00
Gunnar Beutner d6812a7703 Rename the PluginsContribDir constant to PluginContribDir
fixes #8509
2015-02-23 15:35:55 +01:00
Dirk Goetz 7f368c0e18 Add contributed command definitions
fixes #7209
fixes #7292
fixes #7294

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2015-02-18 15:43:27 +01:00
Gunnar Beutner bb033b5ce3 Fall back to using address6 when the address attribute is not set
fixes #8259
2015-02-13 11:52:50 +01:00
Gunnar Beutner fb323ee215 Evaluate apply filters in the for loop
fixes #7610
2015-01-29 12:38:25 +01:00
Tobias von der Krone 201883ff70 Add OpenTSDB perfdata plugin
refs #7256

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2015-01-28 12:39:01 +01:00
Michael Friedrich 78bfd0204c Update copyright year 2015-01-22 12:00:23 +01:00
Michael Friedrich a4e63de893 Documentation: Update Icinga Web 2 uri to /icingaweb2
fixes #8201
2015-01-13 20:42:42 +01:00
Gunnar Beutner 7be19a2134 Move the InstallConfig include into the top-level CMakeLists.txt file
refs #7794
2014-12-19 09:51:14 +01:00
Gunnar Beutner cb7f93dc19 Implement CMake options for some of the modules
fixes #7794
fixes #7795
2014-12-19 09:46:41 +01:00
Gunnar Beutner bd7b2f30ef Validate configuration files during reload
fixes #7045
2014-12-11 09:27:31 +01:00
Tim Hardeck ac6768d870 Use Icinga 1.x Apache conf
This Apache conf is from Icinga 1.x and should work with Apache 2.2 and
2.4.

fixes #7929
2014-12-03 17:03:04 +01:00
Lars Engels ba5f20224e Remove bashisms from some of the shell scripts
fixes #7685

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
2014-12-02 09:59:56 +01:00
Gunnar Beutner 00885f10d0 Add support for Apache 2.4 in the Classic UI config file
fixes #7739
2014-12-01 10:00:05 +01:00
Malte Rabenseifner 76d774d396 Fix group permission in prepare-dirs
fixes #7890

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2014-11-29 20:14:34 +01:00
Michael Friedrich 842b3a9cd7 Documentation: Explain macro array support, repeat_key, add icmp example
fixes #7868
fixes #7867
2014-11-27 16:59:17 +01:00
Gunnar Beutner 7ee0eef562 Move the icinga2-prepare-dirs script to /usr/lib
fixes #7786
2014-11-27 14:47:51 +01:00
Gunnar Beutner 9f0e0aac86 Fix the init script
refs #7613
2014-11-26 08:16:13 +01:00
Michael Friedrich 9818477a44 Make sure that user/group exists when starting Icinga 2
fixes #7173
fixes #7613
2014-11-25 18:44:25 +01:00
Gunnar Beutner b22d3c099a Add notification custom vars to the satellite-{host,service} templates
fixes #7770
2014-11-21 14:02:51 +01:00
Gunnar Beutner 184e38b122 Add Windows-specific example config files 2014-11-19 08:27:27 +01:00
Gunnar Beutner cbaece61e7 Fix another incorrect argument name
refs #7726
2014-11-18 16:48:58 +01:00
Lars Engels 9217ea3143 Add support for FreeBSD and DragonFlyBSD
refs #7680

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
2014-11-14 10:43:51 +01:00
Michael Friedrich 1820425562 GelfWriter: Add documentation
refs #7619
2014-11-11 14:16:48 +01:00
Michael Friedrich f838fc4e6c GelfWriter: Fix default example port
refs #7619
2014-11-11 14:16:48 +01:00
Michael Friedrich a4ed44247e Add 'gelf' feature config
refs #7619
2014-11-11 14:16:48 +01:00
Michael Friedrich c1f4d2243e Documentation: Better apply rule best practice in monitoring basics
fixes #7480
fixes #7543
fixes #7187
fixes #7573
2014-11-07 04:13:45 +01:00
Michael Friedrich 3f91e5358c Revamp sample configuration: add NodeName host, move services into apply rules schema
fixes #7594
2014-11-07 04:13:45 +01:00
Michael Friedrich 0f4e3004b6 Documentation: Add some more remote client details
Rename agents.conf too.

refs #7254
2014-11-02 21:56:11 +01:00
Michael Friedrich 4eeed787ea Docs: Add first draft for setting up remote clients using Icinga 2
refs #7254
2014-11-02 20:35:16 +01:00
Gunnar Beutner 2ab43a63cb Rename templates "agent-{host,service}" to "satellite-{host,service}"
refs #7525
2014-10-31 13:15:51 +01:00
Gunnar Beutner 4b6abd9aa7 Update downtimes.conf example config
fixes #7472
2014-10-30 12:22:31 +01:00
Gunnar Beutner 75b599c801 Set host/service variable in apply rules
fixes #7479
2014-10-29 10:09:40 +01:00
Michael Friedrich 64298c35ef Cli: Add agents.conf w/ default agent templates for 'agent update-config'
refs #7248
2014-10-28 19:46:10 +01:00
Michael Friedrich fec8e92221 Cli: Make sure to create & include 'repository.d'
refs #7255
2014-10-27 19:19:45 +01:00
Gunnar Beutner 35a1930629 Create repository.d directory 2014-10-24 14:24:59 +02:00
Gunnar Beutner 9ee523e601 Clean up the "agent setup" command a bit
refs #7423
2014-10-23 03:35:01 +02:00
Gunnar Beutner 6e17eadf8f Remove {DAEMON,ICINGA2}_USER and {DAEMON,ICINGA2}_GROUP variables
refs #7370
2014-10-20 21:41:04 +02:00