From 5757d3dddfb6d75f0114e9be5c546191150c8ca2 Mon Sep 17 00:00:00 2001
From: Carsten Koebke <carsten.koebke@koebbes.de>
Date: Tue, 6 Mar 2018 15:29:04 +0100
Subject: [PATCH] shorten statefilename to sid if --connect string doesnt use
 tnsnames.ora

---
 plugins-scripts/Nagios/DBD/Oracle/Server.pm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins-scripts/Nagios/DBD/Oracle/Server.pm b/plugins-scripts/Nagios/DBD/Oracle/Server.pm
index a495d31..4790876 100644
--- a/plugins-scripts/Nagios/DBD/Oracle/Server.pm
+++ b/plugins-scripts/Nagios/DBD/Oracle/Server.pm
@@ -816,6 +816,7 @@ sub save_state {
   my $self = shift;
   my %params = @_;
   my $extension = "";
+  my $statefile = "";
   my $mode = $params{mode};
   if ($params{connect} && $params{connect} =~ /(\w+)\/(\w+)@(\w+)/) {
     $params{connect} = $3;
@@ -839,7 +840,12 @@ sub save_state {
         $params{statefilesdir});
     return;
   }
-  my $statefile = sprintf "%s_%s", $params{connect}, $mode;
+  if ( $params{connect} =~ /.*sid=(\w+).*/i ) {
+    my ($sid_name) = $params{connect} =~ /.*sid=(\w+).*/mi;
+    $statefile = sprintf "%s_%s", $sid_name, $mode;
+  } else {
+    $statefile = sprintf "%s_%s", $params{connect}, $mode;
+  }
   $extension .= $params{differenciator} ? "_".$params{differenciator} : "";
   $extension .= $params{tablespace} ? "_".$params{tablespace} : "";
   $extension .= $params{datafile} ? "_".$params{datafile} : "";
@@ -870,6 +876,7 @@ sub load_state {
   my $self = shift;
   my %params = @_;
   my $extension = "";
+  my $statefile = "";
   my $mode = $params{mode};
   if ($params{connect} && $params{connect} =~ /(\w+)\/(\w+)@(\w+)/) {
     $params{connect} = $3;
@@ -881,7 +888,12 @@ sub load_state {
     $mode =~ s/::/_/g;
     $params{statefilesdir} = $self->system_vartmpdir();
   }
-  my $statefile = sprintf "%s_%s", $params{connect}, $mode;
+  if ( $params{connect} =~ /.*sid=(\w+).*/i ) {
+    my ($sid_name) = $params{connect} =~ /.*sid=(\w+).*/mi;
+    $statefile = sprintf "%s_%s", $sid_name, $mode;
+  } else {
+    $statefile = sprintf "%s_%s", $params{connect}, $mode;
+  }
   $extension .= $params{differenciator} ? "_".$params{differenciator} : "";
   $extension .= $params{tablespace} ? "_".$params{tablespace} : "";
   $extension .= $params{datafile} ? "_".$params{datafile} : "";