X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fcacti.pm;h=2b989a0b0c5c6f3cbb0b25aa0395c466a759b77c;hb=674cb2d9d7105f4cc2871539b2e9f7088cdaa750;hp=7de97946c5e585ff254e7e28567526a4e862ab22;hpb=9aee669886202be7035e6c6049fc71bc99dd3013;p=freeside.git

diff --git a/FS/FS/part_export/cacti.pm b/FS/FS/part_export/cacti.pm
index 7de97946c..2b989a0b0 100644
--- a/FS/FS/part_export/cacti.pm
+++ b/FS/FS/part_export/cacti.pm
@@ -53,6 +53,8 @@ tie my %options, 'Tie::IxHash',
   'delete_graphs'     => { label   => 'Delete associated graphs and data sources when unprovisioning', 
                            type    => 'checkbox',
                          },
+  'include_path'      => { label   => 'Path to cacti include dir (relative to script_path)',
+                           default => '../site/include/' },
   'cacti_graph_template_id'  => { 
     'label'    => 'Graph Template',
     'type'     => 'custom',
@@ -191,6 +193,7 @@ sub _delete_queue {
     'hostname'      => $svc_broadband->ip_addr,
     'script_path'   => $self->option('script_path'),
     'delete_graphs' => $self->option('delete_graphs'),
+    'include_path'  => $self->option('include_path'),
   );
   return ($queue,$error);
 }
@@ -249,6 +252,8 @@ sub ssh_insert {
        . trailslash($opt{'script_path'}) 
        . q(freeside_cacti.php --get-graph-templates --host-template=)
        . $opt{'template_id'};
+  $cmd .= q( --include-path=') . $self->option('include_path') . q(')
+    if $self->option('include_path');
   my $ginfo = { map { $_ ? ($_ => undef) : () } split(/\n/,ssh_cmd(%opt, 'command' => $cmd)) };
 
   # Add extra config info
@@ -341,6 +346,8 @@ sub ssh_delete {
           . q(');
   $cmd .= q( --delete-graphs)
     if $opt{'delete_graphs'};
+  $cmd .= q( --include-path=') . $opt{'include_path'} . q(')
+    if $opt{'include_path'};
   my $response = ssh_cmd(%opt, 'command' => $cmd);
   die "Error removing from cacti: " . $response
     if $response;
@@ -417,6 +424,8 @@ sub process_graphs {
           . q(freeside_cacti.php --get-graphs --ip=')
           . $svc->ip_addr
           . q(');
+  $cmd .= q( --include-path=') . $self->option('include_path') . q(')
+    if $self->option('include_path');
   my @graphs = map { [ split(/\t/,$_) ] } 
                  split(/\n/, ssh_cmd(
                    'host'          => $self->machine,
@@ -498,7 +507,7 @@ sub process_graphs {
       }
       unlink($thumbfile);
     } else {
-      $svchtml .= qq(<P STYLE="color: #FF0000">File $thumbfile does not exist, skipping</P>);
+      $svchtml .= qq(<P STYLE="color: #FF0000">Error loading graph: $$graph[0]</P>);
     }
     $job->update_statustext(49 + int($i / @graphs) * 50);
   }
@@ -618,14 +627,6 @@ sub exptime {
 Jonathan Prykop 
 jonathan@freeside.biz
 
-=head1 LICENSE AND COPYRIGHT
-
-Copyright 2015 Freeside Internet Services      
-
-This program is free software; you can redistribute it and/or 
-modify it under the terms of the GNU General Public License 
-as published by the Free Software Foundation.
-
 =cut
 
 1;