packages/grafana: 8.5.6 -> 9.0.0
This commit is contained in:
parent
6458dd76ef
commit
4ab8e32e94
3 changed files with 89 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ config, hosts, lib, tools, ... }:
|
{ config, hosts, inputs, lib, pkgs, tools, ... }:
|
||||||
let
|
let
|
||||||
inherit (tools.meta) domain;
|
inherit (tools.meta) domain;
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ in
|
||||||
};
|
};
|
||||||
services.grafana = {
|
services.grafana = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = inputs.self.packages.${pkgs.system}.grafana;
|
||||||
inherit (links.grafana) port;
|
inherit (links.grafana) port;
|
||||||
rootUrl = "https://monitoring.${domain}/";
|
rootUrl = "https://monitoring.${domain}/";
|
||||||
dataDir = "/srv/storage/private/grafana";
|
dataDir = "/srv/storage/private/grafana";
|
||||||
|
|
85
packages/monitoring/grafana/default.nix
Normal file
85
packages/monitoring/grafana/default.nix
Normal file
|
@ -0,0 +1,85 @@
|
||||||
|
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:
|
||||||
|
|
||||||
|
buildGoModule rec {
|
||||||
|
pname = "grafana";
|
||||||
|
version = "9.0.0";
|
||||||
|
|
||||||
|
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
rev = "v${version}";
|
||||||
|
owner = "grafana";
|
||||||
|
repo = "grafana";
|
||||||
|
sha256 = "sha256-vPPaOepx4uwOWOjeE+dWULxmJPk5To9UY3rnoEqeAJA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
srcStatic = fetchurl {
|
||||||
|
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||||
|
sha256 = "0xl5z31mkgbwkwcpvr0v0hmc0ynvxjn39w4sb1vc572kjbwqpvkr";
|
||||||
|
};
|
||||||
|
|
||||||
|
vendorSha256 = "sha256-E3uSwdgoPgQPQ/uCIuTxcYeNRYbQR7q7SrUrh/ypENk=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ wire ];
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
# 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
|
||||||
|
|
||||||
|
go generate ./pkg/framework/coremodel
|
||||||
|
go generate ./public/app/plugins
|
||||||
|
|
||||||
|
# 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"
|
||||||
|
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();/}'\
|
||||||
|
pkg/services/libraryelements/libraryelements_patch_test.go
|
||||||
|
|
||||||
|
|
||||||
|
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
|
||||||
|
rm -r scripts/go
|
||||||
|
'';
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s" "-w" "-X main.version=${version}"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Tests start http servers which need to bind to local addresses:
|
||||||
|
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted
|
||||||
|
__darwinAllowLocalNetworking = true;
|
||||||
|
|
||||||
|
# On Darwin, files under /usr/share/zoneinfo exist, but fail to open in sandbox:
|
||||||
|
# TestValueAsTimezone: date_formats_test.go:33: Invalid has err for input "Europe/Amsterdam": operation not permitted
|
||||||
|
preCheck = ''
|
||||||
|
export ZONEINFO=${tzdata}/share/zoneinfo
|
||||||
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
tar -xvf $srcStatic
|
||||||
|
mkdir -p $out/share/grafana
|
||||||
|
mv grafana-*/{public,conf,tools} $out/share/grafana/
|
||||||
|
|
||||||
|
cp ./conf/defaults.ini $out/share/grafana/conf/
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
tests = { inherit (nixosTests) grafana; };
|
||||||
|
updateScript = ./update.sh;
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
|
||||||
|
license = licenses.agpl3;
|
||||||
|
homepage = "https://grafana.com";
|
||||||
|
maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ];
|
||||||
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
|
mainProgram = "grafana-server";
|
||||||
|
};
|
||||||
|
}
|
|
@ -42,6 +42,8 @@ in
|
||||||
in
|
in
|
||||||
uptime-kuma;
|
uptime-kuma;
|
||||||
|
|
||||||
|
grafana = pkgs.callPackage ./monitoring/grafana { };
|
||||||
|
|
||||||
hyprspace = pkgs.callPackage ./networking/hyprspace { iproute2mac = null; };
|
hyprspace = pkgs.callPackage ./networking/hyprspace { iproute2mac = null; };
|
||||||
|
|
||||||
ipfs = pkgs.callPackage ./networking/ipfs { };
|
ipfs = pkgs.callPackage ./networking/ipfs { };
|
||||||
|
|
Loading…
Reference in a new issue