[pkg-nagios-changes] [Git][nagios-team/icinga2][master] 5 commits: Ignore test failures on mips64el, ppc64el, powerpc.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Jan 18 12:38:52 GMT 2024
Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / icinga2
Commits:
8003cecb by Bas Couwenberg at 2023-12-22T11:28:52+01:00
Ignore test failures on mips64el, ppc64el, powerpc.
- - - - -
b0049d15 by Bas Couwenberg at 2024-01-18T13:25:14+01:00
New upstream version 2.14.2
- - - - -
2700d1e6 by Bas Couwenberg at 2024-01-18T13:25:34+01:00
Update upstream source from tag 'upstream/2.14.2'
Update to upstream version '2.14.2'
with Debian dir ce88cca739e76899a7ce381d0573f7601469cf94
- - - - -
fe092f5b by Bas Couwenberg at 2024-01-18T13:26:10+01:00
New upstream release.
- - - - -
1888498f by Bas Couwenberg at 2024-01-18T13:27:09+01:00
Set distribution to unstable.
- - - - -
10 changed files:
- CHANGELOG.md
- ICINGA2_VERSION
- debian/changelog
- debian/rules
- doc/21-development.md
- doc/win-dev.ps1
- lib/perfdata/influxdbcommonwriter.cpp
- lib/remote/httpserverconnection.cpp
- tools/win32/configure-dev.ps1
- tools/win32/configure.ps1
Changes:
=====================================
CHANGELOG.md
=====================================
@@ -7,6 +7,15 @@ documentation before upgrading to a new release.
Released closed milestones can be found on [GitHub](https://github.com/Icinga/icinga2/milestones?state=closed).
+## 2.14.2 (2024-01-18)
+
+Version 2.14.2 is a hotfix release for master nodes that mainly
+fixes excessive disk usage caused by the InfluxDB writers.
+
+* InfluxDB: truncate timestamps to whole seconds to save disk space. #9969
+* HttpServerConnection: log request processing time as well. #9970
+* Update Boost shipped on Windows to v1.84. #9970
+
## 2.14.1 (2023-12-21)
Version 2.14.1 is a hotfix release for masters and satellites that mainly
=====================================
ICINGA2_VERSION
=====================================
@@ -1,2 +1,2 @@
-Version: 2.14.1
+Version: 2.14.2
Revision: 1
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+icinga2 (2.14.2-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Ignore test failures on mips64el, ppc64el, powerpc.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 18 Jan 2024 13:26:54 +0100
+
icinga2 (2.14.1-1) unstable; urgency=medium
* Team upload.
=====================================
debian/rules
=====================================
@@ -39,7 +39,7 @@ override_dh_auto_configure:
-DUSE_SYSTEMD=ON
override_dh_auto_test:
-ifneq (,$(filter $(DEB_BUILD_ARCH),i386))
+ifneq (,$(filter $(DEB_BUILD_ARCH),i386 mips64el ppc64el powerpc))
dh_auto_test || echo "Ignoring test failures"
else
dh_auto_test
=====================================
doc/21-development.md
=====================================
@@ -477,18 +477,18 @@ File Type: EXECUTABLE IMAGE
Image has the following dependencies:
- boost_coroutine-vc142-mt-gd-x64-1_83.dll
- boost_date_time-vc142-mt-gd-x64-1_83.dll
- boost_filesystem-vc142-mt-gd-x64-1_83.dll
- boost_thread-vc142-mt-gd-x64-1_83.dll
- boost_regex-vc142-mt-gd-x64-1_83.dll
+ boost_coroutine-vc142-mt-gd-x64-1_84.dll
+ boost_date_time-vc142-mt-gd-x64-1_84.dll
+ boost_filesystem-vc142-mt-gd-x64-1_84.dll
+ boost_thread-vc142-mt-gd-x64-1_84.dll
+ boost_regex-vc142-mt-gd-x64-1_84.dll
libssl-3_0-x64.dll
libcrypto-3_0-x64.dll
WS2_32.dll
dbghelp.dll
SHLWAPI.dll
msi.dll
- boost_unit_test_framework-vc142-mt-gd-x64-1_83.dll
+ boost_unit_test_framework-vc142-mt-gd-x64-1_84.dll
KERNEL32.dll
SHELL32.dll
ADVAPI32.dll
@@ -1763,7 +1763,7 @@ mkdir build
cd .\build\
& "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" `
- -DICINGA2_UNITY_BUILD=OFF -DBoost_INCLUDE_DIR=C:\local\boost_1_83_0-Win64 `
+ -DICINGA2_UNITY_BUILD=OFF -DBoost_INCLUDE_DIR=C:\local\boost_1_84_0-Win64 `
-DBISON_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_bison.exe `
-DFLEX_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_flex.exe ..
@@ -1935,16 +1935,16 @@ Download the [boost-binaries](https://sourceforge.net/projects/boost/files/boost
- 64 for 64 bit builds
```
-https://sourceforge.net/projects/boost/files/boost-binaries/1.82.0/boost_1_83_0-msvc-14.2-64.exe/download
+https://sourceforge.net/projects/boost/files/boost-binaries/1.82.0/boost_1_84_0-msvc-14.2-64.exe/download
```
-Run the installer and leave the default installation path in `C:\local\boost_1_83_0`.
+Run the installer and leave the default installation path in `C:\local\boost_1_84_0`.
##### Source & Compile
In order to use the boost development header and library files you need to [download](https://www.boost.org/users/download/)
-Boost and then extract it to e.g. `C:\local\boost_1_83_0`.
+Boost and then extract it to e.g. `C:\local\boost_1_84_0`.
> **Note**
>
@@ -1952,12 +1952,12 @@ Boost and then extract it to e.g. `C:\local\boost_1_83_0`.
> the archive contains more than 70k files.
In order to integrate Boost into Visual Studio, open the `Developer Command Prompt` from the start menu,
-and navigate to `C:\local\boost_1_83_0`.
+and navigate to `C:\local\boost_1_84_0`.
Execute `bootstrap.bat` first.
```
-cd C:\local\boost_1_83_0
+cd C:\local\boost_1_84_0
bootstrap.bat
```
@@ -2040,8 +2040,8 @@ You need to specify the previously installed component paths.
Variable | Value | Description
----------------------|----------------------------------------------------------------------|-------------------------------------------------------
-`BOOST_ROOT` | `C:\local\boost_1_83_0` | Root path where you've extracted and compiled Boost.
-`BOOST_LIBRARYDIR` | Binary: `C:\local\boost_1_83_0\lib64-msvc-14.2`, Source: `C:\local\boost_1_83_0\stage` | Path to the static compiled Boost libraries, directory must contain `lib`.
+`BOOST_ROOT` | `C:\local\boost_1_84_0` | Root path where you've extracted and compiled Boost.
+`BOOST_LIBRARYDIR` | Binary: `C:\local\boost_1_84_0\lib64-msvc-14.2`, Source: `C:\local\boost_1_84_0\stage` | Path to the static compiled Boost libraries, directory must contain `lib`.
`BISON_EXECUTABLE` | `C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe` | Path to the Bison executable.
`FLEX_EXECUTABLE` | `C:\ProgramData\chocolatey\lib\winflexbison\tools\win_flex.exe` | Path to the Flex executable.
`ICINGA2_UNITY_BUILD` | OFF | Disable unity builds for development environments.
@@ -2076,8 +2076,8 @@ $env:ICINGA2_INSTALLPATH = 'C:\Program Files\Icinga2-debug'
$env:ICINGA2_BUILDPATH='debug'
$env:CMAKE_BUILD_TYPE='Debug'
$env:OPENSSL_ROOT_DIR='C:\OpenSSL-Win64'
-$env:BOOST_ROOT='C:\local\boost_1_83_0'
-$env:BOOST_LIBRARYDIR='C:\local\boost_1_83_0\lib64-msvc-14.2'
+$env:BOOST_ROOT='C:\local\boost_1_84_0'
+$env:BOOST_LIBRARYDIR='C:\local\boost_1_84_0\lib64-msvc-14.2'
```
#### Icinga 2 in Visual Studio
=====================================
doc/win-dev.ps1
=====================================
@@ -13,7 +13,7 @@ function ThrowOnNativeFailure {
$VsVersion = 2019
$MsvcVersion = '14.2'
-$BoostVersion = @(1, 83, 0)
+$BoostVersion = @(1, 84, 0)
$OpensslVersion = '3_0_12'
switch ($Env:BITS) {
=====================================
lib/perfdata/influxdbcommonwriter.cpp
=====================================
@@ -37,7 +37,6 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include <boost/regex.hpp>
#include <boost/scoped_array.hpp>
-#include <iomanip>
#include <memory>
#include <string>
#include <utility>
@@ -399,7 +398,7 @@ void InfluxdbCommonWriter::SendMetric(const Checkable::Ptr& checkable, const Dic
}
}
- msgbuf << " " << std::fixed << std::setprecision(0) << ts * 1.0e9;
+ msgbuf << " " << static_cast<unsigned long>(ts);
Log(LogDebug, GetReflectionType()->GetName())
<< "Checkable '" << checkable->GetName() << "' adds to metric list:'" << msgbuf.str() << "'.";
@@ -554,6 +553,7 @@ Url::Ptr InfluxdbCommonWriter::AssembleBaseUrl()
url->SetScheme(GetSslEnable() ? "https" : "http");
url->SetHost(GetHost());
url->SetPort(GetPort());
+ url->AddQueryElement("precision", "s");
return url;
}
=====================================
lib/remote/httpserverconnection.cpp
=====================================
@@ -18,6 +18,7 @@
#include "base/timer.hpp"
#include "base/tlsstream.hpp"
#include "base/utility.hpp"
+#include <chrono>
#include <limits>
#include <memory>
#include <stdexcept>
@@ -493,6 +494,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
{
namespace beast = boost::beast;
namespace http = beast::http;
+ namespace ch = std::chrono;
try {
/* Do not reset the buffer in the state machine.
@@ -518,6 +520,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
}
m_Seen = Utility::GetTime();
+ auto start (ch::steady_clock::now());
auto& request (parser.get());
@@ -541,13 +544,14 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
Log logMsg (LogInformation, "HttpServerConnection");
- logMsg << "Request: " << request.method_string() << ' ' << request.target()
+ logMsg << "Request " << request.method_string() << ' ' << request.target()
<< " (from " << m_PeerAddress
<< "), user: " << (authenticatedUser ? authenticatedUser->GetName() : "<unauthenticated>")
<< ", agent: " << request[http::field::user_agent]; //operator[] - Returns the value for a field, or "" if it does not exist.
- Defer addRespCode ([&response, &logMsg]() {
- logMsg << ", status: " << response.result() << ").";
+ Defer addRespCode ([&response, start, &logMsg]() {
+ logMsg << ", status: " << response.result() << ") took "
+ << ch::duration_cast<ch::milliseconds>(ch::steady_clock::now() - start).count() << "ms.";
});
if (!HandleAccessControl(*m_Stream, request, response, yc)) {
=====================================
tools/win32/configure-dev.ps1
=====================================
@@ -31,10 +31,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64'
}
if (-not (Test-Path env:BOOST_ROOT)) {
- $env:BOOST_ROOT = 'c:\local\boost_1_83_0'
+ $env:BOOST_ROOT = 'c:\local\boost_1_84_0'
}
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
- $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_83_0\lib64-msvc-14.2'
+ $env:BOOST_LIBRARYDIR = 'c:\local\boost_1_84_0\lib64-msvc-14.2'
}
if (-not (Test-Path env:FLEX_BINARY)) {
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'
=====================================
tools/win32/configure.ps1
=====================================
@@ -33,10 +33,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_12-Win${env:BITS}"
}
if (-not (Test-Path env:BOOST_ROOT)) {
- $env:BOOST_ROOT = "c:\local\boost_1_83_0-Win${env:BITS}"
+ $env:BOOST_ROOT = "c:\local\boost_1_84_0-Win${env:BITS}"
}
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
- $env:BOOST_LIBRARYDIR = "c:\local\boost_1_83_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2"
+ $env:BOOST_LIBRARYDIR = "c:\local\boost_1_84_0-Win${env:BITS}\lib${env:BITS}-msvc-14.2"
}
if (-not (Test-Path env:FLEX_BINARY)) {
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'
View it on GitLab: https://salsa.debian.org/nagios-team/icinga2/-/compare/690903810ad7d61b1ea1cf3556c6f7936e31f5ee...1888498f02aeaf3a06a7241ac7f59d0b8ae6c3cc
--
View it on GitLab: https://salsa.debian.org/nagios-team/icinga2/-/compare/690903810ad7d61b1ea1cf3556c6f7936e31f5ee...1888498f02aeaf3a06a7241ac7f59d0b8ae6c3cc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20240118/d99b61c3/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list