Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 20241010 #5231

Merged
merged 27 commits into from
Oct 10, 2024
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4d26ef5
Sync release 20240909 (#5179)
pkippes Sep 10, 2024
9b5b90c
fix(packaging): add perl(Env) dependency to FFI::CheckLib rpm package…
kduret Sep 11, 2024
c31dfa5
enh(pr-template): add checklist items to secure new plugins delivery …
omercier Sep 16, 2024
95bff5f
fix(counter): replaced the unit of the latency for vmware vsan-cluste…
omercier Sep 17, 2024
f28f345
feat(dependencies) CTOR-596 - Add missing dependencies for Paws in De…
sdepassio Sep 18, 2024
a8a0d03
Ctor 323 refactor robot tests (#5164)
sfarouq-ext Sep 20, 2024
53afb6e
enh(ci): add pipeline for as400 using nfpm (#5167)
tuntoja Sep 23, 2024
8af60e8
Quick fix on HPE-Primera-RestAPI (#5186)
lucie-dubrunfaut Sep 24, 2024
c1f030a
feat(dependencies) CTOR-596 - Add paws dependency to AWS plugins (#5040)
sdepassio Sep 24, 2024
c4fe1a7
Fix 3com snmp fan/psu check (#5201)
octvcdrc Sep 24, 2024
9540a08
enh(dockerfiles): added new dependencies (#5209)
omercier Sep 27, 2024
03db47c
new(lib): package new dependency coming from CPAN for AES (#5208)
omercier Sep 27, 2024
a47a440
chore(packaging): update deb packages naming convention (#5203)
kduret Sep 30, 2024
e0033d0
enh(plugin): add Centreon header for Meraki api calls (#5207)
sdepassio Sep 30, 2024
11482e4
Plugin(network::stormshield::snmp) - Mode(Hardware) : Issue on temper…
lucie-dubrunfaut Sep 30, 2024
bc6c0ae
Fix power unit and add Voltage metric (#5187)
lucie-dubrunfaut Sep 30, 2024
1b9f0fd
[Plugin(storage::wd::nas::snmp) - Modes(volumes, listvolumes, hardwar…
lucie-dubrunfaut Sep 30, 2024
3b4ef12
enh(plugin): added 64 bits counters in snmp_standard::memory (#5210)
omercier Oct 1, 2024
b9d19ed
enh(ci): update legacy packaging (#5206)
tuntoja Oct 3, 2024
df03cc5
enh(vmware-connector): add the ability to load configuration from a j…
omercier Oct 3, 2024
ab7218d
fix(plugin) Linux local - mode systemd-journal : --output-fields adde…
s-duret Oct 4, 2024
06b1fe2
enh(vmware-daemon): prepare release of version 3.3.0 with 24.10 conne…
omercier Oct 7, 2024
591981b
enh(plugin): add ansible host IP to Ansible Tower discovery (#5221)
sdepassio Oct 7, 2024
88be153
enh(rubrik): add --check-retention option to track disappeared jobs a…
itoussies Oct 8, 2024
b118801
enh(ansible-tower): add filter-time option (#5225)
sdepassio Oct 8, 2024
53ff39f
enh(cisco-standard): add option --add-fc-fe-errors (#5199)
lucie-dubrunfaut Oct 10, 2024
cda1705
bump(as400): increased as400 connector version for new build (#5232)
omercier Oct 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(plugin) Linux local - mode systemd-journal : --output-fields adde…
…d in version 236 (#5180)

Co-authored-by: omercier <32134301+omercier@users.noreply.github.com>
Co-authored-by: sdepassio <114986849+sdepassio@users.noreply.github.com>
REFS: CTOR-877
3 people authored Oct 4, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit ab7218d3ae69b07c138cf80c8c41b230311a4b67
34 changes: 25 additions & 9 deletions src/os/linux/local/mode/systemdjournal.pm
Original file line number Diff line number Diff line change
@@ -69,7 +69,18 @@ sub manage_selection {
(defined($self->{option_results}->{filter_message}) ? md5_hex($self->{option_results}->{filter_message}) : md5_hex('all')) . '_' .
(defined($self->{option_results}->{since}) ? md5_hex($self->{option_results}->{since}) : md5_hex('all'));

my $command_options = '--output json --output-fields MESSAGE --no-pager';
my ($stdout_version) = $options{custom}->execute_command(
command => '/usr/bin/journalctl',
command_options => '--version'
);
$stdout_version =~ /^systemd\s(\d+)\s/;
my $journalctl_version = $1;

my $command_options = '--output json --no-pager';
# --output-field option has been added in version 236
if ($journalctl_version >= 236) {
$command_options .= ' --output-fields MESSAGE';
};

if (defined($self->{option_results}->{unit}) && $self->{option_results}->{unit} ne '') {
$command_options .= ' --unit ' . $self->{option_results}->{unit};
@@ -152,7 +163,7 @@ OK: Centreon Engine reloads over the last hour: 0 | 'centreon.engine.reload.coun

=item B<--unit>

Only look for messages of the specified unit, ie the
Only look for messages from the specified unit, i.e. the
name of the systemd service who created the message.

=item B<--filter-message>
@@ -162,18 +173,23 @@ Filter on message content (can be a regexp).
=item B<--since>

Defines the amount of time to look back at messages.
Can be minutes (ie 5 "minutes ago") or 'cache' to use the
timestamp from last execution. (default: 'cache')
Can be minutes (example: 5 "minutes ago") or 'cache' to use the
timestamp from last execution. Default: 'cache'.

=item B<--timezone>

Defines the timezone to convert date/time to the host
timezone when using timestamp from cache. (default: 'local')
Defines the timezone to use for date/time conversion when using a timestamp from the cache.
Default: 'local'.

=item B<--warning-entries>

Thresholds to apply to the number of journal entries
found with the specified parameters.

=item B<--warning-entries> B<--critical-entries>
=item B<--critical-entries>

Thresholds on the number of entries found
in the journal for the specified parameters.
Thresholds to apply to the number of journal entries
found with the specified parameters.

=back

143 changes: 69 additions & 74 deletions tests/resources/spellcheck/stopwords.txt
Original file line number Diff line number Diff line change
@@ -1,125 +1,97 @@
2c
3CX
--3cx-version
--add-sysdesc
ADSL
Alcatel
allCapacity
Ansible
--api-filter-orgs
api.meraki.com
--api-password
--api-path
--api-token
--api-username
--api-version
--cacert-file
--cert-pkcs12
--cert-pwd
--critical-backend-congestions
--critical-backend-outstanding-io
--critical-bytesallocatedpercentage
--critical-na
--dfsr
--display-transform-dst
--display-transform-src
--dyn-mode
--exclude-fs
--filter-fs
--filter-imei
--filter-vdom
--filter-vm
--force-64bits-counters
--force-counters32
--force-counters64
--force-oid
--get-param
--ignore-orgs-api-disabled
--jobq
--legacy-api-beta
--lookup-perfdatas-nagios
--map-speed-dsl
--mqtt
--mqtt-allow-insecure
--mqtt-ca-certificate
--mqtt-password
--mqtt-port
--mqtt-ssl
--mqtt-ssl-certificate
--mqtt-ssl-key
--mqtt-timeout
--mqtt-username
--nagvis-perfdata
--noeventlog
--nomachineaccount
--ntlmv2
--oid
--oid-display
--oid-extra-display
--oid-filter
--patch-redhat
--scope-datacenter
--sql-errors-exit
--urlpath
--use-ucd
--warning-backend-congestions
--warning-backend-outstanding-io
--warning-bytesallocatedpercentage
--warning-na
-EncodedCommand
-InputFormat
-NoLogo
2c
3CX
ADSL
Alcatel
allCapacity
Ansible
api.meraki.com
ASAM
Avigilon
Backbox
--cacert-file
cardtemperature
Centreon
--cert-pkcs12
--cert-pwd
connections-dhcp
connections-dns
cpu-utilization-1m
cpu-utilization-5m
cpu-utilization-5s
--critical-backend-congestions
--critical-backend-outstanding-io
--critical-bytesallocatedpercentage
--critical-na
Datacore
datasource
DC4
dcdiag
deduplication
deltaps
df
--dfsr
dfsrevent
--display-transform-dst
--display-transform-src
--dyn-mode
-EncodedCommand
eth
--exclude-fs
fanspeed
FCCapacity
--filter-fs
--filter-imei
--filter-vdom
--filter-vm
--force-64bits-counters
--force-counters32
--force-counters64
--force-oid
Fortigate
Fortinet
frsevent
--get-param
HashiCorp
hashicorpvault
HPE
ifAlias
ifDesc
ifName
--ignore-orgs-api-disabled
IMEI
in-bcast
in-mcast
in-ucast
-InputFormat
interface-dsl-name
in-ucast
IpAddr
ipv4
ipv6
ISAM
Iwsva
--jobq
JOBQ
jobqueue
jobqueues
journalctl
kccevent
keepass
Kubernetes
Kubernetes
ldap
--legacy-api-beta
license-instances-usage-prct
Loggly
--lookup-perfdatas-nagios
machineaccount
--map-speed-dsl
MBean
memAvailReal
memBuffer
@@ -133,23 +105,43 @@ module-cellradio-rsrq
module-cellradio-snr
modules-cellradio-detected
Mosquitto
--mqtt
MQTT
--mqtt-allow-insecure
--mqtt-ca-certificate
--mqtt-password
--mqtt-port
--mqtt-ssl
--mqtt-ssl-certificate
--mqtt-ssl-key
--mqtt-timeout
--mqtt-username
multiple
Nagios
nagios
Nagios
NagVis
net-snmp
--nagvis-perfdata
Netscaler
net-snmp
NLCapacity
--noeventlog
-NoLogo
--nomachineaccount
--ntlmv2
NTLMv2
NTP
--oid
OID
--oid-display
--oid-extra-display
--oid-filter
okta
oneaccess-sys-mib
out-bcast
out-mcast
out-ucast
overprovisioning
--patch-redhat
perfdata
physicaldrive
PKCS1
@@ -162,16 +154,18 @@ psu
QoS
queue-messages-inflighted
RestAPI
RestAPI
RFC1628
RRDCached
Sansymphony
--scope-datacenter
sfp.temperature
SNMP
space-usage-prct
--sql-errors-exit
SSDCapacity
SSH
SureBackup
systemd
SysVol
TCP
teampass
@@ -187,21 +181,22 @@ TrendMicro
UCD
UDP
uptime
--urlpath
usage-prct
userpass
--use-ucd
v1
v2
VDSL2
VDSL2
Veeam
Veeam
VeloCloud
VeloCloud
VM
VMware
VMware
VPN
vSAN
--warning-backend-congestions
--warning-backend-outstanding-io
--warning-bytesallocatedpercentage
--warning-na
WSMAN
WSMAN
XPath
XPath