Merge remote-tracking branch 'origin' into fix-xls-exports

Author: Ahmet Oeztuerk

.ci/prepare_machine.sh

@@ -72,7 +72,9 @@ apt-get -y install \
 
 # list of mirrors: https://mirrors.opensuse.org/
 mkdir -p /etc/apt/sources.list.d
-curl -sS "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg" -o /etc/apt/trusted.gpg.d/naemon.asc
+test -s /etc/apt/trusted.gpg.d/naemon.asc ||
+    curl -sS "https://download.thruk.org/obs_naemon.asc" -o /etc/apt/trusted.gpg.d/naemon.asc || \
+    curl -sS "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg" -o /etc/apt/trusted.gpg.d/naemon.asc
 #echo "deb [signed-by=/etc/apt/trusted.gpg.d/naemon.asc] http://download.opensuse.org/repositories/home:/naemon:/daily/xUbuntu_$(lsb_release -rs)/ ./" >> /etc/apt/sources.list.d/naemon.list
 echo "deb [signed-by=/etc/apt/trusted.gpg.d/naemon.asc] https://slc-mirror.opensuse.org/repositories/home:/naemon:/daily/xUbuntu_$(lsb_release -rs)/ ./" >> /etc/apt/sources.list.d/naemon.list
 apt-get -y update

.github/workflows/citest.yml

@@ -82,11 +82,18 @@ jobs:
 
       - name: make quicktest
         run: |
-          timeout -v 10m sudo su naemon -c 'eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) && HARNESS_TIMER=1 stdbuf -o0 -e0 make quicktest'
+          timeout -v 10m sudo su naemon -c 'eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) && THRUK_TEST_MODULES_CACHE=${{ env.THRUK_TEST_MODULES_CACHE }} THRUK_CRITIC_CACHE_FILE=${{ env.THRUK_CRITIC_CACHE_FILE }} HARNESS_TIMER=1 stdbuf -o0 -e0 make quicktest'
 
       - name: make citest
         run: |
-          timeout -v 90m sudo su naemon -c 'eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) && HARNESS_TIMER=1 stdbuf -o0 -e0 make citest'
+          timeout -v 90m sudo su naemon -c 'eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib) && THRUK_TEST_MODULES_CACHE=${{ env.THRUK_TEST_MODULES_CACHE }} THRUK_CRITIC_CACHE_FILE=${{ env.THRUK_CRITIC_CACHE_FILE }} HARNESS_TIMER=1 stdbuf -o0 -e0 make citest'
+
+      - name: remove cache
+        run: |
+          gh cache delete --all
+          ls -la ${{ env.THRUK_TEST_MODULES_CACHE }} ${{ env.THRUK_CRITIC_CACHE_FILE }} || :
+        env:
+          GH_TOKEN: ${{ github.token }}
 
       - name: save updated cache back
         id: thruk-test-cache-save

lib/Thruk/Action/AddDefaults.pm

