mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-12 05:16:25 +03:00
Merge pull request #42134 from tazjin/feat/journaldriver
Add package & NixOS module for journaldriver
This commit is contained in:
commit
cac9f08810
3 changed files with 139 additions and 0 deletions
112
nixos/modules/services/logging/journaldriver.nix
Normal file
112
nixos/modules/services/logging/journaldriver.nix
Normal file
|
@ -0,0 +1,112 @@
|
||||||
|
# This module implements a systemd service for running journaldriver,
|
||||||
|
# a log forwarding agent that sends logs from journald to Stackdriver
|
||||||
|
# Logging.
|
||||||
|
#
|
||||||
|
# It can be enabled without extra configuration when running on GCP.
|
||||||
|
# On machines hosted elsewhere, the other configuration options need
|
||||||
|
# to be set.
|
||||||
|
#
|
||||||
|
# For further information please consult the documentation in the
|
||||||
|
# upstream repository at: https://github.com/aprilabank/journaldriver/
|
||||||
|
|
||||||
|
{ config, lib, pkgs, ...}:
|
||||||
|
|
||||||
|
with lib; let cfg = config.services.journaldriver;
|
||||||
|
in {
|
||||||
|
options.services.journaldriver = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Whether to enable journaldriver to forward journald logs to
|
||||||
|
Stackdriver Logging.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
logLevel = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "info";
|
||||||
|
description = ''
|
||||||
|
Log level at which journaldriver logs its own output.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
logName = mkOption {
|
||||||
|
type = with types; nullOr str;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
Configures the name of the target log in Stackdriver Logging.
|
||||||
|
This option can be set to, for example, the hostname of a
|
||||||
|
machine to improve the user experience in the logging
|
||||||
|
overview.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
googleCloudProject = mkOption {
|
||||||
|
type = with types; nullOr str;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
Configures the name of the Google Cloud project to which to
|
||||||
|
forward journald logs.
|
||||||
|
|
||||||
|
This option is required on non-GCP machines, but should not be
|
||||||
|
set on GCP instances.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
logStream = mkOption {
|
||||||
|
type = with types; nullOr str;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
Configures the name of the Stackdriver Logging log stream into
|
||||||
|
which to write journald entries.
|
||||||
|
|
||||||
|
This option is required on non-GCP machines, but should not be
|
||||||
|
set on GCP instances.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
applicationCredentials = mkOption {
|
||||||
|
type = with types; nullOr path;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
Path to the service account private key (in JSON-format) used
|
||||||
|
to forward log entries to Stackdriver Logging on non-GCP
|
||||||
|
instances.
|
||||||
|
|
||||||
|
This option is required on non-GCP machines, but should not be
|
||||||
|
set on GCP instances.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
systemd.services.journaldriver = {
|
||||||
|
description = "Stackdriver Logging journal forwarder";
|
||||||
|
script = "${pkgs.journaldriver}/bin/journaldriver";
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Restart = "always";
|
||||||
|
DynamicUser = true;
|
||||||
|
|
||||||
|
# This directive lets systemd automatically configure
|
||||||
|
# permissions on /var/lib/journaldriver, the directory in
|
||||||
|
# which journaldriver persists its cursor state.
|
||||||
|
StateDirectory = "journaldriver";
|
||||||
|
|
||||||
|
# This group is required for accessing journald.
|
||||||
|
SupplementaryGroups = "systemd-journal";
|
||||||
|
};
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
RUST_LOG = cfg.logLevel;
|
||||||
|
LOG_NAME = cfg.logName;
|
||||||
|
LOG_STREAM = cfg.logStream;
|
||||||
|
GOOGLE_CLOUD_PROJECT = cfg.googleCloudProject;
|
||||||
|
GOOGLE_APPLICATION_CREDENTIALS = cfg.applicationCredentials;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
25
pkgs/tools/misc/journaldriver/default.nix
Normal file
25
pkgs/tools/misc/journaldriver/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
name = "journaldriver-${version}";
|
||||||
|
version = "1.0.0";
|
||||||
|
cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "aprilabank";
|
||||||
|
repo = "journaldriver";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ openssl systemd ];
|
||||||
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Log forwarder from journald to Stackdriver Logging";
|
||||||
|
homepage = "https://github.com/aprilabank/journaldriver";
|
||||||
|
license = licenses.gpl3;
|
||||||
|
maintainers = [ maintainers.tazjin ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -3237,6 +3237,8 @@ with pkgs;
|
||||||
|
|
||||||
journalbeat = callPackage ../tools/system/journalbeat { };
|
journalbeat = callPackage ../tools/system/journalbeat { };
|
||||||
|
|
||||||
|
journaldriver = callPackage ../tools/misc/journaldriver { };
|
||||||
|
|
||||||
jp = callPackage ../development/tools/jp { };
|
jp = callPackage ../development/tools/jp { };
|
||||||
|
|
||||||
jp2a = callPackage ../applications/misc/jp2a { };
|
jp2a = callPackage ../applications/misc/jp2a { };
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue