commit 145cc7ff23c13c272eb9d3d2cdc4c86dd7b1e36b · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       480
       480
        
           imports = [ ./firefox.nix ];

     

       481
       481
        
           _module.args.firefoxPackage = pkgs.floorp;

     

       482
       482
        
         };

     

       483
       483
       -
         fluent-bit = handleTest ./fluent-bit.nix { };

     

       483
       483
       +
         fluent-bit = runTest ./fluent-bit.nix;

     

       484
       484
        
         fluentd = handleTest ./fluentd.nix { };

     

       485
       485
        
         fluidd = handleTest ./fluidd.nix { };

     

       486
       486
        
         fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix { };

+49 -56

nixos/tests/fluent-bit.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { lib, pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "fluent-bit";

     

       5
       5
       -
       

     

       6
       6
       -
           nodes.machine =

     

       7
       7
       -
             { config, pkgs, ... }:

     

       8
       8
       -
             {

     

       9
       9
       -
               services.fluent-bit = {

     

       10
       10
       -
                 enable = true;

     

       11
       11
       -
                 settings = {

     

       12
       12
       -
                   pipeline = {

     

       13
       13
       -
                     inputs = [

     

       14
       14
       -
                       {

     

       15
       15
       -
                         name = "systemd";

     

       16
       16
       -
                         systemd_filter = "_SYSTEMD_UNIT=fluent-bit-regression-395128.service";

     

       17
       17
       -
                       }

     

       18
       18
       -
                     ];

     

       19
       19
       -
                     outputs = [

     

       20
       20
       -
                       {

     

       21
       21
       -
                         name = "file";

     

       22
       22
       -
                         path = "/var/log/fluent-bit";

     

       23
       23
       -
                         file = "fluent-bit.out";

     

       24
       24
       -
                       }

     

       25
       25
       -
                     ];

     

       26
       26
       -
                   };

     

       27
       27
       -
                 };

     

       1
       1
       +
       # Regression test for https://github.com/NixOS/nixpkgs/pull/395128

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "fluent-bit";

     

       4
       4
       +
         nodes.machine = {

     

       5
       5
       +
           services.fluent-bit = {

     

       6
       6
       +
             enable = true;

     

       7
       7
       +
             settings = {

     

       8
       8
       +
               pipeline = {

     

       9
       9
       +
                 inputs = [

     

       10
       10
       +
                   {

     

       11
       11
       +
                     name = "systemd";

     

       12
       12
       +
                     systemd_filter = "_SYSTEMD_UNIT=fluent-bit-regression-395128.service";

     

       13
       13
       +
                   }

     

       14
       14
       +
                 ];

     

       15
       15
       +
                 outputs = [

     

       16
       16
       +
                   {

     

       17
       17
       +
                     name = "file";

     

       18
       18
       +
                     path = "/var/log/fluent-bit";

     

       19
       19
       +
                     file = "fluent-bit.out";

     

       20
       20
       +
                   }

     

       21
       21
       +
                 ];

     

       28
       22
        
               };

     

       23
       23
       +
             };

     

       24
       24
       +
           };

     

       25
       25
       +
           systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit";

     

       29
       26
        
       

     

       30
       30
       -
               systemd.services.fluent-bit.serviceConfig.LogsDirectory = "fluent-bit";

     

       31
       31
       -
       

     

       32
       32
       -
               # Logs get compressed when larger than 1024 bytes

     

       33
       33
       -
               # Lets generate some logs that trigger that

     

       34
       34
       -
               # This causes libzstd to be dlopen'd by systemd which breaks fluent-bit 3.2.7+

     

       35
       35
       -
               # https://www.freedesktop.org/software/systemd/man/latest/journald.conf.html#Compress=

     

       36
       36
       -
               systemd.services.fluent-bit-regression-395128 = {

     

       37
       37
       -
                 serviceConfig = {

     

       38
       38
       -
                   Type = "oneshot";

     

       39
       39
       -
                   RemainAfterExit = true;

     

       40
       40
       -
                 };

     

       41
       41
       -
                 script = ''

     

       42
       42
       -
                   for i in {1..20}; do

     

       43
       43
       -
                     (head -c 1200 < /dev/zero | tr '\0' 'A') && echo

     

       44
       44
       -
                     sleep 1

     

       45
       45
       -
                   done

     

       46
       46
       -
                 '';

     

       47
       47
       -
               };

     

       27
       27
       +
           # Logs get compressed when larger than 1024 bytes

     

       28
       28
       +
           # Lets generate some logs that trigger that

     

       29
       29
       +
           # This causes libzstd to be dlopen'd by systemd which breaks fluent-bit 3.2.7+

     

       30
       30
       +
           # https://www.freedesktop.org/software/systemd/man/latest/journald.conf.html#Compress=

     

       31
       31
       +
           systemd.services.fluent-bit-regression-395128 = {

     

       32
       32
       +
             serviceConfig = {

     

       33
       33
       +
               Type = "oneshot";

     

       34
       34
       +
               RemainAfterExit = true;

     

       48
       35
        
             };

     

       36
       36
       +
             script = ''

     

       37
       37
       +
               for i in {1..20}; do

     

       38
       38
       +
                 (head -c 1200 < /dev/zero | tr '\0' 'A') && echo

     

       39
       39
       +
                 sleep 1

     

       40
       40
       +
               done

     

       41
       41
       +
             '';

     

       42
       42
       +
           };

     

       43
       43
       +
         };

     

       49
       44
        
       

     

       50
       50
       -
           testScript = ''

     

       51
       51
       -
             start_all()

     

       45
       45
       +
         testScript = ''

     

       46
       46
       +
           start_all()

     

       52
       47
        
       

     

       53
       53
       -
             machine.wait_for_unit("fluent-bit.service")

     

       48
       48
       +
           machine.wait_for_unit("fluent-bit.service")

     

       54
       49
        
       

     

       55
       55
       -
             # Regression test for https://github.com/NixOS/nixpkgs/pull/395128

     

       56
       56
       -
             with subtest("fluent-bit handles zstd-compressed journal logs"):

     

       57
       57
       -
               machine.succeed("systemctl start fluent-bit-regression-395128.service")

     

       58
       58
       -
               machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'")

     

       50
       50
       +
           with subtest("fluent-bit handles zstd-compressed journal logs"):

     

       51
       51
       +
             machine.succeed("systemctl start fluent-bit-regression-395128.service")

     

       52
       52
       +
             machine.succeed("systemctl show -p NRestarts fluent-bit.service | grep -q 'NRestarts=0'")

     

       59
       53
        
       

     

       60
       60
       -
             machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out")

     

       61
       61
       -
           '';

     

       62
       62
       -
         }

     

       63
       63
       -
       )

     

       54
       54
       +
           machine.wait_for_file("/var/log/fluent-bit/fluent-bit.out")

     

       55
       55
       +
         '';

     

       56
       56
       +
       }