@@ -394,14 +394,15 @@ sub end {
 =cut
 
 sub add_defaults {
-    my ($c, $flags, $no_config_adjustments) = @_;
+    my ($c, $flags, $no_config_adjustments, $group_start_over) = @_;
     confess("no c?") unless defined $c;
 
     my($flags_hash, $flags_name) = _get_flags($flags);
     $c->stats->profile(begin => "AddDefaults::add_defaults(".$flags_name.")");
 
     ###############################
     # user / group specific config?
+    my $user_groups = $c->user_exists ? $c->user->{'groups'} : [];
     if(!$no_config_adjustments && $c->user_exists) {
         $c->stash->{'usr_config_adjustments'} = [];
         for my $group (@{$c->user->{'groups'}}) {
@@ -428,7 +429,7 @@ sub add_defaults {
                 require Thruk::Backend::Manager;
                 $c->{'db'} = Thruk::Backend::Manager->new($pool);
             }
-            add_defaults($c, $flags, 1);
+            add_defaults($c, $flags, 1, $group_start_over);
         }
     }
     if($flags_hash->{ADD_USER_ONLY}) {
@@ -590,6 +591,16 @@ sub add_defaults {
         ) {
             # refresh dynamic roles and groups
             $c->user->set_dynamic_attributes($c);
+
+            # check if groups have changed and restart if so (check if there are group adjustments in the config at all)
+            if(!Thruk::Utils::deep_compare($c->user->{'groups'}, $user_groups)) {
+                for my $group (@{$c->user->{'groups'}}) {
+                    if($c->config->{'Group'}->{$group}) {
+                        # found a new group and there are adjustments for it, start over
+                        return(add_defaults($c, $flags, 0, 1)) unless $group_start_over;
+                    }
+                }
+            }
         }
         if($c->{'session'} && !$c->{'session'}->{'fake'}) {
             $c->stash->{'cookie_auth'} = 1;

plugins/plugins-available/node-control/lib/Thruk/Controller/node_control.pm

@@ -4,7 +4,6 @@ use warnings;
 use strict;
 
 use Thruk::Action::AddDefaults ();
-use Thruk::Backend::Manager ();
 use Thruk::NodeControl::Utils ();
 use Thruk::Utils::External ();
 use Thruk::Utils::Log qw/:all/;
@@ -110,29 +109,11 @@ sub index {
     $c->stash->{omd_default_version}    = $config->{'omd_default_version'},
     $c->stash->{omd_available_versions} = Thruk::NodeControl::Utils::get_available_omd_versions($c, $peers);
 
-    # sort servers by section, host_name, site
-    map { $_->{'section'} = '' if $_->{'section'} eq 'Default' } @{$servers};
-    $servers = Thruk::Backend::Manager::sort_result({}, $servers, ['section', 'peer_name', 'host_name', 'omd_site']);
+    my $columns = [qw/section backend hostname site omd status os virt cpu memory disk actions/];
+    ($servers, $columns) = Thruk::NodeControl::Utils::finish_servers_list($c, $servers, $columns);
 
-    $c->stash->{'columns'} = [qw/section backend hostname site omd status os virt cpu memory disk actions/];
-
-    # allow addons to change and extend visible columns
-    my $modules = Thruk::NodeControl::Utils::get_addon_modules();
-    for my $mod (@{$modules}) {
-        if($mod->can("set_columns")) {
-            my($cols) = $mod->set_columns($c->stash->{'columns'});
-            $c->stash->{'columns'} = $cols if $cols;
-        }
-    }
-
-    # allow addons to change server list
-    for my $mod (@{$modules}) {
-        if($mod->can("adjust_server_list")) {
-            my($s) = $mod->adjust_server_list($c, $servers);
-            $servers = $s if $s;
-        }
-    }
-    $c->stash->{data} = $servers;
+    $c->stash->{'columns'} = $columns;
+    $c->stash->{'data'}    = $servers;
 
     return 1;
 }
@@ -153,22 +134,10 @@ sub TO_JSON {
     }
     Thruk::Action::AddDefaults::set_possible_backends($c, $c->stash->{'disabled_backends'}, $peers);
 
-    # allow addons to change and extend visible columns
-    my $modules = Thruk::NodeControl::Utils::get_addon_modules();
-    for my $mod (@{$modules}) {
-        if($mod->can("set_columns")) {
-            my($cols) = $mod->set_columns($c->stash->{'columns'});
-            $c->stash->{'columns'} = $cols if $cols;
-        }
-    }
+    my $columns = [qw/section backend hostname site omd status os virt cpu memory disk actions/];
+    ($servers, $columns) = Thruk::NodeControl::Utils::finish_servers_list($c, $servers, $columns);
 
-    # allow addons to change server list
-    for my $mod (@{$modules}) {
-        if($mod->can("adjust_server_list")) {
-            my($s) = $mod->adjust_server_list($c, $servers);
-            $servers = $s if $s;
-        }
-    }
+    $c->stash->{'columns'} = $columns;
 
     return $servers;
 }

plugins/plugins-available/node-control/lib/Thruk/NodeControl/Utils.pm

@@ -7,6 +7,7 @@ use Cpanel::JSON::XS ();
 use Cwd qw/abs_path/;
 use File::Temp qw/tempfile/;
 
+use Thruk::Backend::Manager ();
 use Thruk::Constants qw/:peer_states/;
 use Thruk::Utils ();
 use Thruk::Utils::External ();
@@ -105,6 +106,42 @@ sub get_peers {
 
 ##########################################################
 
+=head2 finish_servers_list
+
+  finish_servers_list($c, $servers, $columns)
+
+return final peers list and columns
+
+=cut
+sub finish_servers_list {
+    my($c, $servers, $columns) = @_;
+
+    # allow addons to change and extend visible columns
+    my $modules = Thruk::NodeControl::Utils::get_addon_modules();
+    for my $mod (@{$modules}) {
+        if($mod->can("set_columns")) {
+            my($cols) = $mod->set_columns($columns);
+            $columns = $cols if $cols;
+        }
+    }
+
+    # allow addons to change server list
+    for my $mod (@{$modules}) {
+        if($mod->can("adjust_server_list")) {
+            my($s) = $mod->adjust_server_list($c, $servers);
+            $servers = $s if $s;
+        }
+    }
+
+    # sort servers by section, host_name, site
+    map { $_->{'section'} = '' if $_->{'section'} eq 'Default' } @{$servers};
+    $servers = Thruk::Backend::Manager::sort_result({}, $servers, ['section', 'peer_name', 'host_name', 'omd_site']);
+
+    return($servers, $columns);
+}
+
+##########################################################
+
 =head2 get_server
 
   get_server($c, $peer, [$config])

plugins/plugins-available/node-control/lib/Thruk/Utils/CLI/Nodecontrol.pm

@@ -166,16 +166,25 @@ sub _action_list {
     my($c, $opt, $commandoptions, $config, $global_options) = @_;
     my @data;
 
-    for my $peer (@{Thruk::NodeControl::Utils::get_peers($c)}) {
-        my $s = Thruk::NodeControl::Utils::get_server($c, $peer, $config);
+    my $peers   = Thruk::NodeControl::Utils::get_peers($c);
+    my $servers = [];
+    for my $peer (@{$peers}) {
+        push @{$servers}, Thruk::NodeControl::Utils::get_server($c, $peer, $config);
+    }
+    Thruk::Action::AddDefaults::set_possible_backends($c, $c->stash->{'disabled_backends'}, $peers);
+
+    my $columns = [qw/section backend hostname site omd status os virt cpu memory disk actions/];
+    ($servers, $columns) = Thruk::NodeControl::Utils::finish_servers_list($c, $servers, $columns);
+
+    for my $s (@{$servers}) {
         my $v = $s->{'omd_version'};
         $v =~ s/-labs-edition//gmx;
         if(defined $opt->{'version'} && $v ne $opt->{'version'}) { next; }
         my $found = 1;
         if(defined $commandoptions && scalar @{$commandoptions} > 0)  {
             $found = 0;
             for my $pat (@{$commandoptions}) {
-                if(lc($pat) eq 'ALL' || $peer->{'name'} =~ m/$pat/mx || $peer->{'key'} =~ m/$pat/mx || $peer->{'section'} =~ m/$pat/mx) {
+                if(lc($pat) eq 'ALL' || $s->{'peer_name'} =~ m/$pat/mx || $s->{'peer_key'} =~ m/$pat/mx || $s->{'section'} =~ m/$pat/mx) {
                     $found = 1;
                     last;
                 }
@@ -184,8 +193,8 @@ sub _action_list {
         next unless $found;
         push @data, {
             Section => $s->{'section'} eq 'Default' ? '' : $s->{'section'},
-            Name    => $peer->{'name'},
-            ID      => $peer->{'key'},
+            Name    => $s->{'peer_name'},
+            ID      => $s->{'peer_key'},
             Host    => $s->{'host_name'},
             Site    => $s->{'omd_site'},
             Version => $v,

root/thruk/javascript/thruk-3.26.js

@@ -10257,6 +10257,7 @@ var ajax_search = {
         resetRefresh();
         evt              = (evt) ? evt : ((window.event) ? event : null);
         if(!evt) { return false; }
+        if(!ajax_search.input_field) { return false; }
         var input        = document.getElementById(ajax_search.input_field);
         var panel        = document.getElementById(ajax_search.result_pan);
         var focus        = false;

t/TestUtils.pm

@@ -24,6 +24,7 @@ use File::Temp qw/tempfile/;
 use HTTP::Cookies::Netscape;
 use HTTP::Request ();
 use HTTP::Request::Common 6.12 qw/GET POST/;
+use POSIX ();
 use Plack::Test;
 use Test::More;
 use Time::HiRes qw/sleep gettimeofday tv_interval/;
@@ -756,6 +757,7 @@ sub test_command {
     }
 
     my($prg,$arg) = split(/\s+/, $test->{'cmd'}, 2);
+    $test->{'start_time'} = &time_milli_str();
 
     # wait for something?
     if(defined $test->{'waitfor'}) {
@@ -1116,12 +1118,14 @@ sub bail_out_cmd {
 
     diag("\n######################################################\n");
     diag("cmd diagnostics:");
-    diag("error:  '".(ref $msg ? Dumper($msg) : $msg)."'\n");
+    diag("error:       '".(ref $msg ? Dumper($msg) : $msg)."'\n");
     my $cmd = $test->{'test_cmd'};
-    diag("cmd:    '".$test->{'cmd'}."' failed\n");
-    diag("stdout: '".($cmd->stdout // '')."'\n") if $cmd;
-    diag("stderr: '".($cmd->stderr // '')."'\n") if $cmd;
-    diag("exit:   '".($rc // '(none)')."'\n");
+    diag("cmd:         '".$test->{'cmd'}."' failed\n");
+    diag("stdout:      '".($cmd->stdout // '')."'\n") if $cmd;
+    diag("stderr:      '".($cmd->stderr // '')."'\n") if $cmd;
+    diag("exit:         ".($rc // '(none)')."\n");
+    diag("time (start): ".($test->{'start_time'} // '<unknown>')."\n");
+    diag("time (end):   ".time_milli_str()."\n");
 
     diag(Carp::longmess("started here:"));
     diag("\n######################################################\n");
@@ -1317,7 +1321,6 @@ sub js_init {
         headless         => 1,
         separate_session => 1,
         incognito        => 1,
-        tab              => 'current',
         launch_arg       => ["--password-store=basic", "--remote-allow-origins=*"],
     );
     $mech->get_local(-f "./data/blank.html" ? "./data/blank.html" : "../../data/blank.html");
@@ -1396,6 +1399,14 @@ sub js_is {
 #################################################
 sub _js_diag_error {
     my($e, $diag) = @_;
+
+    if($e->{'type'} && ($e->{'type'} eq 'debug' || $e->{'type'} eq 'info')) {
+        return unless $ENV{'HARNESS_VERBOSE'};
+        diag("not failing on debug ".$e->{'type'}." console message");
+    } else {
+        fail("got js error");
+    }
+
     diag($diag) if $diag;
     my $known = 0;
     if($e->{'message'}) {
@@ -1418,12 +1429,6 @@ sub _js_diag_error {
         }
         $known = 1;
     }
-    if($e->{'type'} && ($e->{'type'} eq 'debug' || $e->{'type'} eq 'info')) {
-        #diag("not failing on debug lvl console message");
-        return;
-    } else {
-        fail("got js error");
-    }
     if($e->{'stackTrace'} && ref $e->{'stackTrace'} eq 'HASH' && $e->{'stackTrace'}->{'callFrames'}) {
         diag("Stack Trace:");
         for my $frame (@{$e->{'stackTrace'}->{'callFrames'}}) {
@@ -1445,16 +1450,16 @@ sub _js_format_err_arg {
 
     if($arg->{'type'} eq 'object' && defined $arg->{'preview'} && defined $arg->{'preview'}->{'properties'}) {
         my $x = 0;
-        my $str = ($arg->{'className'} // "unknown") . "(";
+        my $str = ($arg->{'className'} // "unknown") . "{ ";
         for my $p (@{$arg->{'preview'}->{'properties'}}) {
             if($x > 0) {
                 $str .= ", ";
             }
             $x++;
 
-            $str .= sprintf("%s (%s): %s", $p->{'name'}, $p->{'type'}, $p->{'value'});
+            $str .= sprintf("'%s' (%s): %s", $p->{'name'}, $p->{'type'}, $p->{'value'});
         }
-        $str .= ")";
+        $str .= " }";
         return($str);
     }
 
@@ -1504,6 +1509,16 @@ sub is_deeply_diff {
     return 0;
 }
 
+#################################################
+# return current time with milliseconds
+sub time_milli_str {
+    my($seconds, $microseconds) = Time::HiRes::gettimeofday;
+    return(sprintf("%s,%s",
+        POSIX::strftime("%Y-%m-%d %H:%M:%S", localtime($seconds)),
+        substr(sprintf("%06s", $microseconds), 0, 3),
+    ));
+}
+
 # replace is_deeply with our own version which shows the diff if the test fails
 {
     no warnings 'redefine';

t/scenarios/_common/ansible/install_role.sh

@@ -4,7 +4,7 @@ ROLE=$1
 shift
 
 if [ "$ROLE" = "" ]; then
-  echo "Usage: $0 <role>"
+  echo "Usage: $0 <role> [<ansible args>]"
   echo "available roles:"
   ls -1 $ANSIBLE_ROLES_PATH
   exit 1

t/scenarios/_common/ansible/roles/common/tasks/main.yml

@@ -88,6 +88,7 @@
     - 'alias l="ls -la"'
     - 'alias vi="vim"'
     - 'alias psg="ps -efl | grep"'
+    - 'alias install_ansible_role="/thruk/t/scenarios/_common/ansible/install_role.sh"'
     - 'export HISTCONTROL="ignoredups:ignorespace:erasedups"'
     - 'export HISTSIZE=100000'
     - 'shopt -s histappend'