From c7ec206e23037c56d88e58785ee3e3b048ccf77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germain=20Carr=C3=A9?= Date: Mon, 21 Mar 2016 19:13:45 +0100 Subject: [PATCH] conf files must be valid json files (packages-*.conf were not) --- VERSION | 2 +- etc/conf.d/packages-apt.conf | 9 +++------ etc/conf.d/packages-yum.conf | 4 ++-- probes/examples/packages-apt | 3 +++ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 1dabcec..be67ff9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.73.8 +0.73.9 diff --git a/etc/conf.d/packages-apt.conf b/etc/conf.d/packages-apt.conf index 90fc5d0..9a3817b 100644 --- a/etc/conf.d/packages-apt.conf +++ b/etc/conf.d/packages-apt.conf @@ -1,11 +1,8 @@ { "enabled" : true, -# lines_to_ignore: array of strings, these will be used as regexes by the perl probe -# to tell which warnings/errors of apt should be ignored (they'll still be logged in details) -# this is useful for broken remote repositories you can't fix yourself anyway "lines_to_ignore" : [ -# "^Ignoring Provides line with DepCompareOp for package [\\w-]+$", -# "^Unknown Multi-Arch type 'no' for package '[\\w-]+'$", -# "^You may want to run apt-get update to correct these problems$" + "^Ignoring Provides line with DepCompareOp for package [\\w-]+$", + "^Unknown Multi-Arch type 'no' for package '[\\w-]+'$", + "^You may want to run apt-get update to correct these problems$" ] } diff --git a/etc/conf.d/packages-yum.conf b/etc/conf.d/packages-yum.conf index f0e2568..20aa404 100644 --- a/etc/conf.d/packages-yum.conf +++ b/etc/conf.d/packages-yum.conf @@ -1,3 +1,3 @@ { - "enabled" : true, -} \ No newline at end of file + "enabled" : true +} diff --git a/probes/examples/packages-apt b/probes/examples/packages-apt index 311e855..6721712 100755 --- a/probes/examples/packages-apt +++ b/probes/examples/packages-apt @@ -45,6 +45,9 @@ if ( !$delta_update or $delta_update > 30 * 60 or $update_tries ) $level = 'Errors' if $1 eq 'E'; $level = 'Warnings' if $1 eq 'W'; my $ignored = 0; + # lines_to_ignore: array of strings, these will be used as regexes by the perl probe + # to tell which warnings/errors of apt should be ignored (they'll still be logged in details) + # this is useful for broken remote repositories you can't fix yourself anyway foreach my $regex (@{ config->{'lines_to_ignore'} || [] }) { $ignored = 1 if ($msg =~ /$regex/);