diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile index 8447286dbab0..7e9e6986ae90 100644 --- a/net-mgmt/icinga2/Makefile +++ b/net-mgmt/icinga2/Makefile @@ -1,108 +1,110 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.15.1 +DISTVERSION= 2.16.0 CATEGORIES= net-mgmt MAINTAINER= flo@FreeBSD.org COMMENT= Monitoring and management system for hosts, services and networks WWW= https://www.icinga.org/icinga2/ -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.md -LIB_DEPENDS= libboost_thread.so:devel/boost-libs +LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ + libabsl_log_severity.so:devel/abseil \ + libprotobuf-lite.so:devel/protobuf RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash USES= bison cmake:insource compiler:c++0x libedit ssl USE_GITHUB= yes GH_ACCOUNT= icinga USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS EXAMPLES LTO UNITY OPTIONS_GROUP= BACKEND OPTIONS_GROUP_BACKEND= MYSQL PGSQL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS OPTIONS_DEFAULT= MONPLUGINS MYSQL PGSQL UNITY UNITY_DESC= Use icinga unity build system (faster, memory intensive) MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins MYSQL_CMAKE_OFF= -DICINGA2_WITH_MYSQL=OFF PGSQL_CMAKE_OFF= -DICINGA2_WITH_PGSQL=OFF UNITY_CMAKE_OFF= -DICINGA2_UNITY_BUILD=OFF ICINGA2USER?= icinga ICINGA2GROUP?= icinga USERS= ${ICINGA2USER} GROUPS= ${ICINGA2GROUP} LOCALSTATEDIR?= /var ICINGA2LOGDIR?= /var/log/${PORTNAME} CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \ -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \ -DCMAKE_MODULE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_SHARED_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_STATIC_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man \ -DICINGA2_COMMAND_GROUP=${ICINGA2USER} \ -DICINGA2_COMMAND_USER=${ICINGA2USER} \ -DICINGA2_GROUP=${ICINGA2GROUP} \ -DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \ -DICINGA2_RUNDIR=/var/run \ -DICINGA2_USER=${ICINGA2USER} SUB_LIST= ICINGA2GROUP=${ICINGA2GROUP} \ ICINGA2LOGDIR=${ICINGA2LOGDIR} \ ICINGA2USER=${ICINGA2USER} \ WWWGRP=${WWWGRP} PLIST_SUB= ICINGA2GROUP=${ICINGA2GROUP} \ ICINGA2USER=${ICINGA2USER} \ WWWGRP=${WWWGRP} SUB_FILES= ${PORTNAME}-newsyslog.conf pkg-message # Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts.conf LTO_CMAKE_BOOL= ICINGA2_LTO_BUILD MYSQL_USES= mysql PGSQL_USES= pgsql OPTIONS_SUB= yes .include .if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} PLIST_SUB+= DBBACKEND="@comment " .else PLIST_SUB+= DBBACKEND="" .endif post-patch: .for f in ${LINUX_CONFIG} ${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f} .endfor pre-install: ${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \; ${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \ -exec ${MV} {} {}.sample \; post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/newsyslog/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-newsyslog.conf ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME}.conf ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles (cd ${WRKSRC}/tools/syntax/vim && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/share/vim/vimfiles) .include diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo index 01c607bd6da6..70d5ccbd859e 100644 --- a/net-mgmt/icinga2/distinfo +++ b/net-mgmt/icinga2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761397098 -SHA256 (icinga-icinga2-v2.15.1_GH0.tar.gz) = 698cfae4aeded8fe05351995156814305a77bd0404b12e513a8dce8e7884c520 -SIZE (icinga-icinga2-v2.15.1_GH0.tar.gz) = 9454711 +TIMESTAMP = 1777045364 +SHA256 (icinga-icinga2-v2.16.0_GH0.tar.gz) = 71fcd7e54de6f6c53757ca4c9f1c91111dc14e3043ee1ca74313d1d075904b43 +SIZE (icinga-icinga2-v2.16.0_GH0.tar.gz) = 9585508 diff --git a/net-mgmt/icinga2/files/patch-CMakeLists.txt b/net-mgmt/icinga2/files/patch-CMakeLists.txt index 290a7cc4caff..1dda62dbf379 100644 --- a/net-mgmt/icinga2/files/patch-CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-CMakeLists.txt @@ -1,26 +1,26 @@ ---- CMakeLists.txt.orig 2023-08-11 08:54:43.660987000 +0200 -+++ CMakeLists.txt 2023-08-11 09:20:13.573939000 +0200 +--- CMakeLists.txt.orig 2026-04-22 09:29:50 UTC ++++ CMakeLists.txt @@ -29,8 +29,8 @@ endif() set(ICINGA2_MASTER ON) endif() -option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ${ICINGA2_MASTER}) -option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ${ICINGA2_MASTER}) +option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON) +option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON) option(ICINGA2_WITH_CHECKER "Build the checker module" ON) option(ICINGA2_WITH_COMPAT "Build the compat module" ${ICINGA2_MASTER}) option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ${ICINGA2_MASTER}) -@@ -269,6 +269,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") +@@ -293,6 +293,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -pthread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pthread") endif() +endif() + +if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD.*") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lexecinfo") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lexecinfo") + set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lexecinfo") endif() include(CheckCXXCompilerFlag) diff --git a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt index dcdbf7b020b3..df739fe6c230 100644 --- a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt @@ -1,76 +1,76 @@ ---- etc/CMakeLists.txt.orig 2023-08-11 09:37:32.071724000 +0200 -+++ etc/CMakeLists.txt 2023-08-11 11:30:51.251785000 +0200 -@@ -9,44 +9,44 @@ if(NOT WIN32) +--- etc/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC ++++ etc/CMakeLists.txt +@@ -10,44 +10,44 @@ if(NOT WIN32) endif() if(NOT WIN32) - install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${ICINGA2_CONFIGDIR}) - install_if_not_exists(icinga2/icinga2.conf ${ICINGA2_CONFIGDIR}) + install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf.sample ${ICINGA2_CONFIGDIR}) + install_if_not_exists(icinga2/icinga2.conf.sample ${ICINGA2_CONFIGDIR}) else() install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf ${ICINGA2_CONFIGDIR}) install_if_not_exists(icinga2/win32/icinga2.conf ${ICINGA2_CONFIGDIR}) endif() -install_if_not_exists(icinga2/zones.conf ${ICINGA2_CONFIGDIR}) -install_if_not_exists(icinga2/conf.d/app.conf ${ICINGA2_CONFIGDIR}/conf.d) -install_if_not_exists(icinga2/conf.d/commands.conf ${ICINGA2_CONFIGDIR}/conf.d) -install_if_not_exists(icinga2/conf.d/downtimes.conf ${ICINGA2_CONFIGDIR}/conf.d) -install_if_not_exists(icinga2/conf.d/groups.conf ${ICINGA2_CONFIGDIR}/conf.d) +install_if_not_exists(icinga2/zones.conf.sample ${ICINGA2_CONFIGDIR}) +install_if_not_exists(icinga2/conf.d/app.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) +install_if_not_exists(icinga2/conf.d/commands.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) +install_if_not_exists(icinga2/conf.d/downtimes.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) +install_if_not_exists(icinga2/conf.d/groups.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) if(NOT WIN32) - install_if_not_exists(icinga2/conf.d/hosts.conf ${ICINGA2_CONFIGDIR}/conf.d) - install_if_not_exists(icinga2/conf.d/services.conf ${ICINGA2_CONFIGDIR}/conf.d) + install_if_not_exists(icinga2/conf.d/hosts.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) + install_if_not_exists(icinga2/conf.d/services.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) else() install_if_not_exists(icinga2/conf.d/win32/hosts.conf ${ICINGA2_CONFIGDIR}/conf.d) install_if_not_exists(icinga2/conf.d/win32/services.conf ${ICINGA2_CONFIGDIR}/conf.d) endif() -install_if_not_exists(icinga2/conf.d/notifications.conf ${ICINGA2_CONFIGDIR}/conf.d) -install_if_not_exists(icinga2/conf.d/templates.conf ${ICINGA2_CONFIGDIR}/conf.d) -install_if_not_exists(icinga2/conf.d/timeperiods.conf ${ICINGA2_CONFIGDIR}/conf.d) -install_if_not_exists(icinga2/conf.d/users.conf ${ICINGA2_CONFIGDIR}/conf.d) -install_if_not_exists(icinga2/features-available/api.conf ${ICINGA2_CONFIGDIR}/features-available) -install_if_not_exists(icinga2/features-available/debuglog.conf ${ICINGA2_CONFIGDIR}/features-available) -install_if_not_exists(icinga2/features-available/mainlog.conf ${ICINGA2_CONFIGDIR}/features-available) +install_if_not_exists(icinga2/conf.d/notifications.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) +install_if_not_exists(icinga2/conf.d/templates.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) +install_if_not_exists(icinga2/conf.d/timeperiods.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) +install_if_not_exists(icinga2/conf.d/users.conf.sample ${ICINGA2_CONFIGDIR}/conf.d) +install_if_not_exists(icinga2/features-available/api.conf.sample ${ICINGA2_CONFIGDIR}/features-available) +install_if_not_exists(icinga2/features-available/debuglog.conf.sample ${ICINGA2_CONFIGDIR}/features-available) +install_if_not_exists(icinga2/features-available/mainlog.conf.sample ${ICINGA2_CONFIGDIR}/features-available) if(NOT WIN32) - install_if_not_exists(icinga2/features-available/syslog.conf ${ICINGA2_CONFIGDIR}/features-available) + install_if_not_exists(icinga2/features-available/syslog.conf.sample ${ICINGA2_CONFIGDIR}/features-available) if(HAVE_SYSTEMD) install_if_not_exists(icinga2/features-available/journald.conf ${ICINGA2_CONFIGDIR}/features-available) endif() else() - install_if_not_exists(icinga2/features-available/windowseventlog.conf ${ICINGA2_CONFIGDIR}/features-available) + install_if_not_exists(icinga2/features-available/windowseventlog.conf.sample ${ICINGA2_CONFIGDIR}/features-available) endif() -install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${ICINGA2_CONFIGDIR}/scripts) -install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${ICINGA2_CONFIGDIR}/scripts) +install_if_not_exists(icinga2/scripts/mail-host-notification.sh.sample ${ICINGA2_CONFIGDIR}/scripts) +install_if_not_exists(icinga2/scripts/mail-service-notification.sh.sample ${ICINGA2_CONFIGDIR}/scripts) install_if_not_exists(icinga2/zones.d/README ${ICINGA2_CONFIGDIR}/zones.d) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") -@@ -59,7 +59,7 @@ else() +@@ -60,7 +60,7 @@ else() install(FILES bash_completion.d/icinga2 DESTINATION ${BASHCOMPLETION_DIR}) else() - install_if_not_exists(icinga2/features-enabled/windowseventlog.conf ${ICINGA2_CONFIGDIR}/features-enabled) + install_if_not_exists(icinga2/features-enabled/windowseventlog.conf.sample ${ICINGA2_CONFIGDIR}/features-enabled) endif() if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|Solaris|SunOS)") diff --git a/net-mgmt/icinga2/files/patch-itl_command-plugins.conf b/net-mgmt/icinga2/files/patch-itl_command-plugins.conf index 2020d180abdf..3b0e24f8e4a9 100644 --- a/net-mgmt/icinga2/files/patch-itl_command-plugins.conf +++ b/net-mgmt/icinga2/files/patch-itl_command-plugins.conf @@ -1,13 +1,13 @@ ---- itl/command-plugins.conf.orig 2020-08-03 13:43:47 UTC +--- itl/command-plugins.conf.orig 2026-04-22 09:29:50 UTC +++ itl/command-plugins.conf -@@ -1616,6 +1616,10 @@ object CheckCommand "procs" { +@@ -1941,6 +1941,10 @@ object CheckCommand "procs" { set_if = "$procs_nokthreads$" description = "Only scan for non kernel threads" } + "-j" = { + value = "$procs_jid$" + description = "Only scan for processes within that jail ID" + } } vars.procs_traditional = false diff --git a/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt index b693e911ddc0..4d58ab161d28 100644 --- a/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt @@ -1,11 +1,11 @@ ---- lib/checker/CMakeLists.txt.orig 2020-08-03 13:43:47 UTC +--- lib/checker/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC +++ lib/checker/CMakeLists.txt -@@ -20,7 +20,7 @@ set_target_properties ( +@@ -21,7 +21,7 @@ install_if_not_exists( ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/checker.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/checker.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) diff --git a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt index 23cfaf20112e..2db0d27952dc 100644 --- a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt @@ -1,17 +1,17 @@ ---- lib/compat/CMakeLists.txt.orig 2023-08-11 11:35:43.136114000 +0200 -+++ lib/compat/CMakeLists.txt 2023-08-11 11:40:02.639410000 +0200 -@@ -22,12 +22,12 @@ install_if_not_exists( +--- lib/compat/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC ++++ lib/compat/CMakeLists.txt +@@ -23,12 +23,12 @@ install_if_not_exists( ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/command.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/command.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/compatlog.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/compatlog.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) diff --git a/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt index 77ae611d9a92..2f9788c70744 100644 --- a/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt @@ -1,11 +1,11 @@ ---- lib/db_ido_mysql/CMakeLists.txt.orig 2020-08-03 13:43:47 UTC +--- lib/db_ido_mysql/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC +++ lib/db_ido_mysql/CMakeLists.txt -@@ -22,7 +22,7 @@ set_target_properties ( +@@ -23,7 +23,7 @@ install_if_not_exists( ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-mysql.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-mysql.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) diff --git a/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt index e1fa0f0b7c51..b57bae4ad818 100644 --- a/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt @@ -1,11 +1,11 @@ ---- lib/db_ido_pgsql/CMakeLists.txt.orig 2020-08-03 13:43:47 UTC +--- lib/db_ido_pgsql/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC +++ lib/db_ido_pgsql/CMakeLists.txt -@@ -22,7 +22,7 @@ set_target_properties ( +@@ -23,7 +23,7 @@ install_if_not_exists( ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-pgsql.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-pgsql.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) diff --git a/net-mgmt/icinga2/files/patch-lib_icingadb_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_icingadb_CMakeLists.txt index 8c22c0ef647c..989c05face3b 100644 --- a/net-mgmt/icinga2/files/patch-lib_icingadb_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_icingadb_CMakeLists.txt @@ -1,11 +1,11 @@ ---- lib/icingadb/CMakeLists.txt.orig 2020-08-16 09:41:13 UTC +--- lib/icingadb/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC +++ lib/icingadb/CMakeLists.txt -@@ -22,7 +22,7 @@ set_target_properties ( +@@ -26,7 +26,7 @@ install_if_not_exists( ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/icingadb.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/icingadb.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available ) diff --git a/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt index c6c61430747c..1a15115c9dad 100644 --- a/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt @@ -1,11 +1,11 @@ ---- lib/livestatus/CMakeLists.txt.orig 2020-08-03 13:43:47 UTC +--- lib/livestatus/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC +++ lib/livestatus/CMakeLists.txt -@@ -56,7 +56,7 @@ set_target_properties ( +@@ -57,7 +57,7 @@ install_if_not_exists( ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/livestatus.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/livestatus.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) diff --git a/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt index b9460efc5c30..a7ce519dab36 100644 --- a/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt @@ -1,11 +1,11 @@ ---- lib/notification/CMakeLists.txt.orig 2020-08-03 13:43:47 UTC +--- lib/notification/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC +++ lib/notification/CMakeLists.txt -@@ -20,7 +20,7 @@ set_target_properties ( +@@ -21,7 +21,7 @@ install_if_not_exists( ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/notification.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/notification.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) diff --git a/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt index 4706703cce19..be20521782b5 100644 --- a/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt +++ b/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt @@ -1,47 +1,55 @@ ---- lib/perfdata/CMakeLists.txt.orig 2021-09-09 09:49:26.077173000 +0200 -+++ lib/perfdata/CMakeLists.txt 2021-09-09 09:51:19.916439000 +0200 -@@ -34,37 +34,37 @@ set_target_properties ( +--- lib/perfdata/CMakeLists.txt.orig 2026-04-22 09:29:50 UTC ++++ lib/perfdata/CMakeLists.txt +@@ -57,44 +57,44 @@ install_if_not_exists( ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/gelf.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/gelf.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/graphite.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/graphite.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb2.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb2.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/elasticsearch.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/elasticsearch.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/opentsdb.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/opentsdb.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) + if(ICINGA2_WITH_OPENTELEMETRY) + install_if_not_exists( +- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/otlpmetrics.conf ++ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/otlpmetrics.conf.sample + ${ICINGA2_CONFIGDIR}/features-available + ) + endif() + install_if_not_exists( - ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/perfdata.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/perfdata.conf.sample ${ICINGA2_CONFIGDIR}/features-available ) diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist index 119617222b19..24b672133b47 100644 --- a/net-mgmt/icinga2/pkg-plist +++ b/net-mgmt/icinga2/pkg-plist @@ -1,203 +1,205 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/conf.d/app.conf.sample @sample %%ETCDIR%%/conf.d/commands.conf.sample @sample %%ETCDIR%%/conf.d/downtimes.conf.sample @sample %%ETCDIR%%/conf.d/groups.conf.sample @sample %%ETCDIR%%/conf.d/hosts.conf.sample @sample %%ETCDIR%%/conf.d/notifications.conf.sample @sample %%ETCDIR%%/conf.d/services.conf.sample @sample %%ETCDIR%%/conf.d/templates.conf.sample @sample %%ETCDIR%%/conf.d/timeperiods.conf.sample @sample %%ETCDIR%%/conf.d/users.conf.sample @sample %%ETCDIR%%/constants.conf.sample @sample %%ETCDIR%%/features-available/api.conf.sample @sample %%ETCDIR%%/features-available/checker.conf.sample @sample %%ETCDIR%%/features-available/command.conf.sample @sample %%ETCDIR%%/features-available/compatlog.conf.sample @sample %%ETCDIR%%/features-available/debuglog.conf.sample @sample %%ETCDIR%%/features-available/elasticsearch.conf.sample @sample %%ETCDIR%%/features-available/gelf.conf.sample @sample %%ETCDIR%%/features-available/graphite.conf.sample @sample %%ETCDIR%%/features-available/icingadb.conf.sample %%MYSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample %%PGSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-pgsql.conf.sample @sample %%ETCDIR%%/features-available/influxdb.conf.sample @sample %%ETCDIR%%/features-available/influxdb2.conf.sample @sample %%ETCDIR%%/features-available/livestatus.conf.sample @sample %%ETCDIR%%/features-available/mainlog.conf.sample @sample %%ETCDIR%%/features-available/notification.conf.sample @sample %%ETCDIR%%/features-available/opentsdb.conf.sample +@sample %%ETCDIR%%/features-available/otlpmetrics.conf.sample @sample %%ETCDIR%%/features-available/perfdata.conf.sample @sample %%ETCDIR%%/features-available/syslog.conf.sample %%ETCDIR%%/features-enabled/checker.conf %%ETCDIR%%/features-enabled/mainlog.conf %%ETCDIR%%/features-enabled/notification.conf @sample %%ETCDIR%%/icinga2.conf.sample @sample %%ETCDIR%%/scripts/mail-host-notification.sh.sample @sample %%ETCDIR%%/scripts/mail-service-notification.sh.sample @sample %%ETCDIR%%/zones.conf.sample %%ETCDIR%%/zones.d/README %%MYSQL%%lib/icinga2/libmysql_shim.so -%%MYSQL%%lib/icinga2/libmysql_shim.so.2.15.1 +%%MYSQL%%lib/icinga2/libmysql_shim.so.2.16.0 %%PGSQL%%lib/icinga2/libpgsql_shim.so -%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.15.1 +%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.16.0 lib/icinga2/sbin/icinga2 libexec/nagios/check_nscp_api sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md -%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/markdown/01-about.md %%PORTDOCS%%%%DOCSDIR%%/markdown/02-installation.md %%PORTDOCS%%%%DOCSDIR%%/markdown/03-monitoring-basics.md %%PORTDOCS%%%%DOCSDIR%%/markdown/04-configuration.md %%PORTDOCS%%%%DOCSDIR%%/markdown/05-service-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/06-distributed-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/07-agent-based-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/08-advanced-topics.md %%PORTDOCS%%%%DOCSDIR%%/markdown/09-object-types.md %%PORTDOCS%%%%DOCSDIR%%/markdown/10-icinga-template-library.md %%PORTDOCS%%%%DOCSDIR%%/markdown/11-cli-commands.md %%PORTDOCS%%%%DOCSDIR%%/markdown/12-icinga2-api.md %%PORTDOCS%%%%DOCSDIR%%/markdown/13-addons.md %%PORTDOCS%%%%DOCSDIR%%/markdown/14-features.md %%PORTDOCS%%%%DOCSDIR%%/markdown/15-troubleshooting.md %%PORTDOCS%%%%DOCSDIR%%/markdown/16-upgrading-icinga-2.md %%PORTDOCS%%%%DOCSDIR%%/markdown/17-language-reference.md %%PORTDOCS%%%%DOCSDIR%%/markdown/18-library-reference.md %%PORTDOCS%%%%DOCSDIR%%/markdown/19-technical-concepts.md %%PORTDOCS%%%%DOCSDIR%%/markdown/20-script-debugger.md %%PORTDOCS%%%%DOCSDIR%%/markdown/21-development.md %%PORTDOCS%%%%DOCSDIR%%/markdown/22-selinux.md %%PORTDOCS%%%%DOCSDIR%%/markdown/23-migrating-from-icinga-1x.md %%PORTDOCS%%%%DOCSDIR%%/markdown/24-appendix.md %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/dashing_icinga2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icinga_certificate_monitoring.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icinga_reporting.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_businessprocess.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_grafana.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_graphite.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_maps.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/nano-syntax.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/vim-syntax.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/flapping-state-graph.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icinga2_external_checks_freshness_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icingaweb2_downtime_handled.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/api/icinga2_api_powershell_ise.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/configuration/icinga_web_local_server.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_boost_build_dev_cmd.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_builds_gitlab_pipeline.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_powershell_posh_git.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_installer_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/development/windows_visual_studio_tabs_c++.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_agent_checks_command_endpoint.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_endpoints.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_roles.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_satellite_config_sync.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenario_ha_masters_with_agents.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenarios_master_satellites_agents.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenarios_master_with_agents.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_zones.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_client_disk_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_api_drivesize_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_counter_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_running_service.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_04.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_05.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_04.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_no_ticket.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_with_ticket.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/icingadb/icingadb-architecture.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/icingadb/icingadb-daemon.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/icingadb/icingadb-icinga2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/icingadb/icingadb-redis.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsyslog/icinga2.conf %%MYSQL%%%%DATADIR%%-ido-mysql/schema/mysql.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.11.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.12.7.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.13.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.13.3.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.3.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.4.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.5.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.6.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.1.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/pgsql.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.3.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.4.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.5.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.6.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.1.sql %%DATADIR%%/include/command-icinga.conf %%DATADIR%%/include/command-nscp-local.conf %%DATADIR%%/include/command-plugins-manubulon.conf %%DATADIR%%/include/command-plugins-windows.conf %%DATADIR%%/include/command-plugins.conf %%DATADIR%%/include/hangman %%DATADIR%%/include/itl %%DATADIR%%/include/manubulon %%DATADIR%%/include/nscp %%DATADIR%%/include/plugins %%DATADIR%%/include/plugins-contrib %%DATADIR%%/include/plugins-contrib.d/big-data.conf %%DATADIR%%/include/plugins-contrib.d/databases.conf %%DATADIR%%/include/plugins-contrib.d/hardware.conf %%DATADIR%%/include/plugins-contrib.d/icingacli.conf %%DATADIR%%/include/plugins-contrib.d/ipmi.conf %%DATADIR%%/include/plugins-contrib.d/logmanagement.conf %%DATADIR%%/include/plugins-contrib.d/metrics.conf %%DATADIR%%/include/plugins-contrib.d/network-components.conf %%DATADIR%%/include/plugins-contrib.d/network-services.conf %%DATADIR%%/include/plugins-contrib.d/operating-system.conf %%DATADIR%%/include/plugins-contrib.d/raid-controller.conf +%%DATADIR%%/include/plugins-contrib.d/smart-advanced.conf %%DATADIR%%/include/plugins-contrib.d/smart-attributes.conf %%DATADIR%%/include/plugins-contrib.d/storage.conf %%DATADIR%%/include/plugins-contrib.d/systemd.conf %%DATADIR%%/include/plugins-contrib.d/virtualization.conf %%DATADIR%%/include/plugins-contrib.d/vmware.conf %%DATADIR%%/include/plugins-contrib.d/web.conf %%DATADIR%%/include/windows-plugins share/man/man8/icinga2.8.gz share/vim/vimfiles/ftdetect/icinga2.vim share/vim/vimfiles/syntax/icinga2.vim @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) %%ETCDIR%% @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) %%ETCDIR%%/conf.d @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) %%ETCDIR%%/features-enabled @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones-stage @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certificate-requests @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certs @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2 @dir /var/lib @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat/archives @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/crash @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2 @dir(%%ICINGA2USER%%,%%WWWGRP%%,2750) /var/run/icinga2/cmd @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0775) /var/run/icinga2 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/perfdata @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/tmp @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0775) /var/spool/icinga2