nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge: Fix NixOS tests for various Prometheus exporters (#352602)

Browse Source
This commit is contained in:
Maximilian Bosch 2024-11-01 16:49:37 +01:00 committed by GitHub
commit d9bd5a0548
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 80 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/prometheus-exporters.nix
View File

@ -597,6 +597,8 @@ let
rpcauth=bitcoinrpc:e8fe33f797e698ac258c16c8d7aadfbe$872bdb8f4d787367c26bcfd75e6c23c4f19d44a69f5d1ad329e5adf3f82710f7
zmqpubrawblock=tcp://127.0.0.1:28332
zmqpubrawtx=tcp://127.0.0.1:28333
# https://github.com/lightningnetwork/lnd/issues/9163
deprecatedrpc=warnings
'';
extraCmdlineOptions = [ "-regtest" ];
};

4
pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pgbouncer-exporter";
version = "0.10.0";
version = "0.10.2";
src = fetchFromGitHub {
owner = "prometheus-community";
repo = "pgbouncer_exporter";
rev = "v${version}";
hash = "sha256-9Sa9BimyKwYTjh0ELlDlUS3kc5gnkK1i7xiO84vVPYA=";
hash = "sha256-8ChYYJIHdzH2vWxqnzS6sz9fDeLe+Y29fzia3/aBkgc=";
};
vendorHash = "sha256-PjoS56MdYpDOuSTHHo5lGL9KlWlu3ycA08qim8jrnSU=";

72
pkgs/servers/monitoring/prometheus/surfboard-exporter/add-go-mod.patch Normal file
View File

@ -0,0 +1,72 @@
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..64972bc
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,20 @@
+module github.com/ipstatic/surfboard_exporter
+
+go 1.22
+
+require (
+ github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77
+ github.com/prometheus/common v0.0.0-20160928123818-e35a2e33a50a
+ golang.org/x/net v0.0.0-20161019184016-3bafa3320efd
+)
+
+require (
+ github.com/Sirupsen/logrus v0.10.1-0.20160829202321-3ec0642a7fb6 // indirect
+ github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect
+ github.com/golang/protobuf v0.0.0-20160926185624-87c000235d3d // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+ github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
+ github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9 // indirect
+ github.com/stretchr/testify v1.9.0 // indirect
+ golang.org/x/sys v0.26.0 // indirect
+)
diff --git a/vendor/modules.txt b/vendor/modules.txt
new file mode 100644
index 0000000..d7c6fa3
--- /dev/null
+++ b/vendor/modules.txt
@@ -0,0 +1,40 @@
+# github.com/Sirupsen/logrus v0.10.1-0.20160829202321-3ec0642a7fb6
+## explicit
+github.com/Sirupsen/logrus
+# github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a
+## explicit
+github.com/beorn7/perks/quantile
+# github.com/golang/protobuf v0.0.0-20160926185624-87c000235d3d
+## explicit
+github.com/golang/protobuf/proto
+# github.com/matttproud/golang_protobuf_extensions v1.0.1
+## explicit
+github.com/matttproud/golang_protobuf_extensions/pbutil
+# github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77
+## explicit
+github.com/prometheus/client_golang/prometheus
+# github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335
+## explicit
+github.com/prometheus/client_model/go
+# github.com/prometheus/common v0.0.0-20160928123818-e35a2e33a50a
+## explicit
+github.com/prometheus/common/expfmt
+github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
+github.com/prometheus/common/log
+github.com/prometheus/common/model
+github.com/prometheus/common/version
+# github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9
+## explicit
+github.com/prometheus/procfs
+# github.com/stretchr/testify v1.9.0
+## explicit; go 1.17
+# golang.org/x/net v0.0.0-20161019184016-3bafa3320efd
+## explicit
+golang.org/x/net/html
+golang.org/x/net/html/atom
+# golang.org/x/sys v0.26.0
+## explicit; go 1.18
+golang.org/x/sys/unix
+golang.org/x/sys/windows
+golang.org/x/sys/windows/registry
+golang.org/x/sys/windows/svc/eventlog

6
pkgs/servers/monitoring/prometheus/surfboard-exporter.nix → pkgs/servers/monitoring/prometheus/surfboard-exporter/default.nix
View File

@ -11,9 +11,9 @@ buildGoModule rec {
sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw";
};
postPatch = ''
go mod init github.com/ipstatic/surfboard_exporter
'';
patches = [
./add-go-mod.patch
];
vendorHash = null;

2
pkgs/top-level/all-packages.nix
View File

@ -24913,7 +24913,7 @@ with pkgs;
prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { };
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter { };
prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };
prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { };
prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { };