Commit Graph

434 Commits

Author SHA1 Message Date
Robert Scheck 90d08faa9c Strip '\r' in notification messages to avoid 'Content-Type: application/octet-stream'
Without this patch, an accidential `\r` in e.g. `$NOTIFICATIONCOMMENT`
leads to a `Content-Type: application/octet-stream` header in e-mails.
The accidential `\r` might slip in usually using Icinga/Nagios apps...
2024-05-15 11:14:49 +02:00
Julian Brost bead025b9c
Merge pull request #9713 from Tqnsls/Tqnsls-updated-mail-notifications
Updated mail-host-notification and mail-service-notification
2023-05-19 16:34:21 +02:00
Alexander Aleksandrovič Klimov ae0a4fb464
Fix typo
which leaves a string open and prevents the code which should be outside it from running.
2023-05-08 15:23:06 +02:00
Alexander Aleksandrovič Klimov c2c0c27dac
Fix typo 2023-04-14 12:36:01 +02:00
Alexander Aleksandrovič Klimov a85892ccb9
mail-*-notification: remove redundant required = false 2023-04-14 12:22:27 +02:00
Alexander A. Klimov d88bbcbcef etc/icinga2/scripts/mail-*-notification.sh: render Icinga DB Web URLs
not monitoring module ones. This takes effect for new installations only.
2023-04-06 12:19:31 +02:00
Silas 7f0aaf9b79
Update commands.conf 2023-03-13 12:47:39 +01:00
Alexander Aleksandrovič Klimov bdda58175b Update mail-host-notification.sh and mail-service-notification.sh 2023-03-02 14:24:02 +01:00
Silas 31710e1162 Added host.notes and service.notes output if specified 2023-03-02 14:24:02 +01:00
Alexander A. Klimov bbf2e80002 Remove StatusDataWriter which has been deprecated for 5 major versions 2023-03-01 17:16:28 +01:00
Alexander Aleksandrovič Klimov 1265eb76cc
icinga2.service: depend on icingadb-redis.service if any
to prevent its shutdown until we've written everything.
2022-01-31 17:03:34 +01:00
Alexander Aleksandrovič Klimov 63fca8faa1
Merge pull request #9000 from haxtibal/feature/journaldlogger
JournaldLogger - log to systemd journal
2021-10-01 17:42:10 +02:00
RincewindsHat 767464f947 Correct typos in documentation and examples 2021-09-24 14:33:44 +02:00
Tobias Deiminger 4d678fcef0 Add available feature journald.conf in /etc
Similar to the other loggers, add a predefined object JournaldLogger in
features-available that will log messages >= warning, with default facility
LOG_USER. It is disabled by default, and can be enabled with:
$ sudo icing2 feature enable journald
2021-09-23 16:08:39 +02:00
Alexander A. Klimov 9d4b0f1268 Introduce Influxdb2Writer
refs #8711
2021-07-20 16:21:36 +02:00
Alexander A. Klimov d26aa9fb34 InfluxdbCommonWriter: abstract InfluxdbWriter
refs #8711
2021-07-20 16:21:36 +02:00
Alexander Aleksandrovič Klimov 58e329bc03
Merge pull request #7874 from Icinga/feature/sd_notify-7329
sd_notify() systemd about what we're doing right now
2021-06-28 18:20:15 +02:00
Julian Brost aa423d80ac Change WindowsEventLogLogger default severity to information
As this is intended to replace the mainlog feature which logged severity
information, this should be the default for this logger.
2021-06-23 17:05:05 +02:00
Julian Brost 23aa628665 Windows: automatically migrate from mainlog to windowseventlog 2021-06-21 15:15:54 +02:00
Julian Brost 6de9f58810 Add WindowsEventLogLogger 2021-06-21 15:15:54 +02:00
Alexander A. Klimov e98a7a9140 icinga2.service: add NotifyAccess=all
refs #7329
2021-06-01 18:07:42 +02:00
Benedikt Heine a71c105335 Run shellcheck over initscripts
Mainly quoting all variables
2020-12-27 16:57:23 +01:00
Benedikt Heine ebb2ec7e92 Use tabs for indentation
Except for the switch case, the script was written with tab indentation.
With tabstop of 4 spaces, the indentation in the switch case would make
sense, but I assume this is just a glitch of the editor.
2020-12-27 16:34:02 +01:00
Benedikt Heine d4251ea5ca Exit from script instead of subshell on missing user
When executing `false || (echo bad; exit 1)`, the call to `exit` won't
exit the script, it will only exit the subshell and the exit code will
be stored in the return code `$?`.

