pyrox.dev
lol
Merge: Fix NixOS tests for various Prometheus exporters (#352602)
authored by
Maximilian Bosch
and committed by
GitHub
d9bd5a05
a542086f
+80
-6
+2
nixos/tests/prometheus-exporters.nix
+2
nixos/tests/prometheus-exporters.nix
···
597
597
rpcauth=bitcoinrpc:e8fe33f797e698ac258c16c8d7aadfbe$872bdb8f4d787367c26bcfd75e6c23c4f19d44a69f5d1ad329e5adf3f82710f7
598
598
zmqpubrawblock=tcp://127.0.0.1:28332
599
599
zmqpubrawtx=tcp://127.0.0.1:28333
600
+
# https://github.com/lightningnetwork/lnd/issues/9163
601
+
deprecatedrpc=warnings
600
602
'';
601
603
extraCmdlineOptions = [ "-regtest" ];
602
604
};
+2
-2
pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
+2
-2
pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
···
2
2
3
3
buildGoModule rec {
4
4
pname = "pgbouncer-exporter";
5
-
version = "0.10.0";
5
+
version = "0.10.2";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "prometheus-community";
9
9
repo = "pgbouncer_exporter";
10
10
rev = "v${version}";
11
-
hash = "sha256-9Sa9BimyKwYTjh0ELlDlUS3kc5gnkK1i7xiO84vVPYA=";
11
+
hash = "sha256-8ChYYJIHdzH2vWxqnzS6sz9fDeLe+Y29fzia3/aBkgc=";
12
12
};
13
13
14
14
vendorHash = "sha256-PjoS56MdYpDOuSTHHo5lGL9KlWlu3ycA08qim8jrnSU=";
+3
-3
pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
pkgs/servers/monitoring/prometheus/surfboard-exporter/default.nix
+3
-3
pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
pkgs/servers/monitoring/prometheus/surfboard-exporter/default.nix
+72
pkgs/servers/monitoring/prometheus/surfboard-exporter/add-go-mod.patch
+72
pkgs/servers/monitoring/prometheus/surfboard-exporter/add-go-mod.patch
···
1
+
diff --git a/go.mod b/go.mod
2
+
new file mode 100644
3
+
index 0000000..64972bc
4
+
--- /dev/null
5
+
+++ b/go.mod
6
+
@@ -0,0 +1,20 @@
7
+
+module github.com/ipstatic/surfboard_exporter
8
+
+
9
+
+go 1.22
10
+
+
11
+
+require (
12
+
+ github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77
13
+
+ github.com/prometheus/common v0.0.0-20160928123818-e35a2e33a50a
14
+
+ golang.org/x/net v0.0.0-20161019184016-3bafa3320efd
15
+
+)
16
+
+
17
+
+require (
18
+
+ github.com/Sirupsen/logrus v0.10.1-0.20160829202321-3ec0642a7fb6 // indirect
19
+
+ github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect
20
+
+ github.com/golang/protobuf v0.0.0-20160926185624-87c000235d3d // indirect
21
+
+ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
22
+
+ github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
23
+
+ github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9 // indirect
24
+
+ github.com/stretchr/testify v1.9.0 // indirect
25
+
+ golang.org/x/sys v0.26.0 // indirect
26
+
+)
27
+
diff --git a/vendor/modules.txt b/vendor/modules.txt
28
+
new file mode 100644
29
+
index 0000000..d7c6fa3
30
+
--- /dev/null
31
+
+++ b/vendor/modules.txt
32
+
@@ -0,0 +1,40 @@
33
+
+# github.com/Sirupsen/logrus v0.10.1-0.20160829202321-3ec0642a7fb6
34
+
+## explicit
35
+
+github.com/Sirupsen/logrus
36
+
+# github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a
37
+
+## explicit
38
+
+github.com/beorn7/perks/quantile
39
+
+# github.com/golang/protobuf v0.0.0-20160926185624-87c000235d3d
40
+
+## explicit
41
+
+github.com/golang/protobuf/proto
42
+
+# github.com/matttproud/golang_protobuf_extensions v1.0.1
43
+
+## explicit
44
+
+github.com/matttproud/golang_protobuf_extensions/pbutil
45
+
+# github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77
46
+
+## explicit
47
+
+github.com/prometheus/client_golang/prometheus
48
+
+# github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335
49
+
+## explicit
50
+
+github.com/prometheus/client_model/go
51
+
+# github.com/prometheus/common v0.0.0-20160928123818-e35a2e33a50a
52
+
+## explicit
53
+
+github.com/prometheus/common/expfmt
54
+
+github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
55
+
+github.com/prometheus/common/log
56
+
+github.com/prometheus/common/model
57
+
+github.com/prometheus/common/version
58
+
+# github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9
59
+
+## explicit
60
+
+github.com/prometheus/procfs
61
+
+# github.com/stretchr/testify v1.9.0
62
+
+## explicit; go 1.17
63
+
+# golang.org/x/net v0.0.0-20161019184016-3bafa3320efd
64
+
+## explicit
65
+
+golang.org/x/net/html
66
+
+golang.org/x/net/html/atom
67
+
+# golang.org/x/sys v0.26.0
68
+
+## explicit; go 1.18
69
+
+golang.org/x/sys/unix
70
+
+golang.org/x/sys/windows
71
+
+golang.org/x/sys/windows/registry
72
+
+golang.org/x/sys/windows/svc/eventlog
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···
24913
24913
prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { };
24914
24914
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
24915
24915
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
24916
-
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
24916
+
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter { };
24917
24917
prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };
24918
24918
prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { };
24919
24919
prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { };