Skip to content

Commit

Permalink
Ported to 6.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dennykorsukewitz
dennykorsukewitz committed Sep 9, 2021
1 parent b81d832 commit fe6b14b
Show file tree
Hide file tree
Showing 28 changed files with 53 additions and 66 deletions.
32 changes: 0 additions & 32 deletions .otrs-ci.yml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions .weblate
View file
Original file line number Diff line number Diff line change
@@ -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/
3 changes: 2 additions & 1 deletion Kernel/Language/bg_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/de_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/es_MX_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/es_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/hu_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/it_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/ja_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/pl_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/pt_BR_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/ru_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/sk_SK_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/sr_Cyrl_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/sr_Latn_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/Language/zh_CN_SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheck.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/System/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/System/PostMaster/Filter/SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/System/Ticket/Event/Icinga2Acknowledge.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion Kernel/System/Ticket/Event/NagiosAcknowledge.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions SystemMonitoring.sopm
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<otrs_package version="1.1">
<Name>SystemMonitoring</Name>
<Version>0.0.0</Version>
<Framework Minimum="6.0.27">6.0.x</Framework>
<Vendor>OTRS AG</Vendor>
<URL>https://otrs.com/</URL>
<Version>6.1.0</Version>
<Framework>6.1.x</Framework>
<Vendor>Znuny</Vendor>
<URL>https://www.znuny.org/</URL>
<License>GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007</License>
<Description Lang="en">Basic mail interface to System Monitoring Suites. Also provides deeper integration to Nagios and Icinga2 (acknowledge on lock and check script).</Description>
<Description Lang="de">Einfache Email Schnittstelle zu System Monitoring Suites. Weitergehende Integration mit Nagios und Icinga2 (Acknowledge on lock and Checkscript).</Description>
Expand Down
4 changes: 0 additions & 4 deletions development/PortingTo7.md
View file

This file was deleted.

3 changes: 2 additions & 1 deletion scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheck.t
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/test/Console/Command/Maint/SystemMonitoring/NagiosCheckTicketCount.t
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/test/SystemMonitoring.t
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/test/sample/NagiosCheckTesting.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion var/packagesetup/SystemMonitoring.pm
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit fe6b14b

Please sign in to comment.