Skip to content

Commit 75c8332

Browse files
committed
bump: iohkNix for cardano-tracer env cfgs; adjust nixos svc default to new tracing
1 parent 11e9d72 commit 75c8332

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@
219219
})
220220
.workbench-profile-run;
221221
in {
222-
223222
"dockerImage/node" = pkgs.dockerImage;
224223
"dockerImage/submit-api" = pkgs.submitApiDockerImage;
225224
"dockerImage/tracer" = pkgs.tracerDockerImage;
@@ -486,7 +485,7 @@
486485
lib,
487486
...
488487
}: {
489-
imports = [ ./nix/nixos/cardano-tracer-service.nix ];
488+
imports = [./nix/nixos/cardano-tracer-service.nix];
490489
services.cardano-tracer.cardanoNodePackages = lib.mkDefault (mkCardanoNodePackages flake.project.${pkgs.system});
491490
};
492491
};

nix/docker/submit-api.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ let
8282
exec ${pkgs.${exe}}/bin/${exe} $@
8383
${clusterStatements}
8484
else
85-
echo "Managed configuration for network "$NETWORK" does not exist"
85+
echo "[Error] Managed configuration for network "$NETWORK" does not exist"
8686
fi
8787
'';
8888

nix/nixos/cardano-node-service.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ in {
583583

584584
useLegacyTracing = mkOption {
585585
type = bool;
586-
default = true;
586+
default = false;
587587
description = ''
588588
Use the legacy tracing, based on iohk-monitoring-framework.
589589
'';

nix/nixos/cardano-tracer-service.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ in {
519519
type = bool;
520520
default = true;
521521
description = ''
522-
Whether to enable a prometheus export of EKG metrics.
522+
Whether to enable a prometheus export of metrics.
523523
'';
524524
};
525525

nix/pkgs.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,16 @@ in with final;
132132

133133
tracerDockerImage =
134134
let
135-
defaultConfig = {
136-
# Can we easily modify to the connecting socket scenario now?
137-
# Probably need environment overrides for both node and tracer images.
135+
defaultConfig = rec {
138136
acceptingSocket = "/ipc/cardano-tracer.socket";
139137
stateDir = "/logs";
138+
logging = [
139+
{
140+
logRoot = stateDir;
141+
logMode = "FileMode";
142+
logFormat = "ForHuman";
143+
}
144+
];
140145
};
141146
in
142147
callPackage ./docker/tracer.nix {

0 commit comments

Comments
 (0)