v2.4.21.1

Author: Marcin Przepiorowski

.github/workflows/build.yml

@@ -316,7 +316,7 @@ jobs:
         #brew install cpanminus
         CELL=`brew --prefix perl`
         $CELL/bin/perl -MCPAN -e 'install App::cpanminus'
-        brew install openssl@1.1
+        #brew install openssl@1.1
         $CELL/bin/cpanm Crypt::CBC@2.33
         $CELL/bin/cpanm Crypt::Blowfish
         # export OPENSSL_PREFIX=`brew --prefix openssl@1.1`
@@ -332,7 +332,7 @@ jobs:
         $CELL/bin/cpanm DateTime::Format::DateParse
         $CELL/bin/cpanm Text::CSV
         $CELL/bin/cpanm LWP::UserAgent
-        $CELL/bin/cpanm Net::SSLeay
+        $CELL/bin/cpanm --force Net::SSLeay
         $CELL/bin/cpanm Mozilla::CA@20180117
         $CELL/bin/cpanm -f IO::Socket::SSL@2.068
         $CELL/bin/cpanm LWP::Protocol::https
@@ -346,7 +346,7 @@ jobs:
       run: |
           #CELL=`brew --prefix pioro/repo/perl@5.30`
           CELL=`brew --prefix perl`
-          OPENLIB=`brew --prefix openssl@1.1`
+          OPENLIB=`brew --prefix openssl@3`
           CDIR=`pwd`
           export PP=${CELL}/bin/pp
           export LIBS="-l ${OPENLIB}/lib/libssl.dylib -l ${OPENLIB}/lib/libcrypto.dylib"

.github/workflows/develop.yml

@@ -390,7 +390,7 @@ jobs:
         # eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
         # echo $PERL_MB_OPT
         #brew uninstall --ignore-dependencies openssl@1.1
-        curl https://raw.githubusercontent.com/Homebrew/homebrew-core/ffa0f6655cbbbecaafb5334cefaae4c3eb1ffb8a/Formula/openssl%401.1.rb -o openssl\@1.1.rb
+        #curl https://raw.githubusercontent.com/Homebrew/homebrew-core/ffa0f6655cbbbecaafb5334cefaae4c3eb1ffb8a/Formula/openssl%401.1.rb -o openssl\@1.1.rb
         #cat ./openssl\@1.1.rb
         #brew install  --build-from-source  ./openssl\@1.1.rb
         $CELL/bin/cpanm Crypt::CBC@2.33
@@ -408,7 +408,7 @@ jobs:
         $CELL/bin/cpanm DateTime::Format::DateParse
         $CELL/bin/cpanm Text::CSV
         $CELL/bin/cpanm LWP::UserAgent
-        $CELL/bin/cpanm Net::SSLeay
+        $CELL/bin/cpanm --force Net::SSLeay
         $CELL/bin/cpanm Mozilla::CA@20180117
         $CELL/bin/cpanm -f IO::Socket::SSL@2.068
         $CELL/bin/cpanm LWP::Protocol::https
@@ -428,7 +428,7 @@ jobs:
       run: |
           #CELL=`brew --prefix pioro/repo/perl@5.30`
           CELL=`brew --prefix perl`
-          OPENLIB=`brew --prefix openssl@1.1`
+          OPENLIB=`brew --prefix openssl@3`
           CDIR=`pwd`
           export PP=${CELL}/bin/pp
           export LIBS="-l ${OPENLIB}/lib/libssl.dylib -l ${OPENLIB}/lib/libcrypto.dylib"

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.21.1
+
+### Changes:
+- group name added to dx_get_vdbthroughput - new parameter fullname
+
 ## 2.4.21
 
 ### Added

bin/dx_get_vdbthroughput.pl

@@ -36,6 +36,7 @@
 use Toolkit_helpers;
 use PerfHistory_obj;
 use Databases;
+use Group_obj;
 
 my $version = $Toolkit_helpers::version;
 my $interval = 60;
@@ -49,6 +50,7 @@
   'i=s' => \($interval),
   'outdir=s' => \(my $outdir),
   'format=s' => \($format),
+  'fullname' => \(my $fullname),
   'all' => (\my $all),
   'dever=s' => \(my $dever),
   'version' => \(my $print_version),
@@ -136,6 +138,11 @@
 
   my $perfdata = $perfhist->returndata();
 
+  my $groups;
+
+  if (defined($fullname)) {
+    $groups = new Group_obj($engine_obj, $debug);
+  }
 
   # check if no data returned
   my $firstts = (keys(%{$perfdata}))[0];
@@ -145,9 +152,15 @@
     my @dbnamelist;
     push(@dbnamelist, {'timestamp', '30'});
 
+    my $fulldbname;
     for my $dbref (sort(keys(%{$perfdata->{$firstts}}))) {
       $dbobj = $db->getDB($dbref);
-      push(@dbnamelist, {$dbobj->getName(), '30'});
+      if (defined($fullname)) {
+        $fulldbname = $groups->getName($dbobj->getGroup()) . "/" . $dbobj->getName();
+      } else {
+        $fulldbname = $dbobj->getName();
+      }
+      push(@dbnamelist, {$fulldbname, '30'});
     }
 
     $output->addHeader(
@@ -188,6 +201,7 @@ =head1 SYNOPSIS
  dx_get_vdbthroughput    [ -engine|d <delphix identifier> | -all ] [ -configfile file ]
                          [-st timestamp]
                          [-et timestamp]
+                         [-fullname]
                          [-i 1|60|3600]
                          [-outdir path]
                          [ --help|? ]
@@ -237,6 +251,9 @@ =head1 OPTIONS
 Use the specified interval for export. Allowed values are:
 1, 60, 3600
 
+=item B<-fullname>
+Add groupname to the output. Full name is printed as "group name/database name"
+
 =item B<-help>
 Print this screen
 

lib/Toolkit_helpers.pm

@@ -29,7 +29,7 @@ use File::Spec;
 
 use lib '../lib';
 
-our $version = '2.4.21';
+our $version = '2.4.21.1';
 
 my $tz = new Date::Manip::TZ;
 my $dt = new Date::Manip::Date;