histou: use check_interval to fine tune gaps in grafana graphs

Author: sni

lib/Thruk/Utils.pm

@@ -1566,7 +1566,8 @@ sub get_histou_url {
         next unless defined $obj->{$type};
         my $regex = $c->config->{'grafana_url_regex'};
         if($obj->{$type} =~ m%$regex%mx) {
-            return(proxifiy_url($c, $obj, $obj->{$type}));
+            my $url = _enhance_histou_url($c, $obj->{$type}, $obj);
+            return(proxifiy_url($c, $obj, $url));
         }
     }
 
@@ -2010,6 +2011,7 @@ sub get_action_url {
         return($action_url);
     }
     elsif($action_url =~ m/\/histou\.js\?/mx || $action_url =~ m/\/grafana\//mx) {
+        $action_url = _enhance_histou_url($c, $action_url, $obj);
         my $custvars = get_custom_vars($c, $obj, $obj_prefix);
         $action_url =~ s/&/&/gmx;
         $action_url =~ s/&/&/gmx;
@@ -4254,6 +4256,26 @@ sub get_affected_backends {
     return([sort keys %{$affected_backends}]);
 }
 
+##############################################
+# replaces dark themen in the histou url and
+# sets the spannulls value
+sub _enhance_histou_url {
+    my($c, $url, $obj) = @_;
+
+    return($url) unless $url =~ m/histou.js/mx;
+
+    if(($c->stash->{'theme'}//'') =~ m/dark/mxi) {
+        $url =~ s/\&theme=light/\&theme=dark/gmx;
+    }
+
+    if($obj->{'check_interval'}) {
+        my $interval_length = $c->stash->{'pi_detail'}->{$obj->{'peer_key'}}->{'interval_length'} // 60;
+        $url = $url.'&spannulls='.($obj->{'check_interval'} * $interval_length * 2);
+    }
+
+    return($url);
+}
+
 ##############################################
 
 1;

root/thruk/javascript/thruk-3.20.2.js

@@ -10193,15 +10193,6 @@ function set_histou_img(start, end, id, source, skip_hash) {
     var getParamTo = "&to=" + (toUnixtime(end)*1000);
     var newUrl = histou_frame_url + getParamFrom + getParamTo + '&panelId='+source;
 
-    if(theme.match(/dark/i)) {
-        newUrl = newUrl.replace("&theme=light", "")
-        newUrl = newUrl+'&theme=dark';
-        histou_url = histou_url.replace("&theme=light", "&theme=dark");
-    } else {
-        newUrl = newUrl.replace("&theme=light", "")
-        newUrl = newUrl+'&theme=light';
-    }
-
     //add timerange to iconlink, so the target graph matches the preview
     jQuery("#histou_graph_link").attr("href", url_prefix + "#" + histou_url + getParamFrom + getParamTo);
 

ssi/status-header.ssi-pnp

@@ -16,15 +16,6 @@ jQuery(document).ready(function() {
         popup_pos_x  = e.pageX - popup_width - 5;
       }
 
-      if(theme.match(/dark/i)) {
-        url = url.replace("&theme=light", "&theme=dark");
-        var link = jQuery(e.target).parent("A").attr("href");
-        if(link) {
-          link = link.replace("&theme=light", "&theme=dark");
-          jQuery(e.target).parent("A").attr("href", link);
-        }
-      }
-
       var showPopup = function(url) {
         jQuery("#tooltip").remove();
         jQuery("body").append("<div id='tooltip'><iframe src='"+url+"' width='"+popup_width+"' height='"+popup_height+"' frameBorder='0' scrolling='no' onload='resizeGraphIFrame(this)'><\/iframe><\/div>");

templates/_histou_graph.tt

@@ -1,8 +1,5 @@
 [% USE date %]
 [% histou_frame_url = histou_url.replace('/dashboard/', '/dashboard-solo/').replace('/d/', '/d-solo/') %]
-[% IF theme.match('/dark/') %]
-  [% histou_url = histou_url.replace('&theme=light', '&theme=dark') %]
-[% END %]
 <script>
   var histou_url        = "[% histou_url %]";
   var histou_frame_url  = "[% histou_frame_url %]";