@cryptotaxi247 / infra-1 / commits / 7f317c3f

delft: retire postgres-exporter overlay

Bumps us to a newer version, where extending it with custom queries was dropped.

Martin Weinelt committed Feb 23, 2024 at 12:57 UTC 7f317c3fb77c6c54dca9e6bd522f22408021a8b5
3 files changed -35
delft/common.nix
-6
@@ -12,12 +12,6 @@ with lib;
12
13 nixpkgs.config.allowUnfree = true;
14
15 - nixpkgs.overlays = [
16 - (self: super: {
17 - prometheus-postgres-exporter = self.callPackage ./prometheus/postgres-exporter.nix { };
18 - })
19 - ];
20 -
15 services.openssh.authorizedKeysFiles = mkForce [ "/etc/ssh/authorized_keys.d/%u" ];
16
17 services.openssh.extraConfig =
delft/haumea/postgresql.nix
-3
@@ -14,9 +14,6 @@
14 dataSourceName = "user=root database=hydra host=/run/postgresql sslmode=disable";
15 firewallFilter = "-i wg0 -p tcp -m tcp --dport 9187";
16 openFirewall = true;
17 - extraFlags = [
18 - "--extend.query-path" "${pkgs.prometheus-postgres-exporter.src}/queries.yaml"
19 - ];
17 };
18
19 networking.firewall.interfaces.wg0.allowedTCPPorts = [ 5432 ];
delft/prometheus/postgres-exporter.nix deleted
-26
@@ -1,26 +0,0 @@
1 -{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
2 -
3 -buildGoModule rec {
4 - pname = "postgres_exporter";
5 - version = "0.9.0";
6 -
7 - src = fetchFromGitHub {
8 - owner = "wrouesnel";
9 - repo = "postgres_exporter";
10 - rev = "v${version}";
11 - sha256 = "sha256-Kv+sjqhlmH36L4YvDuGYODR/eTHA2TKQ6IUCXAiItyo=";
12 - };
13 -
14 - vendorSha256 = "sha256-yMcoUl9NsiiZQyEHlLu79DzIyl6BbhLZ/xNFavaGrEs=";
15 -
16 - doCheck = true;
17 -
18 - passthru.tests = { inherit (nixosTests.prometheus-exporters) postgres; };
19 -
20 - meta = with lib; {
21 - inherit (src.meta) homepage;
22 - description = "A Prometheus exporter for PostgreSQL";
23 - license = licenses.asl20;
24 - maintainers = with maintainers; [ fpletz globin willibutz ma27 ];
25 - };
26 -}