Since this is an error, we have to exit the script properly.
2020-12-27 16:29:37 +01:00
Alexander Aleksandrovič Klimov 12fd687e1a
Merge pull request #7915 from Icinga/bugfix/scripts-sh
etc/icinga2/scripts/*.sh: explicitly specify shell
2020-11-13 17:02:30 +01:00
Noah Hilverling b37aaa27e1
Merge pull request #8045 from Icinga/bugfix/prepare-dirs-chmod
prepare-dirs: combine mkdir and chmod
2020-06-09 13:59:33 +02:00
Alexander A. Klimov 2f0f2e8c35 prepare-dirs: combine mkdir and chmod 2020-06-08 15:14:29 +02:00
Alexander A. Klimov db400b3f19 etc/icinga2/scripts/*.sh: explicitly specify shell 2020-03-18 12:30:33 +01:00
Michael Insel c783448395 Revert "set correct utf8 email subject headers (RFC1342)"
This reverts commit 415552f355.
2019-12-09 19:36:35 +01:00
Michael Insel 98f656c266 Revert "service and host mail-notifications, add line-breaks to very long output strings"
This reverts commit c2b6f6b246.
2019-12-09 19:33:15 +01:00
vigiroux 52e09a287d Fix bash line continuation in mail-host-notification.sh 2019-12-06 15:00:42 -05:00
Michael Insel 901d25976d Fix notification scripts string comparison
fixes #7609
2019-11-21 20:01:55 +01:00
Noah Hilverling c8935bf14f IcingaDB: Update Redis port to use Icinga-Redis 2019-11-21 09:59:21 +01:00
Michael Friedrich 1a503b554b
Merge pull request #7357 from Ant1x/feature/opentsdb-tags
OpenTsdbWriter - Custom Tag Support
2019-11-15 14:52:49 +01:00
Michael Friedrich 09892a9cd5
Merge pull request #6822 from unki/change/add-line-breaks-to-service-output
service and host mail-notifications, add line-breaks to very long out…
2019-11-14 13:18:20 +01:00
Michael Friedrich 05971d401c
Merge pull request #6369 from islander/fix/utf8-headers
Set correct utf-8 email subject header (RFC1342)
2019-11-14 13:14:20 +01:00
Alexander Aleksandrovič Klimov 13ab7eb609 Rename redis to icingadb 2019-11-02 14:00:24 +01:00
Alexander Aleksandrovič Klimov f51454af65 git ls-files -z |xargs -0 perl -pi -e 's/RedisWriter/IcingaDB/g' 2019-11-02 14:00:24 +01:00
Gunnar Beutner b75e21a998 Redis support (WIP) 2019-11-02 14:00:23 +01:00
Ant1x 166e79fee1 Added OpenTSDB Metric prefix naming support
Added OpenTSDB Generic Metric functionality
2019-10-24 00:04:12 +11:00
Ant1x 9c5bbdfe10 Added OpenTSDB custom tagging documentation
Added OpenTSDB custom tagging configuration template
2019-10-24 00:04:12 +11:00
Michael Friedrich ac684ec128 Adjust zones.d/README and just point to the docs 2019-09-24 12:57:32 +02:00
Michael Friedrich b837b505e6 Update wrong information in example config for zones.d 2019-09-23 09:46:13 +02:00
kiba eef077a8a3
Merge branch 'master' into fix/utf8-headers 2019-09-20 09:52:55 +11:00
Michael Friedrich 5aa07b51a2 Docs: Rename 'custom attribute' to 'custom variable'
refs #6830
2019-07-19 14:38:59 +02:00
Michael Friedrich aabfcfef9e
Merge pull request #7065 from uubk/logrotate-fix
Fix logrotate "Operation not permitted"
2019-07-08 09:47:18 +02:00
Michael Friedrich f8a82b5e28
Merge pull request #7183 from hlsolutions/bugfix/systemv-returncode
Fix System-V return codes according to LSB
2019-06-06 13:31:41 +02:00
Michael Friedrich b7279597d9
Merge pull request #7118 from Icinga/bugfix/killmode
Systemd: don't kill any running check plugins
2019-06-06 12:55:01 +02:00
Robert Scheck bb503cce16 Strip '\r' in notification messages to avoid 'Content-Type: application/octet-stream'
Without this patch, an accidential `\r` in e.g. `$NOTIFICATIONCOMMENT`
leads to a `Content-Type: application/octet-stream` header in e-mails.
The accidential `\r` might slip in usually using Icinga/Nagios apps...
2019-05-16 12:44:29 +02:00
Sascha Westermann a761adad8a Fix System-V return codes according to LSB
- "status"-calls use different exit codes, refer to http://refspecs.linuxbase.org/LSB_3.0.0/LSB-PDA/LSB-PDA/iniscrptact.html
- the "status"-call in "condrestart" returned an error if the daemon was not running: this has been fixed
2019-05-14 11:22:05 +02:00