@@ -7,7 +7,6 @@ use Cpanel::JSON::XS ();
77use Module::Load qw/ load/ ;
88use Time::HiRes ();
99use URI::Escape qw/ uri_unescape/ ;
10- use Data::Dumper;
1110
1211use Thruk::Action::AddDefaults ();
1312use Thruk::Authentication::User ();
@@ -302,7 +301,6 @@ sub process_rest_request {
302301 # wrap data along with column meta data
303302 my $request_method = $method || $c -> req-> method;
304303 my $columns = _get_columns_meta_for_path($c , $path_info , $request_method , $data );
305- Thruk::Utils::Log::_debug(" \$ columns:" .Dumper($columns ));
306304 my $meta = {};
307305 $meta -> {" columns" } = $columns if $columns ;
308306 $data = {
@@ -1015,11 +1013,6 @@ returns list of requested columns or undef
10151013sub get_request_columns {
10161014 my ($c , $type ) = @_ ;
10171015
1018- Thruk::Utils::Log::_debug(" get_request_columns" );
1019-
1020- # Thruk::Utils::Log::_debug("\$c->req".Dumper($c->req));
1021- Thruk::Utils::Log::_debug(" [get_request_columns] paramseters are: " . Dumper($c -> req-> parameters));
1022-
10231016 return unless $c -> req-> parameters-> {' columns' };
10241017
10251018 my $columns = _split_columns($c -> req-> parameters-> {' columns' });
@@ -1039,8 +1032,6 @@ sub get_request_columns {
10391032 return (_parse_columns_data($columns ));
10401033 }
10411034
1042- Thruk::Utils::Log::_debug(" [get_request_columns] \$ columns" .Dumper($columns ));
1043-
10441035 return ($columns );
10451036}
10461037
@@ -1057,8 +1048,6 @@ returns hash of columns with their alias
10571048sub get_aliased_columns {
10581049 my ($c ) = @_ ;
10591050
1060- Thruk::Utils::Log::_debug(" get_aliased_columns" );
1061-
10621051 my $alias_columns = {};
10631052 my $columns = get_request_columns($c , STRUCT);
10641053 if ($columns ) {
@@ -1861,9 +1850,6 @@ sub _get_help_for_path {
18611850# #########################################################
18621851sub _get_columns_meta_for_path {
18631852 my ($c , $path_info , $method , $data ) = @_ ;
1864- Thruk::Utils::Log::_debug(" _get_columns_meta_for_path:" );
1865- Thruk::Utils::Log::_debug(" \$ path_info: " .$path_info );
1866- Thruk::Utils::Log::_debug(" \$ method: " .$method );
18671853
18681854 require Thruk::Controller::Rest::V1::docs;
18691855 require Thruk::Controller::Rest::V1::livestatus_docs;
@@ -1884,10 +1870,7 @@ sub _get_columns_meta_for_path {
18841870 $keys -> {$path } = $docs -> {$path };
18851871 }
18861872 }
1887- # Thruk::Utils::Log::_debug("\$keys: ".Dumper($keys));
18881873 my $alias_columns = get_aliased_columns($c );
1889- Thruk::Utils::Log::_debug(" \$ alias_columns: " .Dumper($alias_columns ));
1890- # When no filter is used, like Picking '*' in Grafana, the returned array is empty
18911874 my $req_columns = get_request_columns($c , ALIAS) || ((ref $data eq ' ARRAY' && $data -> [0]) ? [sort keys %{$data -> [0]}] : []);
18921875
18931876 # Remove the 'limit' if present, it is a parameter but not a request column.
@@ -1912,17 +1895,11 @@ sub _get_columns_meta_for_path {
19121895 # So patterns like '/host/<name>/outages' get replaced to '/host/[^/]*/outages' for regex matches
19131896 $p =~ s % <[^>]+>% [^/]*% gmx ;
19141897
1915- # Thruk::Utils::Log::_debug("\$path: ".$path);
1916- # Thruk::Utils::Log::_debug("\$p: ".$p);
1917-
19181898 if ($path_info !~ qr /$p / mx ) {
19191899 next ;
19201900 }
19211901 next unless ($keys -> {$path }-> {$method });
19221902
1923- # Thruk::Utils::Log::_debug("\$keys: ".Dumper($keys));
1924- Thruk::Utils::Log::_debug(" \$ path: " .Dumper($path ));
1925-
19261903 for my $d (@{$keys -> {$path }-> {$method }-> {' columns' }}) {
19271904 my $col = { ' name' => $d -> {' name' } };
19281905 $col -> {' type' } = $d -> {' type' } if $d -> {' type' };
@@ -1932,9 +1909,6 @@ sub _get_columns_meta_for_path {
19321909 last ;
19331910 }
19341911
1935- Thruk::Utils::Log::_debug(" \$ columns: " .Dumper($columns ));
1936- # Thruk::Utils::Log::_debug("\$columns: ".join(" ",@{$columns}));
1937-
19381912 # If request does not specify any columns, it should include metadata for all columns
19391913 if (scalar @{$req_columns } == 0) {
19401914 my $firstrow ;
@@ -3310,8 +3284,6 @@ sub _post_process_logs {
33103284sub _parse_columns_data_alias {
33113285 my ($raw ) = @_ ;
33123286
3313- Thruk::Utils::Log::_debug(" parse_columns_data_alias" );
3314-
33153287 my $num_cols = scalar @{$raw };
33163288 my $columns = [];
33173289 for (my $x = 0; $x < $num_cols ; $x ++) {
@@ -3339,8 +3311,6 @@ sub _parse_columns_data_alias {
33393311sub _parse_columns_data_names {
33403312 my ($raw , $keep_functions ) = @_ ;
33413313
3342- Thruk::Utils::Log::_debug(" parse_columns_data_names" );
3343-
33443314 my $columns = [];
33453315 my $num_cols = scalar @{$raw };
33463316 my $c = $Thruk::Globals::c ;
@@ -3385,8 +3355,6 @@ sub _parse_columns_data_names {
33853355sub _parse_columns_data {
33863356 my ($raw ) = @_ ;
33873357
3388- Thruk::Utils::Log::_debug(" parse_columns_data" );
3389-
33903358 my $columns = [];
33913359
33923360 my $alias = _parse_columns_data_alias($raw );
0 commit comments