public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grafana: 2.6.0 -> 3.0.1 (#15395)

Browse Source 
* grafana: 2.6.0 -> 3.0.1

* grafana module: Fix anonymous auth & add analytics config
This commit is contained in:
Franz Pletz 2016-05-13 02:28:24 +02:00
parent f67b8f8e64
commit df8958435e
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/monitoring/grafana.nix
View File

@ -36,7 +36,9 @@ let
USERS_AUTO_ASSIGN_ORG = b2s cfg.users.autoAssignOrg; USERS_AUTO_ASSIGN_ORG = b2s cfg.users.autoAssignOrg;
USERS_AUTO_ASSIGN_ORG_ROLE = cfg.users.autoAssignOrgRole; USERS_AUTO_ASSIGN_ORG_ROLE = cfg.users.autoAssignOrgRole;
AUTH_ANONYMOUS_ENABLE = b2s cfg.auth.anonymous.enable; AUTH_ANONYMOUS_ENABLED = b2s cfg.auth.anonymous.enable;
ANALYTICS_REPORTING_ENABLED = b2s cfg.analytics.reporting.enable;
} // cfg.extraOptions; } // cfg.extraOptions;
in { in {
@ -196,6 +198,14 @@ in {
}; };
}; };
analytics.reporting = {
enable = mkOption {
description = "Whether to allow anonymous usage reporting to stats.grafana.net";
default = true;
type = types.bool;
};
};
extraOptions = mkOption { extraOptions = mkOption {
description = '' description = ''
Extra configuration options passed as env variables as specified in Extra configuration options passed as env variables as specified in
@ -218,7 +228,7 @@ in {
after = ["networking.target"]; after = ["networking.target"];
environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; environment = mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/bin/grafana -homepath ${cfg.dataDir}"; ExecStart = "${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}";
WorkingDirectory = cfg.dataDir; WorkingDirectory = cfg.dataDir;
User = "grafana"; User = "grafana";
}; };

11
pkgs/servers/monitoring/grafana/default.nix
View File

@ -1,21 +1,20 @@
{ lib, goPackages, fetchurl, fetchFromGitHub }: { lib, goPackages, fetchurl, fetchFromGitHub }:
goPackages.buildGoPackage rec { goPackages.buildGoPackage rec {
version = "2.6.0"; version = "3.0.1";
name = "grafana-v${version}"; name = "grafana-v${version}";
goPackagePath = "github.com/grafana/grafana"; goPackagePath = "github.com/grafana/grafana";
subPackages = [ "./" ];
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "grafana"; repo = "grafana";
sha256 = "160jarvmfvrzpk8agbl44761qz4rw273d59jg6kzd0ghls03wipr"; sha256 = "1zykgf8xq7m040d4yljcbz23gh8ppaqnxj50ncj1cjyi5k88i3i9";
}; };
srcStatic = fetchurl { srcStatic = fetchurl {
url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}.linux-x64.tar.gz"; url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-.linux-x64.tar.gz";
sha256 = "1i4aw5jvamgqfaanxlh3l83sn8xx10wpihciihvf7s3846s623ab"; sha256 = "14wq2cbf4djnwbbyfbhnwmwqpfh5g4yp1dckg5zzf2109ymkjrqd";
}; };
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
@ -29,7 +28,7 @@ goPackages.buildGoPackage rec {
description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
license = licenses.asl20; license = licenses.asl20;
homepage = http://grafana.org/; homepage = http://grafana.org/;
maintainers = with maintainers; [ offline ]; maintainers = with maintainers; [ offline fpletz ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }