From fe6b14bb7386aebf69163ac204bc60c80e068a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denny=20Korsuk=C3=A9witz?= Date: Thu, 9 Sep 2021 12:33:48 +0200 Subject: [PATCH] Ported to 6.1. --- .otrs-ci.yml | 32 ------------------- .weblate | 4 +-- Kernel/Language/bg_SystemMonitoring.pm | 3 +- Kernel/Language/de_SystemMonitoring.pm | 3 +- Kernel/Language/es_MX_SystemMonitoring.pm | 3 +- Kernel/Language/es_SystemMonitoring.pm | 3 +- Kernel/Language/hu_SystemMonitoring.pm | 3 +- Kernel/Language/it_SystemMonitoring.pm | 3 +- Kernel/Language/ja_SystemMonitoring.pm | 3 +- Kernel/Language/pl_SystemMonitoring.pm | 3 +- Kernel/Language/pt_BR_SystemMonitoring.pm | 3 +- Kernel/Language/ru_SystemMonitoring.pm | 3 +- Kernel/Language/sk_SK_SystemMonitoring.pm | 3 +- Kernel/Language/sr_Cyrl_SystemMonitoring.pm | 3 +- Kernel/Language/sr_Latn_SystemMonitoring.pm | 3 +- Kernel/Language/zh_CN_SystemMonitoring.pm | 3 +- .../Maint/SystemMonitoring/NagiosCheck.pm | 3 +- .../NagiosCheckTicketCount.pm | 3 +- .../PostMaster/Filter/SystemMonitoring.pm | 3 +- .../System/Ticket/Event/Icinga2Acknowledge.pm | 3 +- .../System/Ticket/Event/NagiosAcknowledge.pm | 3 +- SystemMonitoring.sopm | 8 ++--- development/PortingTo7.md | 4 --- .../Maint/SystemMonitoring/NagiosCheck.t | 3 +- .../SystemMonitoring/NagiosCheckTicketCount.t | 3 +- scripts/test/SystemMonitoring.t | 3 +- scripts/test/sample/NagiosCheckTesting.pm | 2 +- var/packagesetup/SystemMonitoring.pm | 3 +- 28 files changed, 53 insertions(+), 66 deletions(-) delete mode 100644 .otrs-ci.yml delete mode 100644 development/PortingTo7.md diff --git a/.otrs-ci.yml b/.otrs-ci.yml deleted file mode 100644 index d4deeb4..0000000 --- a/.otrs-ci.yml +++ /dev/null @@ -1,32 +0,0 @@ -Active: 1 - -PlatformSets: - - ondemand-otrs6 - -DeployOTRSBranch: rel-6_0 - -DeployOTRSPackages: - - OTRSCodePolicy@master - -TestModes: - Merge: - PlatformSets: - - ondemand-merge-otrs6 - DeployOTRSPackages: - - OTRSCodePolicy@master - - FAQ@rel-6_0 - - TimeAccounting@rel-6_0 - - SystemMonitoring@rel-6_0 - - OTRSMasterSlave@rel-6_0 - - GeneralCatalog@rel-6_0 - - ITSMCore@rel-6_0 - - ITSMIncidentProblemManagement@rel-6_0 - - ITSMConfigurationManagement@rel-6_0 - - ITSMChangeManagement@rel-6_0 - - ITSMServiceLevelManagement@rel-6_0 - - ImportExport@rel-6_0 - - OTRSBusiness@rel-6_0 - - OTRSBusinessSeleniumTesting@master - - Silent: - Active: 0 diff --git a/.weblate b/.weblate index c2483a9..c6acf7c 100644 --- a/.weblate +++ b/.weblate @@ -1,3 +1,3 @@ [weblate] -url = https://translate.otrs.com/api/ -translation = otrs-6/system-monitoring/ +url = https://translations.znuny.org/api/ +translation = znuny/systemmonitoring/ diff --git a/Kernel/Language/bg_SystemMonitoring.pm b/Kernel/Language/bg_SystemMonitoring.pm index e632a40..56d4585 100644 --- a/Kernel/Language/bg_SystemMonitoring.pm +++ b/Kernel/Language/bg_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/de_SystemMonitoring.pm b/Kernel/Language/de_SystemMonitoring.pm index bfa3753..24ba8fd 100644 --- a/Kernel/Language/de_SystemMonitoring.pm +++ b/Kernel/Language/de_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/es_MX_SystemMonitoring.pm b/Kernel/Language/es_MX_SystemMonitoring.pm index 56dc52b..3897995 100644 --- a/Kernel/Language/es_MX_SystemMonitoring.pm +++ b/Kernel/Language/es_MX_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/es_SystemMonitoring.pm b/Kernel/Language/es_SystemMonitoring.pm index ad5be6b..de3fceb 100644 --- a/Kernel/Language/es_SystemMonitoring.pm +++ b/Kernel/Language/es_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/hu_SystemMonitoring.pm b/Kernel/Language/hu_SystemMonitoring.pm index 716f9d2..20a688c 100644 --- a/Kernel/Language/hu_SystemMonitoring.pm +++ b/Kernel/Language/hu_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/it_SystemMonitoring.pm b/Kernel/Language/it_SystemMonitoring.pm index 28f2183..1e61f4a 100644 --- a/Kernel/Language/it_SystemMonitoring.pm +++ b/Kernel/Language/it_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/ja_SystemMonitoring.pm b/Kernel/Language/ja_SystemMonitoring.pm index aa3c9ba..5c646df 100644 --- a/Kernel/Language/ja_SystemMonitoring.pm +++ b/Kernel/Language/ja_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/pl_SystemMonitoring.pm b/Kernel/Language/pl_SystemMonitoring.pm index 1d472a3..40af3a2 100644 --- a/Kernel/Language/pl_SystemMonitoring.pm +++ b/Kernel/Language/pl_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/pt_BR_SystemMonitoring.pm b/Kernel/Language/pt_BR_SystemMonitoring.pm index 0915807..a81f250 100644 --- a/Kernel/Language/pt_BR_SystemMonitoring.pm +++ b/Kernel/Language/pt_BR_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/ru_SystemMonitoring.pm b/Kernel/Language/ru_SystemMonitoring.pm index b4e2d96..3327e90 100644 --- a/Kernel/Language/ru_SystemMonitoring.pm +++ b/Kernel/Language/ru_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/sk_SK_SystemMonitoring.pm b/Kernel/Language/sk_SK_SystemMonitoring.pm index 2766b7f..364e546 100644 --- a/Kernel/Language/sk_SK_SystemMonitoring.pm +++ b/Kernel/Language/sk_SK_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/sr_Cyrl_SystemMonitoring.pm b/Kernel/Language/sr_Cyrl_SystemMonitoring.pm index 5906151..1022037 100644 --- a/Kernel/Language/sr_Cyrl_SystemMonitoring.pm +++ b/Kernel/Language/sr_Cyrl_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/sr_Latn_SystemMonitoring.pm b/Kernel/Language/sr_Latn_SystemMonitoring.pm index d49014c..25a2297 100644 --- a/Kernel/Language/sr_Latn_SystemMonitoring.pm +++ b/Kernel/Language/sr_Latn_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/Language/zh_CN_SystemMonitoring.pm b/Kernel/Language/zh_CN_SystemMonitoring.pm index 2bc1711..7caf1b5 100644 --- a/Kernel/Language/zh_CN_SystemMonitoring.pm +++ b/Kernel/Language/zh_CN_SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheck.pm b/Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheck.pm index afb6290..8aba961 100644 --- a/Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheck.pm +++ b/Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheck.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.pm b/Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.pm index 36dd70f..1a41cbc 100644 --- a/Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.pm +++ b/Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/System/PostMaster/Filter/SystemMonitoring.pm b/Kernel/System/PostMaster/Filter/SystemMonitoring.pm index 2c89be1..234bc00 100644 --- a/Kernel/System/PostMaster/Filter/SystemMonitoring.pm +++ b/Kernel/System/PostMaster/Filter/SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/System/Ticket/Event/Icinga2Acknowledge.pm b/Kernel/System/Ticket/Event/Icinga2Acknowledge.pm index 08a8da6..f1c847a 100644 --- a/Kernel/System/Ticket/Event/Icinga2Acknowledge.pm +++ b/Kernel/System/Ticket/Event/Icinga2Acknowledge.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/Kernel/System/Ticket/Event/NagiosAcknowledge.pm b/Kernel/System/Ticket/Event/NagiosAcknowledge.pm index fa386d2..2909697 100644 --- a/Kernel/System/Ticket/Event/NagiosAcknowledge.pm +++ b/Kernel/System/Ticket/Event/NagiosAcknowledge.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/SystemMonitoring.sopm b/SystemMonitoring.sopm index 68e8fc2..887f398 100644 --- a/SystemMonitoring.sopm +++ b/SystemMonitoring.sopm @@ -1,10 +1,10 @@ SystemMonitoring - 0.0.0 - 6.0.x - OTRS AG - https://otrs.com/ + 6.1.0 + 6.1.x + Znuny + https://www.znuny.org/ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Basic mail interface to System Monitoring Suites. Also provides deeper integration to Nagios and Icinga2 (acknowledge on lock and check script). Einfache Email Schnittstelle zu System Monitoring Suites. Weitergehende Integration mit Nagios und Icinga2 (Acknowledge on lock and Checkscript). diff --git a/development/PortingTo7.md b/development/PortingTo7.md deleted file mode 100644 index 4e8714f..0000000 --- a/development/PortingTo7.md +++ /dev/null @@ -1,4 +0,0 @@ - # Enhancements - - 2018-03-05 Review bug#[6518](https://bugs.otrs.org/show_bug.cgi?id=6518) - PostFilterModule mislabelled as PreFilterModule? - -EOF diff --git a/scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheck.t b/scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheck.t index da48193..e5082bf 100644 --- a/scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheck.t +++ b/scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheck.t @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.t b/scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.t index b6c56be..086871c 100644 --- a/scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.t +++ b/scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.t @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/scripts/test/SystemMonitoring.t b/scripts/test/SystemMonitoring.t index 76ffe5d..0e8a23a 100644 --- a/scripts/test/SystemMonitoring.t +++ b/scripts/test/SystemMonitoring.t @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/scripts/test/sample/NagiosCheckTesting.pm b/scripts/test/sample/NagiosCheckTesting.pm index a6a3b26..596561d 100644 --- a/scripts/test/sample/NagiosCheckTesting.pm +++ b/scripts/test/sample/NagiosCheckTesting.pm @@ -1,5 +1,5 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you diff --git a/var/packagesetup/SystemMonitoring.pm b/var/packagesetup/SystemMonitoring.pm index feb5f87..a87a8ec 100644 --- a/var/packagesetup/SystemMonitoring.pm +++ b/var/packagesetup/SystemMonitoring.pm @@ -1,5 +1,6 @@ # -- -# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/ +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you