diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-12-02 17:24:19 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2021-12-02 17:24:19 +0100 |
commit | 05f3d0b58761f37e26ad4a813536e4467c5130c9 (patch) | |
tree | 8fa88a11dab8ae49c272f1f6a8243ff71d8d39ba /pkgs/servers/monitoring | |
parent | 43ed12450ef5f6d6388ad5164a9f874a5e3b2f62 (diff) | |
download | nixpkgs-05f3d0b58761f37e26ad4a813536e4467c5130c9.tar nixpkgs-05f3d0b58761f37e26ad4a813536e4467c5130c9.tar.gz nixpkgs-05f3d0b58761f37e26ad4a813536e4467c5130c9.tar.bz2 nixpkgs-05f3d0b58761f37e26ad4a813536e4467c5130c9.tar.lz nixpkgs-05f3d0b58761f37e26ad4a813536e4467c5130c9.tar.xz nixpkgs-05f3d0b58761f37e26ad4a813536e4467c5130c9.tar.zst nixpkgs-05f3d0b58761f37e26ad4a813536e4467c5130c9.zip |
grafana: 8.2.5 -> 8.3.0
ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.0
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 802948474bc..97c92fe0ec3 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGo117Module rec { pname = "grafana"; - version = "8.2.5"; + version = "8.3.0"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGo117Module rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-Bi4z8HqKUeVOxbkKXazNIzFBFy7lW0T27ROVC6enrZE="; + sha256 = "sha256-I+jfWHkTm11qIm6CdDFOFHs/qR9pswbjAdfejkxZnrQ="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-ngQA8580rvH3C04TfuIsdiStbvk7/HRDDtS04gR92M4="; + sha256 = "sha256-o8uw9VRuK93IbZgcZmFmZ2zbgKdryGbeaPAlQr8wJXw="; }; - vendorSha256 = "sha256-adWWL2shdsp1hGxhYvxBbr1YFM89Ym1J0kBNGUrj6vc="; + vendorSha256 = "sha256-aS9yz0JODZtichaIkiBJLiMjbjGY93eSYwuactbRqOY="; nativeBuildInputs = [ wire ]; @@ -26,19 +26,14 @@ buildGo117Module rec { # Generate DI code that's required to compile the package. # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 wire gen -tags oss ./pkg/server + wire gen -tags oss ./pkg/cmd/grafana-cli/runner # The testcase makes an API call against grafana.com: # - # --- Expected - # +++ Actual - # @@ -1,4 +1,4 @@ - # (map[string]interface {}) (len=2) { - # - (string) (len=5) "error": (string) (len=16) "plugin not found", - # - (string) (len=7) "message": (string) (len=16) "Plugin not found" - # + (string) (len=5) "error": (string) (len=171) "Failed to send request: Get \"https://grafana.com/api/plugins/repo/test\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:48019->[::1]:53: read: connection refused", - # + (string) (len=7) "message": (string) (len=24) "Failed to install plugin" - # } - sed -i -e '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go + # [...] + # 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" + sed -i -e '/Request is not forbidden if from an admin/a t.Skip();' pkg/tests/api/plugins/api_plugins_test.go # Skip a flaky test (https://github.com/NixOS/nixpkgs/pull/126928#issuecomment-861424128) sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\ |