summary refs log tree commit diff
path: root/nixos/modules/services/logging
diff options
context:
space:
mode:
authorpennae <github@quasiparticle.net>2021-11-25 21:58:45 +0100
committerpennae <github@quasiparticle.net>2021-12-08 21:41:18 +0100
commit70b105d1d062369c7489b0045df5a8b86bac5dd6 (patch)
tree56cf700aaa42f9a833590e6aa657c71bf1d7333f /nixos/modules/services/logging
parent6d80d3c964e7863a42ed3ce95b4917801ed7e7ea (diff)
downloadnixpkgs-70b105d1d062369c7489b0045df5a8b86bac5dd6.tar
nixpkgs-70b105d1d062369c7489b0045df5a8b86bac5dd6.tar.gz
nixpkgs-70b105d1d062369c7489b0045df5a8b86bac5dd6.tar.bz2
nixpkgs-70b105d1d062369c7489b0045df5a8b86bac5dd6.tar.lz
nixpkgs-70b105d1d062369c7489b0045df5a8b86bac5dd6.tar.xz
nixpkgs-70b105d1d062369c7489b0045df5a8b86bac5dd6.tar.zst
nixpkgs-70b105d1d062369c7489b0045df5a8b86bac5dd6.zip
nixos/journalbeat: remove support for versions < 6
nixos no longer ships journalbeat 5 and hasn't since at least 20.09. remove
checks for older versions from the module.
Diffstat (limited to 'nixos/modules/services/logging')
-rw-r--r--nixos/modules/services/logging/journalbeat.nix16
1 files changed, 1 insertions, 15 deletions
diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixos/modules/services/logging/journalbeat.nix
index 2d98598c1be..1a6473aed08 100644
--- a/nixos/modules/services/logging/journalbeat.nix
+++ b/nixos/modules/services/logging/journalbeat.nix
@@ -5,14 +5,10 @@ with lib;
 let
   cfg = config.services.journalbeat;
 
-  lt6 = builtins.compareVersions cfg.package.version "6" < 0;
-
   journalbeatYml = pkgs.writeText "journalbeat.yml" ''
     name: ${cfg.name}
     tags: ${builtins.toJSON cfg.tags}
 
-    ${optionalString lt6 "journalbeat.cursor_state_file: /var/lib/${cfg.stateDir}/cursor-state"}
-
     ${cfg.extraConfig}
   '';
 
@@ -58,17 +54,7 @@ in
 
       extraConfig = mkOption {
         type = types.lines;
-        default = optionalString lt6 ''
-          journalbeat:
-            seek_position: cursor
-            cursor_seek_fallback: tail
-            write_cursor_state: true
-            cursor_flush_period: 5s
-            clean_field_names: true
-            convert_to_numbers: false
-            move_metadata_to_field: journal
-            default_type: journal
-        '';
+        default = "";
         description = "Any other configuration options you want to add";
       };