nagiosPlugins: init from pkgs/servers/monitoring/nagios/plugins

2024-10-05 20:55:41 +02:00
parent ddbf80e918
commit a521fec1bf
14 changed files with 40 additions and 27 deletions
@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, python3Packages }:

 python3Packages.buildPythonApplication rec {
-  pname = "check-openvpn";
+  pname = "check_openvpn";
  version = "0.0.1";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook }:

 stdenv.mkDerivation {
-  pname = "check-uptime";
+  pname = "check_uptime";
  version = "20161112";

  src = fetchFromGitHub {
@@ -3,7 +3,7 @@
 , wmic-bin ? null }:

 stdenv.mkDerivation rec {
-  pname = "check-wmiplus";
+  pname = "check_wmi_plus";
  version = "1.65";

  # We fetch from github.com instead of the proper upstream as nix-build errors
@@ -0,0 +1,7 @@
+{ newScope, pkgs }:
+
+let
+  callPackage = newScope (pkgs // plugins);
+  plugins = import ./plugins.nix { inherit callPackage; };
+in
+plugins
@@ -51,7 +51,7 @@ let
  };

 in {
-  check-mssql-health = generic {
+  check_mssql_health = generic {
    pname       = "check_mssql_health";
    version     = "2.6.4.15";
    sha256      = "12z0b3c2p18viy7s93r6bbl8fvgsqh80136d07118qhxshp1pwxg";
@@ -59,7 +59,7 @@ in {
    buildInputs = [ perlPackages.DBDsybase ];
  };

-  check-nwc-health = generic {
+  check_nwc_health = generic {
    pname       = "check_nwc_health";
    version     = "7.10.0.6";
    sha256      = "092rhaqnk3403z0y60x38vgh65gcia3wrd6gp8mr7wszja38kxv2";
@@ -67,7 +67,7 @@ in {
    buildInputs = [ perlPackages.NetSNMP ];
  };

-  check-ups-health = generic {
+  check_ups_health = generic {
    pname       = "check_ups_health";
    version     = "2.8.3.3";
    sha256      = "0qc2aglppwr9ms4p53kh9nr48625sqrbn46xs0k9rx5sv8hil9hm";
@@ -0,0 +1,14 @@
+{ callPackage }:
+
+{
+  check_esxi_hardware = callPackage ./check_esxi_hardware { };
+  check_openvpn = callPackage ./check_openvpn { };
+  check_smartmon = callPackage ./check_smartmon { };
+  check_ssl_cert = callPackage ./check_ssl_cert { };
+  check_systemd = callPackage ./check_systemd { };
+  check_uptime = callPackage ./check_uptime { };
+  check_wmi_plus = callPackage ./check_wmi_plus { };
+  check_zfs = callPackage ./check_zfs { };
+
+  inherit (callPackage ./labs_consol_de { }) check_mssql_health check_nwc_health check_ups_health;
+}
@@ -231,6 +231,17 @@ mapAliases {
  ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09
  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
  chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22
  chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
  chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
@@ -24965,29 +24965,14 @@ with pkgs;

  nagios = callPackage ../servers/monitoring/nagios { };

+  nagiosPlugins = callPackages ../servers/monitoring/nagios-plugins { };
+
  monitoring-plugins = callPackage ../servers/monitoring/plugins { };

-  inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { })
-    check-mssql-health
-    check-nwc-health
-    check-ups-health;
-
-  check-openvpn = callPackage ../servers/monitoring/plugins/openvpn.nix { };
-
-  check_smartmon = callPackage ../servers/monitoring/nagios/plugins/smartmon.nix { };
-
-  checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { };
-
-  check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { };
-
-  check_zfs = callPackage ../servers/monitoring/nagios/plugins/zfs.nix { };
-
  neo4j = callPackage ../servers/nosql/neo4j { };

  neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };

-  check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix { };
-
  net-snmp = callPackage ../servers/monitoring/net-snmp { };

  newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
@@ -25278,8 +25263,6 @@ with pkgs;
    sensu-go-backend
    sensu-go-cli;

-  check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { };
-
  shishi = callPackage ../servers/shishi {
      pam = if stdenv.hostPlatform.isLinux then pam else null;
      # see also openssl, which has/had this same trick
@@ -38627,8 +38610,6 @@ with pkgs;

  wmic-bin = callPackage ../servers/monitoring/plugins/wmic-bin.nix { };

-  check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { };
-
  ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { };

  vdr = callPackage ../applications/video/vdr { };