diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index afa610809318..796eb065e63c 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,31 +1,23 @@ -# This file was generated by go2nix. -{ buildGoPackage, fetchFromGitHub, fetchpatch, lib, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage { +buildGoModule rec { pname = "prometheus-json-exporter"; - version = "unstable-2017-10-06"; - - goPackagePath = "github.com/kawamuray/prometheus-json-exporter"; + version = "0.2.0"; src = fetchFromGitHub { - owner = "kawamuray"; - repo = "prometheus-json-exporter"; - rev = "51e3dc02a30ab818bb73e5c98c3853231c2dbb5f"; - sha256 = "1v1p4zcqnb3d3rm55r695ydn61h6gz95f55cpa22hzw18dasahdh"; + owner = "prometheus-community"; + repo = "json_exporter"; + rev = "v${version}"; + sha256 = "1aabvd75a2223x5wnbyryigj7grw6l05jhr3g3s97b1f1hfigz6d"; }; - goDeps = ./json-exporter_deps.nix; - - patches = [(fetchpatch { # adds bool support - url = "https://patch-diff.githubusercontent.com/raw/kawamuray/prometheus-json-exporter/pull/17.patch"; - sha256 = "0mc5axhd2bykci41dgswl4r1552d70jsmb17lbih7czhsy6rgmrm"; - })]; + vendorSha256 = "03kb0gklq08krl7qnvs7267siw1pkyy346b42dsk1d9gr5302wsw"; passthru.tests = { inherit (nixosTests.prometheus-exporters) json; }; meta = with lib; { description = "A prometheus exporter which scrapes remote JSON by JSONPath"; - homepage = "https://github.com/kawamuray/prometheus-json-exporter"; + homepage = "https://github.com/prometheus-community/json_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz ]; }; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix deleted file mode 100644 index 9416125bc0c2..000000000000 --- a/pkgs/servers/monitoring/prometheus/json-exporter_deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f"; - sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "8ee79997227bf9b34611aee7946ae64735e6fd93"; - sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8"; - }; - } - { - goPackagePath = "github.com/kawamuray/jsonpath"; - fetch = { - type = "git"; - url = "https://github.com/kawamuray/jsonpath"; - rev = "5c448ebf973557834ef870e788b0b2d95ac68d12"; - sha256 = "1i1id1i85rf09rldp03h0ibyi6zg0fz9p9l5qj7i8dfs6h6y8f0a"; - }; - } - { - goPackagePath = "github.com/kawamuray/prometheus-exporter-harness"; - fetch = { - type = "git"; - url = "https://github.com/kawamuray/prometheus-exporter-harness"; - rev = "97eeea7b8b0619ea2a065d75c0f0f5909327afa6"; - sha256 = "12al8irf8jb6p2xmm4wbh0wjqsyrdywynr4w122wxxnsx2n56xyv"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "575f371f7862609249a1be4c9145f429fe065e32"; - sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3"; - sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; - sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0"; - sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam"; - }; - } -]