diff options
Diffstat (limited to 'pkgs/servers/monitoring')
102 files changed, 344 insertions, 282 deletions
diff --git a/pkgs/servers/monitoring/alerta/client.nix b/pkgs/servers/monitoring/alerta/client.nix index d8de093c2765..d3de741e53bc 100644 --- a/pkgs/servers/monitoring/alerta/client.nix +++ b/pkgs/servers/monitoring/alerta/client.nix @@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://alerta.io"; description = "Alerta Monitoring System command-line interface"; + mainProgram = "alerta"; license = licenses.asl20; }; } diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/servers/monitoring/alerta/default.nix index e69599498182..f84bb3302eca 100644 --- a/pkgs/servers/monitoring/alerta/default.nix +++ b/pkgs/servers/monitoring/alerta/default.nix @@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://alerta.io"; description = "Alerta Monitoring System server"; + mainProgram = "alertad"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index 7b06eed72ce6..fb5f524c0afe 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Alertmanager IRC Relay is a bot relaying Prometheus alerts to IRC"; + mainProgram = "alertmanager-irc-relay"; longDescription = '' Alertmanager IRC Relay is a bot relaying Prometheus alerts to IRC. Alerts are received from Prometheus using Webhooks and are relayed to an diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 409ae5f37562..dc0d890a429f 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { description = "Analyzes resource usage and performance characteristics of running docker containers"; + mainProgram = "cadvisor"; homepage = "https://github.com/google/cadvisor"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index d13c48544898..ad9f7fc80c44 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "DigitalOcean droplet system metrics agent"; + mainProgram = "do-agent"; longDescription = '' do-agent is a program provided by DigitalOcean that collects system metrics from a DigitalOcean Droplet (on which the program runs) and sends diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 622147f92f97..0597eaa75351 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.40.2"; + version = "0.40.3"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-muSgFBg+/XWx2f9EGYYLQ0wUzZ7AxEC2F19A5Qs5cgw="; + hash = "sha256-oezfeUW+CVwqe8T3pEkLU1vxI1dntMQ6cvE9AqxKtR8="; }; - vendorHash = "sha256-ekFl+aSmyUvgv4pkpS86HwPMfqtDaJEaZhWiwHjHp9g="; + vendorHash = "sha256-64etBHKlEPByDzrEP3YYhgR4vnj4yvHk6cjB92myqyc="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 7975bf514e3c..3a4217c6995e 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-fl2vDaGLR2ZlHnljfHYPN0EmbGqJwVs5dBkXRDJ3fM8="; + hash = "sha256-hfq0wuDoZ/3kiXVgwFPGRXMGxeRRVvCzi+VWJczOwgM="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-6x42/UaTNmoglgHDqfa0LjQz8PeOwUVqI5BOEuzdnuM="; + hash = "sha256-NqzADMMjxxZQOPt0lJOWoJ8WEU7hFJmnwRnSQPYMtLo="; }; packageJSON = ./package.json; @@ -60,6 +60,7 @@ mkYarnPackage rec { meta = with lib; { homepage = "https://github.com/grafana/grafana-image-renderer"; description = "A Grafana backend plugin that handles rendering of panels & dashboards to PNGs using headless browser (Chromium/Chrome)"; + mainProgram = "grafana-image-renderer"; license = licenses.asl20; maintainers = with maintainers; [ ma27 ]; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 7d360f78c6b1..10bd43ab4621 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -59,7 +59,7 @@ "@types/supertest": "^2.0.15", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", - "axios": "1.6.0", + "axios": "1.6.7", "cross-env": "7.0.3", "eslint": "8.23.1", "eslint-config-prettier": "8.5.0", diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 60cf6d51224c..1b4d0d04fa30 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -25,6 +25,7 @@ buildGoPackage rec { meta = { description = "PDF report generator from a Grafana dashboard"; + mainProgram = "grafana-reporter"; homepage = "https://github.com/IzakMarais/reporter"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 8b2a9c02e0df..99846f7babfe 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -18,29 +18,18 @@ let done rm -r packages/grafana-e2e ''; - - # Injects a `t.Skip()` into a given test since - # there's apparently no other way to skip tests here. - skipTest = lineOffset: testCase: file: - let - jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); - in '' - sed -i -e '/${testCase}/{ - ${jumpAndAppend} t.Skip(); - }' ${file} - ''; in buildGoModule rec { pname = "grafana"; - version = "10.3.3"; + version = "10.4.0"; - excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; + subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; src = fetchFromGitHub { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-uAfHcW9j+al8IIH2N6X5wssQmSXqJjVQzwERBCxGxVE="; + hash = "sha256-Rp2jGspbmqJFzSbiVy2/5oqQJnAdGG/T+VNBHVsHSwg="; }; offlineCache = stdenv.mkDerivation { @@ -48,7 +37,7 @@ buildGoModule rec { inherit src; nativeBuildInputs = [ yarn nodejs cacert - jq moreutils + jq moreutils python3 ]; postPatch = '' ${patchAwayGrafanaE2E} @@ -67,12 +56,12 @@ buildGoModule rec { dontInstall = true; dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-70eMa8E483f/Bz7iy+4Seap1EfIdjD5krnt6W9CUows="; + outputHash = "sha256-QdyXSPshzugkDTJoUrJlHNuhPAyR9gae5Cbk8Q8FSl4="; }; disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-nGv/DBNnQ4AOJtrsYIGLCrV1xNmBN0dDf6u46R3TAHo="; + vendorHash = "sha256-cNkMVLXp3hPMcW0ilOM0VlrrDX/IsZaze+/6qlTfmRs="; nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ]; @@ -89,36 +78,6 @@ buildGoModule rec { GOARCH= CGO_ENABLED=0 go generate ./pkg/plugins/plugindef GOARCH= CGO_ENABLED=0 go generate ./kinds/gen.go GOARCH= CGO_ENABLED=0 go generate ./public/app/plugins/gen.go - GOARCH= CGO_ENABLED=0 go generate ./pkg/kindsys/report.go - - # Work around `main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/pkg/util/xorm`. - # Apparently these files confuse the dependency resolution for the go builder implemented here. - rm pkg/util/xorm/go.{mod,sum} - - # The testcase makes an API call against grafana.com: - # - # [...] - # grafana> t=2021-12-02T14:24:58+0000 lvl=dbug msg="Failed to get latest.json repo from github.com" logger=update.checker error="Get \"https://raw.githubusercontent.com/grafana/grafana/main/latest.json\": dial tcp: lookup raw.githubusercontent.com on [::1]:53: read udp [::1]:36391->[::1]:53: read: connection refused" - # grafana> t=2021-12-02T14:24:58+0000 lvl=dbug msg="Failed to get plugins repo from grafana.com" logger=plugin.manager error="Get \"https://grafana.com/api/plugins/versioncheck?slugIn=&grafanaVersion=\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:41796->[::1]:53: read: connection refused" - ${skipTest 1 "Request is not forbidden if from an admin" "pkg/tests/api/plugins/api_plugins_test.go"} - - # Skip a flaky test (https://github.com/NixOS/nixpkgs/pull/126928#issuecomment-861424128) - ${skipTest 2 "it should change folder successfully and return correct result" "pkg/services/libraryelements/libraryelements_patch_test.go"} - - # Skip flaky tests (https://logs.ofborg.org/?key=nixos/nixpkgs.263185&attempt_id=5b056a17-67a7-4b74-9dc7-888eb1d6c2dd) - ${skipTest 1 "TestIntegrationRulerAccess" "pkg/tests/api/alerting/api_alertmanager_test.go"} - ${skipTest 1 "TestIntegrationRulePause" "pkg/tests/api/alerting/api_ruler_test.go"} - - # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go - rm -r scripts/go - - # Requires making API calls against storage.googleapis.com: - # - # [...] - # grafana> 2023/08/24 08:30:23 failed to copy objects, err: Post "https://storage.googleapis.com/upload/storage/v1/b/grafana-testing-repo/o?alt=json&name=test-path%2Fbuild%2FTestCopyLocalDir2194093976%2F001%2Ffile2.txt&prettyPrint=false&projection=full&uploadType=multipart": dial tcp: lookup storage.googleapis.com on [::1]:53: read udp [::1]:36436->[::1]:53: read: connection refused - # grafana> panic: test timed out after 10m0s - rm pkg/build/gcloud/storage/gsutil_test.go - # Setup node_modules export HOME="$(mktemp -d)" @@ -175,7 +134,7 @@ buildGoModule rec { meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://grafana.com"; maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/servers/monitoring/karma/default.nix index 5bc19740d8de..c27bffa3598f 100644 --- a/pkgs/servers/monitoring/karma/default.nix +++ b/pkgs/servers/monitoring/karma/default.nix @@ -62,6 +62,7 @@ buildGoModule rec { meta = with lib; { changelog = "https://github.com/prymitive/karma/blob/${src.rev}/CHANGELOG.md"; description = "Alert dashboard for Prometheus Alertmanager"; + mainProgram = "karma"; homepage = "https://karma-dashboard.io/"; license = licenses.asl20; maintainers = with maintainers; [ nukaduka ]; diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index a667d1d442b1..22de6d4ebb6f 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -1,33 +1,21 @@ { acl , fetchFromGitHub -, fetchpatch , lib , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "threathunters-io"; repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-lWVrp0ytomrQBSDuQCMFJpSuAuwjSYPwoE4yh/WO2ls="; + hash = "sha256-dGgBcugIQ3ZPnqyTw6wRMN2PZLm6GqobeFZ1/uzMKbs="; }; - cargoHash = "sha256-GY7vpst+Epsy/x/ths6pwtGQgM6Bx0KI+NsCMFCBujE="; - - cargoPatches = [ - # Upstream forgot to bump the Cargo.lock before tagging the release. - # This patch is the first commit immediately after the tag fixing this mistake. - # Needs to be removed next release. - (fetchpatch { - name = "Cargo-lock-version-bump.patch"; - url = "https://github.com/threathunters-io/laurel/commit/f38393d1098e8f75394f83ad3da5c1160fb96652.patch"; - hash = "sha256-x+7p21X38KYqLclFtGnLO5nOHz819+XTaSPMvDbSo/I="; - }) - ]; + cargoHash = "sha256-8JNLssWTCfwrfQ/jg/rj7BUo9bCNCsM2RDwPI7cacRw="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 2578bb5a0405..2935b9d0bf4c 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.5"; + version = "2.9.6"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-+X9ODzyIaeizLItUqorDdvgpIOPML+MzgwmyKbes9dA="; + hash = "sha256-79hK7axHf6soku5DvdXkE/0K4WKc4pnS9VMbVc1FS2I="; }; vendorHash = null; @@ -52,6 +52,7 @@ buildGoModule rec { meta = with lib; { description = "Like Prometheus, but for logs"; + mainProgram = "promtail"; license = with licenses; [ agpl3Only asl20 ]; homepage = "https://grafana.com/oss/loki/"; changelog = "https://github.com/grafana/loki/releases/tag/v${version}"; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index d2cc7c040e5d..cfd9ddab9a2c 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.linode.com/longview"; description = "Collects all of your system-level metrics and sends them to Linode"; + mainProgram = "longview"; license = licenses.gpl2Plus; maintainers = [ maintainers.rvl ]; inherit version; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index b99309fb05e5..a240c1aee990 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.79.0"; + version = "0.80.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UKSrNUKS7VYK/hcKdNetaq6HNPqZyK7VtlJZjoyxU6o="; + sha256 = "sha256-ETM7OTJEdySej9wrV9sth1JCJAtfBVdsPH8ndOBV118="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-AnkjmgcFSI8RadfTdtCk+NCiAw+NecfaU/vc7WOgbuk="; + vendorHash = "sha256-pCUHDHKNaSoIPB3fS+Jf953YMI5cXcUOLF+YP62iPMo="; subPackages = [ "." ]; @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "System monitoring service for mackerel.io"; + mainProgram = "mackerel-agent"; homepage = "https://github.com/mackerelio/mackerel-agent"; license = licenses.asl20; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/servers/monitoring/matrix-alertmanager/default.nix b/pkgs/servers/monitoring/matrix-alertmanager/default.nix index 80685e94662c..a5c6212f6c8e 100644 --- a/pkgs/servers/monitoring/matrix-alertmanager/default.nix +++ b/pkgs/servers/monitoring/matrix-alertmanager/default.nix @@ -27,6 +27,7 @@ buildNpmPackage rec { meta = with lib; { changelog = "https://github.com/jaywink/matrix-alertmanager/blob/${src.rev}/CHANGELOG.md"; description = "Bot to receive Alertmanager webhook events and forward them to chosen rooms"; + mainProgram = "matrix-alertmanager"; homepage = "https://github.com/jaywink/matrix-alertmanager"; license = licenses.mit; maintainers = with maintainers; [ yuka ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 783384eb9610..9572c1d2c87e 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.80.0"; + version = "2.81.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-1KYolUA5AZ9fQLfNb4UE1WlMTj6GiAnNszPTLlERBvc="; + hash = "sha256-6C6shxu9ze0ffx6Mg2K9TkqJl98Wz7loTcCptg92IY8="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Nagios plugin to check the CA and validity of an X.509 certificate"; + mainProgram = "check_ssl_cert"; homepage = "https://github.com/matteocorti/check_ssl_cert"; changelog = "https://github.com/matteocorti/check_ssl_cert/releases/tag/v${version}"; license = licenses.gpl3Plus; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix index 9904147420aa..fe1500d53f54 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Nagios / Icinga monitoring plugin to check systemd for failed units"; + mainProgram = "check_systemd"; inherit (src.meta) homepage; changelog = "https://github.com/Josef-Friedrich/check_systemd/releases"; maintainers = with maintainers; [ symphorien ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/smartmon.nix b/pkgs/servers/monitoring/nagios/plugins/smartmon.nix index 42554cfafe99..25adfefe84e2 100644 --- a/pkgs/servers/monitoring/nagios/plugins/smartmon.nix +++ b/pkgs/servers/monitoring/nagios/plugins/smartmon.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Nagios-Plugin that uses smartmontools to check disk health status and temperature"; + mainProgram = "check_smartmon"; homepage = "https://github.com/driehuis/Nagios_check_smartmon"; license = licenses.gpl2Plus; maintainers = with maintainers; [ mariaa144 ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/zfs.nix b/pkgs/servers/monitoring/nagios/plugins/zfs.nix index 724aa498afb7..0ec84722d201 100644 --- a/pkgs/servers/monitoring/nagios/plugins/zfs.nix +++ b/pkgs/servers/monitoring/nagios/plugins/zfs.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Check the health, capacity, fragmentation, and other things for use with Nagios monitoring"; + mainProgram = "check_zfs"; homepage = "https://github.com/zlacelle/nagios_check_zfs_linux"; license = licenses.gpl3Only; maintainers = with maintainers; [ mariaa144 ]; diff --git a/pkgs/servers/monitoring/openobserve/Cargo.lock b/pkgs/servers/monitoring/openobserve/Cargo.lock index eaff98567453..81665794e141 100644 --- a/pkgs/servers/monitoring/openobserve/Cargo.lock +++ b/pkgs/servers/monitoring/openobserve/Cargo.lock @@ -326,7 +326,7 @@ dependencies = [ "actix-http", "actix-web", "futures-util", - "opentelemetry 0.21.0", + "opentelemetry", "opentelemetry-semantic-conventions", "serde", ] @@ -1181,7 +1181,7 @@ dependencies = [ "hyper-rustls", "lazy_static", "pin-project-lite", - "rustls", + "rustls 0.21.10", "tokio", "tower", "tracing", @@ -1824,6 +1824,16 @@ dependencies = [ ] [[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown 0.14.3", + "stacker", +] + +[[package]] name = "ciborium" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2072,6 +2082,7 @@ dependencies = [ "hex", "indexmap 2.1.0", "itertools 0.12.1", + "lettre", "log", "memchr", "murmur3", @@ -2088,7 +2099,7 @@ dependencies = [ "sysinfo", "tokio", "tracing", - "tracing-log 0.2.0", + "tracing-log", "tracing-subscriber", "utoipa", "walkdir", @@ -2784,6 +2795,22 @@ dependencies = [ ] [[package]] +name = "email-encoding" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" +dependencies = [ + "base64 0.21.7", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" + +[[package]] name = "ena" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3532,10 +3559,10 @@ dependencies = [ "http 0.2.11", "hyper", "log", - "rustls", + "rustls 0.21.10", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -3895,6 +3922,36 @@ dependencies = [ ] [[package]] +name = "lettre" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357ff5edb6d8326473a64c82cf41ddf78ab116f89668c50c4fac1b321e5e80f4" +dependencies = [ + "async-trait", + "base64 0.21.7", + "chumsky", + "email-encoding", + "email_address", + "fastrand 2.0.1", + "futures-io", + "futures-util", + "hostname", + "httpdate", + "idna", + "mime", + "nom", + "percent-encoding", + "quoted_printable", + "rustls 0.22.2", + "rustls-pemfile 2.0.0", + "socket2", + "tokio", + "tokio-rustls 0.25.0", + "url", + "webpki-roots 0.26.1", +] + +[[package]] name = "lexical-core" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4291,9 +4348,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -4625,7 +4682,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openobserve" -version = "0.8.1" +version = "0.9.0" dependencies = [ "actix-cors", "actix-multipart", @@ -4671,15 +4728,17 @@ dependencies = [ "ipnetwork 0.20.0", "itertools 0.12.1", "jsonwebtoken", + "lettre", "log", "maxminddb", "memory-stats", "mimalloc", "object_store", "once_cell", - "opentelemetry 0.18.0", + "opentelemetry", "opentelemetry-otlp", - "opentelemetry-proto 0.2.0", + "opentelemetry-proto", + "opentelemetry_sdk", "parking_lot 0.12.1", "parquet", "prometheus", @@ -4709,8 +4768,8 @@ dependencies = [ "time", "tokio", "tokio-stream", - "tonic 0.8.3", - "tonic-build 0.8.4", + "tonic 0.9.2", + "tonic-build 0.9.2", "tracing", "tracing-appender", "tracing-opentelemetry", @@ -4732,26 +4791,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "opentelemetry" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" -dependencies = [ - "opentelemetry_api 0.18.0", - "opentelemetry_sdk 0.18.0", -] - -[[package]] -name = "opentelemetry" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f" -dependencies = [ - "opentelemetry_api 0.19.0", - "opentelemetry_sdk 0.19.0", -] - -[[package]] -name = "opentelemetry" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" @@ -4768,66 +4807,50 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", "http 0.2.11", - "opentelemetry_api 0.18.0", + "opentelemetry", "reqwest", ] [[package]] name = "opentelemetry-otlp" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", - "futures", - "futures-util", + "futures-core", "http 0.2.11", - "opentelemetry 0.18.0", + "opentelemetry", "opentelemetry-http", - "opentelemetry-proto 0.1.0", + "opentelemetry-proto", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", "prost 0.11.9", "reqwest", "serde", "thiserror", "tokio", - "tonic 0.8.3", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" -dependencies = [ - "futures", - "futures-util", - "opentelemetry 0.18.0", - "prost 0.11.9", - "tonic 0.8.3", - "tonic-build 0.8.4", + "tonic 0.9.2", ] [[package]] name = "opentelemetry-proto" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045f8eea8c0fa19f7d48e7bc3128a39c2e5c533d5c61298c548dfefc1064474c" +checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "futures", - "futures-util", - "opentelemetry 0.19.0", + "opentelemetry", + "opentelemetry_sdk", "prost 0.11.9", - "protobuf", "serde", - "serde_json", - "tonic 0.8.3", + "tonic 0.9.2", ] [[package]] @@ -4836,84 +4859,33 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "opentelemetry 0.21.0", -] - -[[package]] -name = "opentelemetry_api" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" -dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", -] - -[[package]] -name = "opentelemetry_api" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2" -dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", + "opentelemetry", ] [[package]] name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", + "glob", "once_cell", - "opentelemetry_api 0.18.0", + "opentelemetry", + "ordered-float 4.2.0", "percent-encoding", "rand", + "serde_json", "thiserror", "tokio", "tokio-stream", ] [[package]] -name = "opentelemetry_sdk" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1" -dependencies = [ - "async-trait", - "crossbeam-channel", - "dashmap", - "fnv", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api 0.19.0", - "percent-encoding", - "rand", - "thiserror", -] - -[[package]] name = "option-ext" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5568,9 +5540,14 @@ name = "protobuf" version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" dependencies = [ - "serde", - "serde_derive", + "cc", ] [[package]] @@ -5846,7 +5823,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.10", "rustls-native-certs", "rustls-pemfile 1.0.4", "serde", @@ -5855,7 +5832,7 @@ dependencies = [ "sync_wrapper", "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -5863,7 +5840,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg", ] @@ -6103,11 +6080,25 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring 0.17.7", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] [[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring 0.17.7", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + +[[package]] name = "rustls-native-certs" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6155,6 +6146,17 @@ dependencies = [ ] [[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring 0.17.7", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6680,7 +6682,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.21.10", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -6692,7 +6694,7 @@ dependencies = [ "tokio-stream", "tracing", "url", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] @@ -6849,6 +6851,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if 1.0.0", + "libc", + "psm", + "winapi 0.3.9", +] + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7281,7 +7296,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.2", + "rustls-pki-types", "tokio", ] @@ -7340,14 +7366,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.7", "bytes", "flate2", "futures-core", @@ -7360,15 +7385,12 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.11.9", - "prost-derive 0.11.9", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", ] [[package]] @@ -7390,10 +7412,10 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.3", - "rustls", + "rustls 0.21.10", "rustls-pemfile 1.0.4", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-stream", "tower", "tower-layer", @@ -7403,9 +7425,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.8.4" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", "proc-macro2", @@ -7505,27 +7527,6 @@ dependencies = [ ] [[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] name = "tracing-log" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7538,16 +7539,20 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.18.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ + "js-sys", "once_cell", - "opentelemetry 0.18.0", + "opentelemetry", + "opentelemetry_sdk", + "smallvec", "tracing", "tracing-core", - "tracing-log 0.1.4", + "tracing-log", "tracing-subscriber", + "web-time", ] [[package]] @@ -7577,7 +7582,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", "tracing-serde", ] @@ -8078,6 +8083,16 @@ dependencies = [ ] [[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] name = "webbrowser" version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8101,6 +8116,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] name = "which" version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/monitoring/openobserve/default.nix b/pkgs/servers/monitoring/openobserve/default.nix index 5a99d017b601..59a0d203e258 100644 --- a/pkgs/servers/monitoring/openobserve/default.nix +++ b/pkgs/servers/monitoring/openobserve/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , protobuf , bzip2 @@ -16,12 +15,12 @@ }: let - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "openobserve"; repo = "openobserve"; rev = "v${version}"; - hash = "sha256-J8TuaWjtuR39XA7tizyI+DFkpOaLFweM+/9VImGj8UE="; + hash = "sha256-AQxSR2cMkNst5YEv4TqVNgdriMsg/0ed5YN4W8qZKxM="; }; web = buildNpmPackage { inherit src version; @@ -29,7 +28,7 @@ let sourceRoot = "${src.name}/web"; - npmDepsHash = "sha256-RNUCR80ewFt9F/VHv7kXLa87h0fz0YBp+9gSOUhtrdU="; + npmDepsHash = "sha256-c82NLNLfqQrS/jv7ixpLCYDMEUtx6+Mm8cSwvVis2fc="; preBuild = '' # Patch vite config to not open the browser to visualize plugin composition @@ -56,12 +55,6 @@ rustPlatform.buildRustPackage { inherit version src; patches = [ - (fetchpatch { - name = "fix-test-hash-partition.patch"; - url = "https://github.com/openobserve/openobserve/commit/24919333d6b6696f0f9d9aff0a883431481e8fce.patch"; - includes = ["src/common/meta/stream.rs"]; - hash = "sha256-GB3Pgmp1swJt6ESgKL2eWOZ3jBcsN0r+5Dxasgg50D4="; - }) # prevent using git to determine version info during build time ./build.rs.patch ]; diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix index 35d6d5fd80cf..bc2c7cee63e5 100644 --- a/pkgs/servers/monitoring/phlare/default.nix +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Grafana Phlare is an open source database that provides fast, scalable, highly available, and efficient storage and querying of profiling data."; - license = licenses.agpl3; + license = licenses.agpl3Only; homepage = "https://grafana.com/oss/phlare"; maintainers = with maintainers; [ cathalmullan ]; }; diff --git a/pkgs/servers/monitoring/plugins/openvpn.nix b/pkgs/servers/monitoring/plugins/openvpn.nix index 2b7e69ab8f0b..3ae474d6d9e8 100644 --- a/pkgs/servers/monitoring/plugins/openvpn.nix +++ b/pkgs/servers/monitoring/plugins/openvpn.nix @@ -16,6 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A nagios/icinga/sensu check plugin for OpenVPN"; + mainProgram = "check_openvpn"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/servers/monitoring/plugins/wmic-bin.nix b/pkgs/servers/monitoring/plugins/wmic-bin.nix index 4cfbcd254133..64cf171afea1 100644 --- a/pkgs/servers/monitoring/plugins/wmic-bin.nix +++ b/pkgs/servers/monitoring/plugins/wmic-bin.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WMI client for Linux (binary)"; + mainProgram = "wmic"; homepage = "https://www.openvas.org"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 5bb98203fa2d..1f6dd51d8989 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)"; + mainProgram = "apcupsd_exporter"; homepage = "https://github.com/mdlayher/apcupsd_exporter"; license = licenses.mit; maintainers = with maintainers; [ _1000101 mdlayher ]; diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 54b5c8370bdf..b9a11f47d8db 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "JFrog Artifactory Prometheus Exporter"; + mainProgram = "artifactory_exporter"; homepage = "https://github.com/peimanja/artifactory_exporter"; changelog = "https://github.com/peimanja/artifactory_exporter/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix index ce40a93e66f8..c46959598149 100644 --- a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for RIPE Atlas measurement results "; + mainProgram = "atlas_exporter"; homepage = "https://github.com/czerwonk/atlas_exporter"; license = licenses.lgpl3; maintainers = with maintainers; [ clerie ]; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index dd0ea4ec5ec4..b3855f532e9a 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Exports Prometheus metrics about S3 buckets and objects"; + mainProgram = "s3_exporter"; homepage = "https://github.com/ribbybibby/s3_exporter"; license = licenses.asl20; maintainers = [ maintainers.mmahut ]; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 1ee84e5e703a..8b8516f7967f 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for bind9 server"; + mainProgram = "bind_exporter"; homepage = "https://github.com/digitalocean/bind_exporter"; license = licenses.asl20; maintainers = with maintainers; [ rtreffer ]; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index f61e400d860f..25a90e1fdb0a 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for the bird routing daemon"; + mainProgram = "bird_exporter"; homepage = "https://github.com/czerwonk/bird_exporter"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix index f2d50fe85014..4abd65235fab 100644 --- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix @@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Prometheus exporter for Bitcoin Core nodes"; + mainProgram = "bitcoind-monitor.py"; homepage = "https://github.com/jvstein/bitcoin-prometheus-exporter"; license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 8025cffca843..8c929353a820 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -31,6 +31,7 @@ buildGoModule rec { meta = with lib; { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; + mainProgram = "blackbox_exporter"; homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ globin fpletz willibutz Frostman ma27 ]; diff --git a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix index 6d15188aaebe..7abcfeb32887 100644 --- a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus Cloudflare Exporter"; + mainProgram = "cloudflare-exporter"; homepage = "https://github.com/lablabs/cloudflare-exporter"; license = licenses.asl20; maintainers = with maintainers; [ bbigras ]; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 1ff0ad38f47a..7997bacdb1bf 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; + mainProgram = "collectd_exporter"; homepage = "https://github.com/prometheus/collectd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index a365bda5202a..4cc241af7c65 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -23,6 +23,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for Consul metrics"; + mainProgram = "consul_exporter"; homepage = "https://github.com/prometheus/consul_exporter"; changelog = "https://github.com/prometheus/consul_exporter/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix index c995d4036ae0..7c4d2cfae06e 100644 --- a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix @@ -48,7 +48,7 @@ buildGoModule rec { vendorHash = "sha256-Fjvx15e/psxoqoS6c6GhiQfe7g2aI40EmPR26xLhrzg="; nativeBuildInputs = [ - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; # Tests try to interact with running DCGM service. diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 2b2c5354ca1c..3968f0b5c11c 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -53,6 +53,7 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Export Prometheus metrics from DMARC reports"; + mainProgram = "dmarc-metrics-exporter"; homepage = "https://github.com/jgosmann/dmarc-metrics-exporter"; changelog = "https://github.com/jgosmann/dmarc-metrics-exporter/blob/v${version}/CHANGELOG.rst"; license = lib.licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index f6af24264fe9..eb2297648b56 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; + mainProgram = "dnsmasq_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ]; }; diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index 5f5ce702cebc..26afdca834a3 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/caarlos0/domain_exporter"; description = "Exports the expiration time of your domains as prometheus metrics"; + mainProgram = "domain_exporter"; license = licenses.mit; maintainers = with maintainers; [ mmilata prusnak peterhoeg caarlos0 ]; }; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index ff7156360a9c..7041c9df29d4 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -20,6 +20,7 @@ buildGoPackage rec { meta = with lib; { inherit (src.meta) homepage; description = "Prometheus metrics exporter for Dovecot"; + mainProgram = "dovecot_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ]; }; diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix index 00b4690c5619..a451e46df2ab 100644 --- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "AIO Prometheus Exporter for Sonarr, Radarr or Lidarr"; + mainProgram = "exportarr"; homepage = "https://github.com/onedr0p/exportarr"; changelog = "https://github.com/onedr0p/exportarr/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/flow-exporter.nix b/pkgs/servers/monitoring/prometheus/flow-exporter.nix index 1b9f05dae3e2..e5fa4a7dcf83 100644 --- a/pkgs/servers/monitoring/prometheus/flow-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/flow-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Export network flows from kafka to Prometheus"; + mainProgram = "flow-exporter"; homepage = "https://github.com/neptune-networks/flow-exporter"; license = licenses.mit; maintainers = with maintainers; [ kloenk ]; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 99d306f9710d..d964f90cba44 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; + mainProgram = "exporter"; homepage = "https://github.com/mxschmitt/fritzbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp flokli sbruder ]; diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index ddcc080983df..8e86aa10b671 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights"; + mainProgram = "gitlab-ci-pipelines-exporter"; homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter"; license = licenses.asl20; maintainers = with maintainers; [ mmahut mvisonneau ]; diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix index 3c27d018d781..819a4c3947a1 100644 --- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "graphite-exporter"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "graphite_exporter"; rev = "v${version}"; - hash = "sha256-2u8grG5n0XkBS6zNxYrPyL+HP5/jEe/bXLt/1l759o4="; + hash = "sha256-KBqLPKd8XP7PbjHJu1DIQ2ir+Lyk7LEBaNjJCr91LP8="; }; - vendorHash = "sha256-wt2eDCNZAss3zSqvXeKTlsrPfj8pMXKWa3Yb33uuW0M="; + vendorHash = "sha256-he2bmcTNkuKRsNGkn1IkhtOe+Eo/5RLWLYlNFWLo/As="; preCheck = let skippedTests = [ diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index aa558bc8c9fd..6795885afd3d 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; + mainProgram = "haproxy_exporter"; homepage = "https://github.com/prometheus/haproxy_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/servers/monitoring/prometheus/idrac-exporter.nix b/pkgs/servers/monitoring/prometheus/idrac-exporter.nix index 3c1a0066be8a..1160984f0023 100644 --- a/pkgs/servers/monitoring/prometheus/idrac-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/idrac-exporter.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "Simple iDRAC exporter for Prometheus"; + mainProgram = "idrac_exporter"; license = licenses.mit; maintainers = with maintainers; [ codec ]; }; diff --git a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix index e603c2a8811d..bd06041d0209 100644 --- a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Export Prometheus-style metrics about how many emails you have in your INBOX and in additional configured folders"; + mainProgram = "imap-mailstat-exporter"; homepage = "https://github.com/bt909/imap-mailstat-exporter"; license = licenses.mit; maintainers = with maintainers; [ raboof ]; diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 07ef8febf3de..2690481b45f8 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter that accepts InfluxDB metrics"; + mainProgram = "influxdb_exporter"; homepage = "https://github.com/prometheus/influxdb_exporter"; changelog = "https://github.com/prometheus/influxdb_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index 1b1ac3c62420..ae39f6c98f74 100644 --- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "An IPMI exporter for Prometheus"; + mainProgram = "ipmi_exporter"; homepage = "https://github.com/prometheus-community/ipmi_exporter"; changelog = "https://github.com/prometheus-community/ipmi_exporter/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix index 5b90c26eed7e..13ce969b826c 100644 --- a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix @@ -16,6 +16,7 @@ buildGoModule rec { meta = with lib; { description = "Export Jitsi Videobridge metrics to Prometheus"; + mainProgram = "jitsiexporter"; homepage = "https://git.xsfx.dev/prometheus/jitsiexporter"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index cf180de54a70..532461234763 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/prometheus/jmx_exporter"; description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; + mainProgram = "jmx_prometheus_httpserver"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 2b50c7850702..37631a00c679 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Exporter for metrics from devices running JunOS"; + mainProgram = "junos_exporter"; homepage = "https://github.com/czerwonk/junos_exporter"; license = licenses.mit; maintainers = teams.wdz.members; diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index 572fed8a99d9..f4965bd54fa8 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -1,22 +1,28 @@ -{ lib, python3Packages, fetchPypi, nixosTests }: +{ lib +, python3Packages +, fetchPypi +, nixosTests +}: python3Packages.buildPythonApplication rec { pname = "kea-exporter"; - version = "0.5.1"; + version = "0.7.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; - hash = "sha256-rNGA5XEx9xVUP1SeDPgXcaqgDhgX6JFhRX9GM454P5A="; + pname = "kea_exporter"; + inherit version; + hash = "sha256-kn2iwYWcyW90tgfWmzLF7rU06fJyLRzqYKNLOgu/Yqk="; }; nativeBuildInputs = with python3Packages; [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = with python3Packages; [ click prometheus-client + requests ]; checkPhase = '' @@ -25,11 +31,13 @@ python3Packages.buildPythonApplication rec { ''; passthru.tests = { - inherit (nixosTests.prometheus-exporters) kea; + inherit (nixosTests) kea; }; meta = with lib; { + changelog = "https://github.com/mweinelt/kea-exporter/blob/v${version}/HISTORY"; description = "Export Kea Metrics in the Prometheus Exposition Format"; + mainProgram = "kea-exporter"; homepage = "https://github.com/mweinelt/kea-exporter"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index d2c816c7433a..59dcd621ca72 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/mdlayher/keylight_exporter"; description = "Prometheus exporter for Elgato Key Light devices"; + mainProgram = "keylight_exporter"; license = licenses.mit; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/pkgs/servers/monitoring/prometheus/kthxbye.nix b/pkgs/servers/monitoring/prometheus/kthxbye.nix index 897a58926d34..a0eb30f6819b 100644 --- a/pkgs/servers/monitoring/prometheus/kthxbye.nix +++ b/pkgs/servers/monitoring/prometheus/kthxbye.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus Alertmanager alert acknowledgement management daemon"; + mainProgram = "kthxbye"; homepage = "https://github.com/prymitive/kthxbye"; license = licenses.asl20; maintainers = with maintainers; [ nukaduka ]; diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index e66ab8852f1d..707d59b78bfa 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/lightninglabs/lndmon"; description = "Prometheus exporter for lnd (Lightning Network Daemon)"; + mainProgram = "lndmon"; license = licenses.mit; maintainers = with maintainers; [ mmilata ]; }; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index ae13becd0aed..851d297e760f 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -24,6 +24,7 @@ buildGoModule { meta = with lib; { description = "Export Prometheus-style metrics about mail server functionality"; + mainProgram = "mailexporter"; homepage = "https://github.com/cherti/mailexporter"; license = licenses.gpl3; maintainers = with maintainers; [ willibutz globin ]; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 431b029db9f3..5d335f504bb3 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "Prometheus MikroTik device(s) exporter"; + mainProgram = "mikrotik-exporter"; license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; }; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 93e9bca3283d..504611848ca9 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -27,6 +27,7 @@ buildGoPackage rec { meta = with lib; { description = "A Prometheus exporter for Minio cloud storage server"; + mainProgram = "minio-exporter"; homepage = "https://github.com/joe-pll/minio-exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp ]; diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index 271be41aee97..6975f2570435 100644 --- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/mdlayher/modemmanager_exporter"; description = "Prometheus exporter for ModemManager and its devices"; + mainProgram = "modemmanager_exporter"; license = licenses.mit; maintainers = with maintainers; [ mdlayher ]; }; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 2e2bead90b35..598b3220e4a3 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for MySQL server metrics"; + mainProgram = "mysqld_exporter"; homepage = "https://github.com/prometheus/mysqld_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley globin ]; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 11862b58e004..a233b34a18d9 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; + mainProgram = "nginx-prometheus-exporter"; homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz willibutz globin ]; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 8c8964ec093f..3883cdaff5cc 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Export metrics from Nginx access log files to Prometheus"; + mainProgram = "prometheus-nginxlog-exporter"; homepage = "https://github.com/martin-helmich/prometheus-nginxlog-exporter"; license = licenses.asl20; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 78d611cd3f92..bce3eaeaa408 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -38,6 +38,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for machine metrics"; + mainProgram = "node_exporter"; homepage = "https://github.com/prometheus/node_exporter"; changelog = "https://github.com/prometheus/node_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index 7b1ea2087bed..c9ec09a92172 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for Network UPS Tools"; + mainProgram = "nut_exporter"; homepage = "https://github.com/DRuggeri/nut_exporter"; license = licenses.asl20; maintainers = with maintainers; [ jhh ]; diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index 3d574d1bb93f..49181699d65a 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -24,6 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/tomcz/openldap_exporter"; description = "Simple service that scrapes metrics from OpenLDAP and exports them via HTTP for Prometheus consumption"; + mainProgram = "openldap_exporter"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix index 57f51e4997c5..ca62b415bfb9 100644 --- a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for PgBouncer"; + mainProgram = "pgbouncer_exporter"; homepage = "https://github.com/prometheus-community/pgbouncer_exporter"; license = licenses.mit; maintainers = with maintainers; [ _1000101 ]; diff --git a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix index e9ba97d1f3f7..12c80b39ff3b 100644 --- a/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/php-fpm-exporter.nix @@ -20,7 +20,7 @@ buildGoModule rec { hash = "sha256-ggrFnyEdGBoZVh4dHMw+7RUm8nJ1hJXo/fownO3wvzE="; }; - vendorHash = "sha256-OK36tHkBtosdfEWFPYMtlbzCkh5cF35NBWYyJrb9fwg= "; + vendorHash = "sha256-OK36tHkBtosdfEWFPYMtlbzCkh5cF35NBWYyJrb9fwg="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix index 2ceddeb8a4b2..a5dba8e43725 100644 --- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker"; + mainProgram = "pihole-exporter"; homepage = "https://github.com/eko/pihole-exporter"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/monitoring/prometheus/ping-exporter.nix b/pkgs/servers/monitoring/prometheus/ping-exporter.nix index becbde065af3..6abe6ed605bf 100644 --- a/pkgs/servers/monitoring/prometheus/ping-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ping-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for ICMP echo requests"; + mainProgram = "ping_exporter"; homepage = "https://github.com/czerwonk/ping_exporter"; license = licenses.mit; maintainers = with maintainers; [ nudelsalat ]; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 90439c9091fc..ad85dfb73318 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -36,6 +36,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "A Prometheus exporter for Postfix"; + mainProgram = "postfix_exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ]; }; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 62f041b285ba..130789ca4bd5 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { inherit (src.meta) homepage; description = "A Prometheus exporter for PostgreSQL"; + mainProgram = "postgres_exporter"; license = licenses.asl20; maintainers = with maintainers; [ fpletz globin willibutz ma27 ]; }; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index c197bf6366c3..a011dbb68b7e 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; + mainProgram = "prom2json"; homepage = "https://github.com/prometheus/prom2json"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index 821cab907850..9b1d070e18f4 100644 --- a/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -47,6 +47,7 @@ buildGoModule rec { meta = with lib; { description = "An open-source analytical platform for Prometheus metrics"; + mainProgram = "promscale"; homepage = "https://github.com/timescale/promscale"; changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index ea194bccffb3..0354cb258594 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -29,6 +29,7 @@ buildGoModule rec { meta = with lib; { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; + mainProgram = "pushgateway"; homepage = "https://github.com/prometheus/pushgateway"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index 82ca70bfef81..72009591e899 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Exposes information gathered from Proxmox VE cluster for use by the Prometheus monitoring system"; + mainProgram = "pve_exporter"; homepage = "https://github.com/prometheus-pve/prometheus-pve-exporter"; license = licenses.asl20; maintainers = with maintainers; [ nukaduka ]; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 213b2285c5e7..6c012111c4d1 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for RabbitMQ"; + mainProgram = "rabbitmq_exporter"; homepage = "https://github.com/kbudde/rabbitmq_exporter"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 177537588d63..d6cb49b2eaf8 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-M5Mv2gAQMR0j2zIX6OwePA9w7OtjJ0i2mR9I4BvUcXI="; + sha256 = "sha256-tZ09vQBFUWw2l6OYwT/bXhBEMOTSl5r/Hu732msPGkg="; }; vendorHash = "sha256-32EjLEPeFsihdG83ru4SSf03F2XJGD8+tbO9ANaI1hs="; @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for Redis metrics"; + mainProgram = "redis_exporter"; homepage = "https://github.com/oliver006/redis_exporter"; license = licenses.mit; maintainers = with maintainers; [ eskytthe srhb ma27 ]; diff --git a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix b/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix index 40cde1c15a6f..7319f8e2a7f4 100644 --- a/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus time-series DB exporter for rtl_433 433MHz radio packet decoder"; + mainProgram = "rtl_433_prometheus"; homepage = "https://github.com/mhansen/rtl_433_prometheus"; license = licenses.mit; maintainers = with maintainers; [ zopieux ]; diff --git a/pkgs/servers/monitoring/prometheus/sachet.nix b/pkgs/servers/monitoring/prometheus/sachet.nix index 20dda305543c..977e5d906074 100644 --- a/pkgs/servers/monitoring/prometheus/sachet.nix +++ b/pkgs/servers/monitoring/prometheus/sachet.nix @@ -18,6 +18,7 @@ buildGoModule rec { meta = with lib; { description = "An SMS alerting tool for Prometheus's Alertmanager"; + mainProgram = "sachet"; homepage = "https://github.com/messagebird/sachet"; license = licenses.bsd2; maintainers = with maintainers; [ govanify ]; diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix index 5af5a5488d86..dae56703ebd6 100644 --- a/pkgs/servers/monitoring/prometheus/script-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Shell script prometheus exporter"; + mainProgram = "script_exporter"; homepage = "https://github.com/adhocteam/script_exporter"; license = licenses.mit; maintainers = with maintainers; [ Flakebi ]; diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix index 106e76b62460..8dde552e665e 100644 --- a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix @@ -17,6 +17,7 @@ buildGoModule rec { meta = with lib; { description = "Shelly humidity sensor exporter for prometheus"; + mainProgram = "shelly_exporter"; homepage = "https://github.com/aexel90/shelly_exporter"; license = licenses.asl20; maintainers = with maintainers; [drupol]; diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix index 2e916367c924..b03a006982ec 100644 --- a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "smartctl_exporter"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oUdMsUAlN/4uRSzxQrO0TOVRgyEdxYkGtf3VoNbxdhw="; + hash = "sha256-QQoWAsnE/7ifvgEfQJ6cbzmwOrE7oe2zalTbu/P7r18="; }; - vendorHash = "sha256-0WLI+nLhRkf1CGhSer1Jkv1nUho5sxIbTE/Mf5JmX7U="; + vendorHash = "sha256-WUB2FgBl4Tybz7T0yvcSYIlG75NEhXpn1F0yuB9F21g="; ldflags = [ "-X github.com/prometheus/common/version.Version=${version}" @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Export smartctl statistics for Prometheus"; + mainProgram = "smartctl_exporter"; homepage = "https://github.com/prometheus-community/smartctl_exporter"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index 0f4e21defc04..38e124a60181 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "smokeping_prober"; - version = "0.7.2"; + version = "0.7.3"; ldflags = let setVars = rec { @@ -20,7 +20,7 @@ buildGoModule rec { owner = "SuperQ"; repo = "smokeping_prober"; rev = "v${version}"; - sha256 = "sha256-Z+K3cRMD885V9aJwu3N/vP6aqtzD3LfMrxJ8DSCa5Xo="; + sha256 = "sha256-MP8AJ8XnIp/+9s7qeAGRHv2OtLL5zrjEhuzZ36V/GrY="; }; vendorHash = "sha256-39/0reEt4Rfe7DfysS4BROUgBUg+x95z6DU3IjC6m5U="; @@ -30,6 +30,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for sending continual ICMP/UDP pings"; + mainProgram = "smokeping_prober"; homepage = "https://github.com/SuperQ/smokeping_prober"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index b88534cb5ac7..bab564702c17 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cp8+vVGyAwYcrBiEN1SmUnHqWFGtuypvzfDROJgOn28="; + sha256 = "sha256-ADfJxo9/CcWi9LgX31a7GYAdigFYRbkFy4PYzecG50Y="; }; vendorHash = null; @@ -30,6 +30,7 @@ buildGoModule rec { meta = with lib; { description = "Flexible SQL exporter for Prometheus"; + mainProgram = "sql_exporter"; homepage = "https://github.com/justwatchcom/sql_exporter"; license = licenses.mit; maintainers = with maintainers; [ justinas ]; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 201ec3a32e36..4c13824f44aa 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "statsd_exporter"; rev = "v${version}"; - hash = "sha256-C7+4v40T667KJHEQ3ebLDg2wJNrxD/nossfT6rMlER8="; + hash = "sha256-hKwbC56Z6tMolLnYB5G7iSLZoM+cWCh5lPzWiFkOd6E="; }; ldflags = @@ -26,10 +26,11 @@ buildGoModule rec { "-X ${t}.BuildDate=unknown" ]; - vendorHash = "sha256-scBpRZeECgAtpu9lnkIk1I2c8UmAkEL8LYNPUeUNYto="; + vendorHash = "sha256-UcdRcHZUJ3XHZNqYXSboaor5WRVPYfilEvRWZjA1YNc="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; + mainProgram = "statsd_exporter"; homepage = "https://github.com/prometheus/statsd_exporter"; changelog = "https://github.com/prometheus/statsd_exporter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 39e475df1974..d3365fc92bf4 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -17,6 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "Arris Surfboard signal metrics exporter"; + mainProgram = "surfboard_exporter"; homepage = "https://github.com/ipstatic/surfboard_exporter"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index 7abe243d3036..5448aeb52d59 100644 --- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -27,6 +27,7 @@ buildGoModule rec { meta = with lib; { description = "Exporter for systemd unit metrics"; + mainProgram = "systemd_exporter"; homepage = "https://github.com/prometheus-community/systemd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ chkno ]; diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index fcfe87806eb9..3b54e23f81ae 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Prometheus exporter that exposes metrics from a Tor daemon"; + mainProgram = "prometheus-tor-exporter"; homepage = "https://github.com/atx/prometheus-tor_exporter"; license = licenses.mit; maintainers = with maintainers; [ delroth ]; diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index e683ca72b9e5..5237abe6148a 100644 --- a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -27,6 +27,7 @@ buildGoModule { meta = with lib; { changelog = "https://github.com/letsencrypt/unbound_exporter/releases/tag/v${version}"; description = "Prometheus exporter for Unbound DNS resolver"; + mainProgram = "unbound_exporter"; homepage = "https://github.com/letsencrypt/unbound_exporter/tree/main"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix index 51bf3d8ccac6..0cb3dc77162b 100644 --- a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix @@ -15,6 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Prometheus exporter for V2Ray daemon"; + mainProgram = "v2ray-exporter"; homepage = "https://github.com/wi1dcard/v2ray-exporter"; license = licenses.mit; maintainers = with maintainers; [ jqqqqqqqqqq ]; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index aa86f0642409..ff3a301d3340 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -25,6 +25,7 @@ buildGoModule rec { meta = { homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; description = "Varnish exporter for Prometheus"; + mainProgram = "prometheus_varnish_exporter"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude ]; }; diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index da6013b9b5ec..16897e894f69 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "XMPP Web hook for Prometheus"; + mainProgram = "prometheus-xmpp-alerts"; homepage = "https://github.com/jelmer/prometheus-xmpp-alerts"; maintainers = with lib.maintainers; [ fpletz ]; license = with lib.licenses; [ asl20 ]; diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index d229daa14b81..4488b85dd10b 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "ZFS Exporter for the Prometheus monitoring system"; + mainProgram = "zfs_exporter"; homepage = "https://github.com/pdf/zfs_exporter"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index e55630a36335..f539fd6394e9 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://riemann.io/"; description = "A network monitoring system"; + mainProgram = "riemann"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 3ae3a990d069..a4752a26fb40 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An alerting dashboard for Graphite"; + mainProgram = "seyren"; homepage = "https://github.com/scobal/seyren"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 4d21ef645a70..96e9c86cf74f 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -38,6 +38,7 @@ buildGoModule rec { meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics"; + mainProgram = "telegraf"; homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; changelog = "https://github.com/influxdata/telegraf/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 952f3190546d..c2e0f6c9f7ed 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.9.5"; + version = "2.10.0"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-hNDRzQGTS3sAdt/0ZdJV5zRpSdrBHGLDZJ62X+kFg7M="; + hash = "sha256-aJbK1Fhlfm0CrI1O7sWh1xjk+OR8gLa1goSnQ4wfrI0="; }; - vendorHash = "sha256-+fXNfDGzZy43WjQrvK2enOWtSv2qN3Zo+O+9Bn+KO1s="; + vendorHash = "sha256-iOfjjRjN07iD+B7GjWKbmQu/xNm5wjFQOTA4jBxMh/E="; ldflags = [ "-w" "-s" diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 7b82a205b264..e6df980b77ef 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -37,6 +37,7 @@ buildNpmPackage rec { meta = with lib; { description = "A fancy self-hosted monitoring tool"; + mainProgram = "uptime-kuma-server"; homepage = "https://github.com/louislam/uptime-kuma"; changelog = "https://github.com/louislam/uptime-kuma/releases/tag/${version}"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index 74b2a2de096d..7c979f009cd7 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/app/vmagent"; description = "VictoriaMetrics metrics scraper"; + mainProgram = "vmagent"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ nullx76 ]; |