Merge pull request #31039 from LumiGuide/fix-graphite-api
graphite: fix the graphiteApi service
This commit is contained in:
commit
2d583f7275
|
@ -22,8 +22,8 @@ let
|
||||||
);
|
);
|
||||||
|
|
||||||
graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
|
graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
|
||||||
time_zone: ${config.time.timeZone}
|
|
||||||
search_index: ${dataDir}/index
|
search_index: ${dataDir}/index
|
||||||
|
${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''}
|
||||||
${optionalString (cfg.api.finders != []) ''finders:''}
|
${optionalString (cfg.api.finders != []) ''finders:''}
|
||||||
${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders}
|
${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders}
|
||||||
${optionalString (cfg.api.functions != []) ''functions:''}
|
${optionalString (cfg.api.functions != []) ''functions:''}
|
||||||
|
@ -536,7 +536,7 @@ in {
|
||||||
environment = {
|
environment = {
|
||||||
PYTHONPATH = let
|
PYTHONPATH = let
|
||||||
aenv = pkgs.python.buildEnv.override {
|
aenv = pkgs.python.buildEnv.override {
|
||||||
extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders;
|
extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders;
|
||||||
};
|
};
|
||||||
in "${aenv}/${pkgs.python.sitePackages}";
|
in "${aenv}/${pkgs.python.sitePackages}";
|
||||||
GRAPHITE_API_CONFIG = graphiteApiConfig;
|
GRAPHITE_API_CONFIG = graphiteApiConfig;
|
||||||
|
|
|
@ -4,22 +4,28 @@ import ./make-test.nix ({ pkgs, ...} :
|
||||||
nodes = {
|
nodes = {
|
||||||
one =
|
one =
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
|
time.timeZone = "UTC";
|
||||||
services.graphite = {
|
services.graphite = {
|
||||||
web = {
|
web.enable = true;
|
||||||
|
api = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
port = 8082;
|
||||||
};
|
};
|
||||||
carbon = {
|
carbon.enableCache = true;
|
||||||
enableCache = true;
|
seyren.enable = true;
|
||||||
};
|
pager.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
startAll;
|
startAll;
|
||||||
$one->waitForUnit("default.target");
|
$one->waitForUnit("default.target");
|
||||||
$one->requireActiveUnit("graphiteWeb.service");
|
$one->requireActiveUnit("graphiteWeb.service");
|
||||||
|
$one->requireActiveUnit("graphiteApi.service");
|
||||||
|
$one->requireActiveUnit("graphitePager.service");
|
||||||
$one->requireActiveUnit("carbonCache.service");
|
$one->requireActiveUnit("carbonCache.service");
|
||||||
|
$one->requireActiveUnit("seyren.service");
|
||||||
$one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
|
$one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
|
||||||
$one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
|
$one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue