Merge branch 'master' of ssh://gitea.fws.fr:3222/fws/zabbix-agent-addons

tags/zabbix-agent-addons-0.2.114-1
Daniel Berteaud 5 years ago
commit 3cb67b1b67
  1. 7
      zabbix-agent-addons.spec
  2. 10
      zabbix_conf/nut_ups.conf

@ -4,7 +4,7 @@
Summary: Scripts for Zabbix monitoring Summary: Scripts for Zabbix monitoring
Name: zabbix-agent-addons Name: zabbix-agent-addons
Version: 0.2.112 Version: 0.2.113
Release: 1%{?dist} Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
@ -101,9 +101,12 @@ fi
%endif %endif
%changelog %changelog
* Tue Feb 25 2020 Daniel Berteaud <daniel@firewall-services.com> 0.2.112-1 * Tue Feb 25 2020 Daniel Berteaud <daniel@firewall-services.com> 0.2.113-1
- Skip Core X temp sensors (daniel@firewall-services.com) - Skip Core X temp sensors (daniel@firewall-services.com)
* Wed Feb 19 2020 Daniel Berteaud <daniel@firewall-services.com> 0.2.112-1
- drop stderrr for upsc commands (daniel@firewall-services.com)
* Mon Feb 17 2020 Daniel Berteaud <daniel@firewall-services.com> 0.2.111-1 * Mon Feb 17 2020 Daniel Berteaud <daniel@firewall-services.com> 0.2.111-1
- Update ZFS and BackupPC templates (daniel@firewall-services.com) - Update ZFS and BackupPC templates (daniel@firewall-services.com)

@ -7,7 +7,7 @@
# Units: % # Units: %
# Multiplier: Do not use # Multiplier: Do not use
# Store Value: As is # Store Value: As is
UserParameter=ups.load[*],upsc $1 ups.load UserParameter=ups.load[*],upsc $1 ups.load 2>/dev/null
# Description: Nut UPS Battery Charge # Description: Nut UPS Battery Charge
# Type: Agent or Agent (active) # Type: Agent or Agent (active)
@ -16,23 +16,23 @@ UserParameter=ups.load[*],upsc $1 ups.load
# Units: % # Units: %
# Multiplier: Do not use # Multiplier: Do not use
# Store Value: As is # Store Value: As is
UserParameter=ups.battery.charge[*],upsc $1 battery.charge UserParameter=ups.battery.charge[*],upsc $1 battery.charge 2>/dev/null
# Description: Nut UPS Status # Description: Nut UPS Status
# Type: Agent or Agent (active) # Type: Agent or Agent (active)
# Key: ups.status[UPS] # Key: ups.status[UPS]
# Type of information: Character # Type of information: Character
# Show Value: As is (you can also define a dictionnary OL=>On Line etc...) # Show Value: As is (you can also define a dictionnary OL=>On Line etc...)
UserParameter=ups.status[*],upsc $1 ups.status UserParameter=ups.status[*],upsc $1 ups.status 2>/dev/null
# Description: Nut UPS Model # Description: Nut UPS Model
# Type: Agent or Agent (active) # Type: Agent or Agent (active)
# Key: ups.model[UPS] # Key: ups.model[UPS]
# Type of information: Text # Type of information: Text
UserParameter=ups.model[*],upsc $1 ups.model UserParameter=ups.model[*],upsc $1 ups.model 2>/dev/null
# UPS discovery # UPS discovery
UserParameter=hardware.ups.discovery[*],/var/lib/zabbix/bin/disco_nut_ups $1 UserParameter=hardware.ups.discovery[*],/var/lib/zabbix/bin/disco_nut_ups $1
# This is a new, more generic nut ups UserParameter # This is a new, more generic nut ups UserParameter
UserParameter=hardware.ups[*],upsc $1 $2 UserParameter=hardware.ups[*],upsc $1 $2 2>/dev/null

Loading…
Cancel
Save