From 807f709a02a80c5b0b55535fff99d43c5f18cabc Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Mon, 22 Jun 2020 12:44:57 +0200 Subject: [PATCH] Clarify Copyright declaration --- README.md | 29 +++++++++++++++++++++++------ host-by-telegram.sh | 16 +++++++++++++++- service-by-telegram.sh | 20 +++++++++++++++++--- 3 files changed, 55 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 39b4d12..6486243 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ template Host "Generic Host Template" {
Example host object - + ```ini object Host "icinga2-master" { import "Generic Host Template" @@ -259,7 +259,7 @@ template Notification "Template: Telegram (Generic)" {
Notification Template: Host Notifications - + ```ini template Notification "Template: Host Notifications via Telegram" { import "Template: Telegram (Generic)" @@ -272,7 +272,7 @@ template Notification "Template: Host Notifications via Telegram" {
Notification Template: Service Notifications - + ```ini template Notification "Template: Service Notifications via Telegram" { import "Template: Telegram (Generic)" @@ -287,7 +287,7 @@ template Notification "Template: Service Notifications via Telegram" { #### Example notification apply rules
Apply rule for host notifications - + ```ini apply Notification "Host Alert via @telegram_bot" to Host { import "Template: Host Notifications via Telegram" @@ -303,7 +303,7 @@ template Notification "Template: Service Notifications via Telegram" {
Apply rule for service notifications - + ```ini apply Notification "Service Alerts via @telegram_bot" to Service { import "Template: Service Notifications via Telegram" @@ -319,7 +319,7 @@ apply Notification "Service Alerts via @telegram_bot" to Service { #### Example Director screenshot
Notifications by Telegram via Icinga Director - + ![Icinga Director Config](img/Telegram_Notification_in_Icinga_Director.jpg)
@@ -327,3 +327,20 @@ apply Notification "Service Alerts via @telegram_bot" to Service { * [Just the Commands](contrib/Director-Basket_Telegram_Commands.json) * [Commands and Notification Templates with fields](contrib/Director-Basket_Telegram_Notifications.json) (requires Director v1.8.0 or a master newer than [80f9ea2](https://github.com/Icinga/icingaweb2-module-director/commit/80f9ea2)) + +## License + +Copyright (C) 2018 Marianne M. Spiller + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff --git a/host-by-telegram.sh b/host-by-telegram.sh index f2bfd50..322d5e4 100755 --- a/host-by-telegram.sh +++ b/host-by-telegram.sh @@ -1,9 +1,23 @@ #!/usr/bin/env bash ## /etc/icinga2/scripts/host-by-telegram.sh / 20170330 -## Marianne M. Spiller ## Last updated 20190820 ## Last tests used 2.11.2-1.buster +# Copyright (C) 2018 Marianne M. Spiller +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + PROG="`basename $0`" HOSTNAME="`hostname`" TRANSPORT="curl" diff --git a/service-by-telegram.sh b/service-by-telegram.sh index 8ca4c63..30786c4 100755 --- a/service-by-telegram.sh +++ b/service-by-telegram.sh @@ -1,9 +1,23 @@ #!/usr/bin/env bash ## /etc/icinga2/scripts/service-by-telegram.sh / 20170330 -## Marianne M. Spiller ## Last updated 20190820 ## Last tests used icinga2-2.11.2-1.buster +# Copyright (C) 2018 Marianne M. Spiller +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + PROG="`basename $0`" HOSTNAME="`hostname`" TRANSPORT="curl" @@ -32,7 +46,7 @@ The following are mandatory: -r TELEGRAM_BOTTOKEN (\$telegram_bottoken$) -s SERVICESTATE (\$service.state$) -t NOTIFICATIONTYPE (\$notification.type$) - -u SERVICEDISPLAYNAME (\$service.display_name$) + -u SERVICEDISPLAYNAME (\$service.display_name$) And these are optional: -b NOTIFICATIONAUTHORNAME (\$notification.author$) @@ -59,7 +73,7 @@ do l) HOSTALIAS=$OPTARG ;; n) HOSTDISPLAYNAME=$OPTARG ;; o) SERVICEOUTPUT=$OPTARG ;; - p) TELEGRAM_BOT=$OPTARG ;; + p) TELEGRAM_BOT=$OPTARG ;; q) TELEGRAM_CHATID=$OPTARG ;; r) TELEGRAM_BOTTOKEN=$OPTARG ;; s) SERVICESTATE=$OPTARG ;;