From 026b947ef2f4e4003f194173d3c231e30fe8cef3 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 24 Oct 2024 21:09:14 +0200 Subject: [PATCH 1/6] nagiosPlugins.check_uptime: fix version --- pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix index 7f6913794d021..dc707f2f37259 100644 --- a/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "check-uptime"; - version = "unstable-2016-11-12"; + version = "0-unstable-2016-11-12"; src = fetchFromGitHub { owner = "madrisan"; From b8e1a4a7735a870456ff7f2e84e7b6b250348c1e Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 24 Oct 2024 21:24:23 +0200 Subject: [PATCH 2/6] nagiosPlugins.check_mssql_health: 2.6.4.15 -> 2.7.7 https://github.com/lausser/check_mssql_health/compare/7ec87d4e41062514a472394e2d3f8ad3c9398795...2.7.7 --- .../nagios-plugins/labs_consol_de/default.nix | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix index 0a421e95b976f..f0ac6707d626e 100644 --- a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix @@ -2,7 +2,6 @@ autoreconfHook, coreutils, fetchFromGitHub, - fetchurl, gnugrep, gnused, lib, @@ -12,28 +11,16 @@ }: let - glplugin = fetchFromGitHub { - owner = "lausser"; - repo = "GLPlugin"; - rev = "ef3107f01afe55fad5452e64ac5bbea00b18a8d5"; - sha256 = "047fwrycsl2vmpi4wl46fs6f8y191d6qc9ms5rvmrj1dm2r828ws"; - }; - generic = { pname, version, - sha256, + src, description, buildInputs, }: stdenv.mkDerivation { - inherit pname version; - - src = fetchurl { - url = "https://labs.consol.de/assets/downloads/nagios/${pname}-${version}.tar.gz"; - inherit sha256; - }; + inherit pname version src; buildInputs = [ perlPackages.perl ] ++ buildInputs; @@ -42,9 +29,7 @@ let makeWrapper ]; - prePatch = '' - rm -rf GLPlugin - ln -s ${glplugin} GLPlugin + postPatch = '' substituteInPlace plugins-scripts/Makefile.am \ --replace-fail /bin/cat ${lib.getExe' coreutils "cat"} \ --replace-fail /bin/echo ${lib.getExe' coreutils "echo"} \ @@ -74,10 +59,18 @@ let in { - check_mssql_health = generic { + check_mssql_health = generic rec { pname = "check-mssql-health"; - version = "2.6.4.15"; - sha256 = "12z0b3c2p18viy7s93r6bbl8fvgsqh80136d07118qhxshp1pwxg"; + version = "2.7.7"; + + src = fetchFromGitHub { + owner = "lausser"; + repo = "check_mssql_health"; + rev = "refs/tags/${version}"; + hash = "sha256-K6sGrms9z59a9rkZNulwKBexGF2Nkqqak/cRg12ynxc="; + fetchSubmodules = true; + }; + description = "Check plugin for Microsoft SQL Server"; buildInputs = [ perlPackages.DBDsybase ]; }; From 60f2a31be7c7a700a7dd41b5bce1ea10711d3b2f Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 24 Oct 2024 21:26:13 +0200 Subject: [PATCH 3/6] nagiosPlugins.check_nwc_health: 7.10.0.6 -> 11.7 https://github.com/lausser/check_nwc_health/compare/3297794143e36e7ef569ee20a8b8b63303778731...11.7 --- .../nagios-plugins/labs_consol_de/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix index f0ac6707d626e..93689d5a14df1 100644 --- a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix @@ -75,10 +75,18 @@ in buildInputs = [ perlPackages.DBDsybase ]; }; - check_nwc_health = generic { + check_nwc_health = generic rec { pname = "check-nwc-health"; - version = "7.10.0.6"; - sha256 = "092rhaqnk3403z0y60x38vgh65gcia3wrd6gp8mr7wszja38kxv2"; + version = "11.7"; + + src = fetchFromGitHub { + owner = "lausser"; + repo = "check_nwc_health"; + rev = "refs/tags/${version}"; + hash = "sha256-r8Cb9RnEohNp0GxMAIaj7e08dTWZhuV1jz4/b8tuJ6k="; + fetchSubmodules = true; + }; + description = "Check plugin for network equipment"; buildInputs = [ perlPackages.NetSNMP ]; }; From 82b056d16066c03409335e6da0165c62565b690a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 24 Oct 2024 21:29:16 +0200 Subject: [PATCH 4/6] nagiosPlugins.check_ups_health: 2.8.3.3 -> 4.3.1.1 https://github.com/lausser/check_ups_health/compare/c49f579bd09a5fdccf6ab0d2c72d93fb3286899c...4.3.1.1 --- .../nagios-plugins/labs_consol_de/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix index 93689d5a14df1..0e13f54bf5bd0 100644 --- a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix @@ -91,10 +91,18 @@ in buildInputs = [ perlPackages.NetSNMP ]; }; - check_ups_health = generic { + check_ups_health = generic rec { pname = "check-ups-health"; - version = "2.8.3.3"; - sha256 = "0qc2aglppwr9ms4p53kh9nr48625sqrbn46xs0k9rx5sv8hil9hm"; + version = "4.3.1.1"; + + src = fetchFromGitHub { + owner = "lausser"; + repo = "check_ups_health"; + rev = "refs/tags/${version}"; + hash = "sha256-ZGSTPVJObP49/tDASOCh4wVdMKajheHD+xVTiFf101k="; + fetchSubmodules = true; + }; + description = "Check plugin for UPSs"; buildInputs = [ perlPackages.NetSNMP ]; }; From 61c0322bb7c5abadbcb5c7263935db5a35f436cd Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 24 Oct 2024 21:31:05 +0200 Subject: [PATCH 5/6] aliases: fix nagiosPlugins aliases --- pkgs/top-level/aliases.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a403b1600e0b4..ed305977e01a7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -177,17 +177,17 @@ mapAliases { cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; certmgr-selfsigned = certmgr; # Added 2023-11-30 challenger = taler-challenger; # Added 2024-09-04 - check_smartmon = throw "'check_smartmon' has been renamed to 'nagiosPlugins.check_smartmon'"; # Added 2024-05-03 - check_systemd = throw "'check_systemd' has been renamed to 'nagiosPlugins.check_systemd'"; # Added 2024-05-03 - check_zfs = throw "'check_zfs' has been renamed to 'nagiosPlugins.check_zfs'"; # Added 2024-05-03 - check-esxi-hardware = throw "'check-esxi-hardware' has been renamed to 'nagiosPlugins.check_esxi_hardware'"; # Added 2024-05-03 - check-mssql-health = throw "'check-mssql-health' has been renamed to 'nagiosPlugins.check_mssql_health'"; # Added 2024-05-03 - check-nwc-health = throw "'check-nwc-health' has been renamed to 'nagiosPlugins.check_nwc_health'"; # Added 2024-05-03 - check-openvpn = throw "'check-openvpn' has been renamed to 'nagiosPlugins.check_openvpn'"; # Added 2024-05-03 - check-ups-health = throw "'check-ups-health' has been renamed to 'nagiosPlugins.check_ups_health'"; # Added 2024-05-03 - check-uptime = throw "'check-uptime' has been renamed to 'nagiosPlugins.check_uptime'"; # Added 2024-05-03 - check-wmiplus = throw "'check-wmiplus' has been renamed to 'nagiosPlugins.check_wmi_plus'"; # Added 2024-05-03 - checkSSLCert = throw "'checkSSLCert' has been renamed to 'nagiosPlugins.check_ssl_cert'"; # Added 2024-05-03 + check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03 + check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03 + check_zfs = nagiosPlugins.check_zfs; # Added 2024-05-03 + check-esxi-hardware = nagiosPlugins.check_esxi_hardware; # Added 2024-05-03 + check-mssql-health = nagiosPlugins.check_mssql_health; # Added 2024-05-03 + check-nwc-health = nagiosPlugins.check_nwc_health; # Added 2024-05-03 + check-openvpn = nagiosPlugins.check_openvpn; # Added 2024-05-03 + check-ups-health = nagiosPlugins.check_ups_health; # Added 2024-05-03 + check-uptime = nagiosPlugins.check_uptime; # Added 2024-05-03 + check-wmiplus = nagiosPlugins.check_wmi_plus; # Added 2024-05-03 + checkSSLCert = nagiosPlugins.check_ssl_cert; # Added 2024-05-03 chiaki4deck = chiaki-ng; # Added 2024-08-04 chocolateDoom = chocolate-doom; # Added 2023-05-01 ChowCentaur = chow-centaur; # Added 2024-06-12 From 19d546a34fea0245a313678cbc562a2c70c34d02 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 24 Oct 2024 21:39:24 +0200 Subject: [PATCH 6/6] nagiosPlugins: add recurseIntoAttrs --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e98ee48b794fa..c7aa3b9414c2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24811,7 +24811,7 @@ with pkgs; nagios = callPackage ../servers/monitoring/nagios { }; - nagiosPlugins = callPackages ../servers/monitoring/nagios-plugins { }; + nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { }); monitoring-plugins = callPackage ../servers/monitoring/plugins { };