diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix index db45fea66d86..1c8f2e76818b 100644 --- a/nixos/modules/services/monitoring/librenms.nix +++ b/nixos/modules/services/monitoring/librenms.nix @@ -735,8 +735,6 @@ in ''; }; - programs.mtr.enable = true; - services.logrotate = { enable = true; settings."${cfg.logDir}/librenms.log" = { diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 65d060171836..feefd2b5c95b 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -11,13 +11,10 @@ ipmitool, libvirt, monitoring-plugins, - mtr, net-snmp, nfdump, - nmap, rrdtool, system-sendmail, - whois, dataDir ? "/var/lib/librenms", logDir ? "/var/log/librenms", }: @@ -27,16 +24,16 @@ let in phpPackage.buildComposerProject2 rec { pname = "librenms"; - version = "26.2.0"; + version = "26.3.1"; src = fetchFromGitHub { owner = "librenms"; repo = "librenms"; tag = version; - hash = "sha256-cFFAUgUq+AxOdmHI92WYY6h9jSubXRUL4Jp8q+mDdHg="; + hash = "sha256-wLmZHE7W1ulBvUBpwVatdR8etFVhdG/zpggUpNIb65s="; }; - vendorHash = "sha256-73E3fH1JUHxjphF6aPrmNJu3P1DZd28blmBxSiyuCTc="; + vendorHash = "sha256-uJ7DBJGQ4D1UnZXSUnrO3Fy3xEFz6ZxcMQ12E2jKKSM="; php = phpPackage; @@ -45,14 +42,11 @@ phpPackage.buildComposerProject2 rec { ipmitool libvirt monitoring-plugins - mtr net-snmp nfdump - nmap rrdtool system-sendmail unixtools.whereis - whois (python3.withPackages ( ps: with ps; [ pymysql @@ -78,22 +72,18 @@ phpPackage.buildComposerProject2 rec { substituteInPlace \ $out/resources/definitions/config_definitions.json \ - --replace-fail '"default": "/bin/ping",' '"default": "/run/wrappers/bin/ping",' \ --replace-fail '"default": "fping",' '"default": "/run/wrappers/bin/fping",' \ --replace-fail '"default": "fping6",' '"default": "/run/wrappers/bin/fping6",' \ --replace-fail '"default": "rrdtool",' '"default": "${rrdtool}/bin/rrdtool",' \ --replace-fail '"default": "snmpgetnext",' '"default": "${net-snmp}/bin/snmpgetnext",' \ --replace-fail '"default": "traceroute",' '"default": "/run/wrappers/bin/traceroute",' \ --replace-fail '"default": "/usr/bin/ipmitool",' '"default": "${ipmitool}/bin/ipmitool",' \ - --replace-fail '"default": "/usr/bin/mtr",' '"default": "${mtr}/bin/mtr",' \ --replace-fail '"default": "/usr/bin/nfdump",' '"default": "${nfdump}/bin/nfdump",' \ - --replace-fail '"default": "/usr/bin/nmap",' '"default": "${nmap}/bin/nmap",' \ --replace-fail '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \ --replace-fail '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \ --replace-fail '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \ --replace-fail '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \ --replace-fail '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \ - --replace-fail '"default": "/usr/bin/whois",' '"default": "${whois}/bin/whois",' \ --replace-fail '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/bin",' \ --replace-fail '"default": "/usr/sbin/sendmail",' '"default": "${system-sendmail}/bin/sendmail",'