remove graph.php usage part 1

Author: murrant

LibreNMS/Alert/Transport/Grafana.php

@@ -40,14 +40,10 @@ public function deliverAlert(array $alert_data): bool
             'title' => 'yes',
         ];
 
-        //$graph_url = url('graph.php') . '?' . http_build_query($graph_args);
-        // FIXME - workaround for https://github.com/grafana/oncall/issues/3031
-        $graph_url = url('graph.php') . '/' . str_replace('&', '/', http_build_query($graph_args));
-
         $data = [
             'alert_uid' => $alert_data['id'],
             'title' => $alert_data['title'] ?? null,
-            'image_url' => $graph_url,
+            'image_url' => route('graph', $graph_args),
             'link_to_upstream_details' => Url::deviceUrl($device),
             'state' => ($alert_data['state'] == AlertState::ACTIVE) ? 'alerting' : 'ok',
             'raw_state' => $alert_data['state'],

LibreNMS/Util/Url.php

@@ -298,51 +298,6 @@ public static function sensorUrl($sensor, $vars = [])
         return self::generate(['page' => 'device', 'device' => $sensor->device_id, 'tab' => 'health', 'metric' => $sensor->sensor_class], $vars);
     }
 
-    /**
-     * @param  Port  $port
-     * @return string
-     */
-    public static function portThumbnail($port)
-    {
-        $graph_array = [
-            'port_id' => $port->port_id,
-            'graph_type' => 'port_bits',
-            'from' => Carbon::now()->subDay()->timestamp,
-            'to' => Carbon::now()->timestamp,
-            'width' => 150,
-            'height' => 21,
-        ];
-
-        return self::portImage($graph_array);
-    }
-
-    /**
-     * @param  Port  $port
-     * @return string
-     */
-    public static function portErrorsThumbnail($port)
-    {
-        $graph_array = [
-            'port_id' => $port->port_id,
-            'graph_type' => 'port_errors',
-            'from' => Carbon::now()->subDay()->timestamp,
-            'to' => Carbon::now()->timestamp,
-            'width' => 150,
-            'height' => 21,
-        ];
-
-        return self::portImage($graph_array);
-    }
-
-    public static function portImage($args)
-    {
-        if (empty($args['bg'])) {
-            $args['bg'] = 'FFFFFF00';
-        }
-
-        return '<img src="graph-image ' . url('graph.php') . '?type=' . $args['graph_type'] . '&amp;id=' . $args['port_id'] . '&amp;from=' . $args['from'] . '&amp;to=' . $args['to'] . '&amp;width=' . $args['width'] . '&amp;height=' . $args['height'] . '&amp;bg=' . $args['bg'] . '">';
-    }
-
     public static function generate($vars, $new_vars = [])
     {
         $vars = array_merge($vars, $new_vars);
@@ -393,17 +348,12 @@ public static function graphPageUrl(string $type, array $args = []): string
     }
 
     /**
-     * @param  array  $args
+     * @param  string[]  $args
      * @return string
      */
-    public static function graphTag($args)
+    public static function graphTag($args): string
     {
-        $urlargs = [];
-        foreach ($args as $key => $arg) {
-            $urlargs[] = $key . '=' . ($arg === null ? '' : urlencode($arg));
-        }
-
-        return '<img class="graph-image" src="' . url('graph.php') . '?' . implode('&amp;', $urlargs) . '" style="border:0;" />';
+        return '<img class="graph-image" src="' . route('graph', $args) . '" style="border:0;" />';
     }
 
     public static function graphPopup($args, $content = null, $link = null)
@@ -438,13 +388,7 @@ public static function graphPopup($args, $content = null, $link = null)
 
     public static function lazyGraphTag($args, string $class = 'img-responsive'): string
     {
-        $urlargs = [];
-
-        foreach ($args as $key => $arg) {
-            $urlargs[] = $key . '=' . ($arg === null ? '' : urlencode($arg));
-        }
-
-        $tag = '<img class="graph-image ' . $class . '" src="' . url('graph.php') . '?' . implode('&amp;', $urlargs) . '" style="border:0;"';
+        $tag = '<img class="graph-image ' . $class . '" src="' . route('graph', $args) . '" style="border:0;"';
 
         if (LibrenmsConfig::get('enable_lazy_load', true)) {
             return $tag . ' loading="lazy" />';
@@ -501,16 +445,24 @@ public static function overlibContent($graph_array, $text)
      * @param  string  $legend
      * @param  int  $width
      * @param  int  $height
-     * @param  string  $sep
      * @param  string  $class
      * @param  int  $absolute_size
      * @return string
      */
-    public static function minigraphImage($device, $start, $end, $type, $legend = 'no', $width = 275, $height = 100, $sep = '&amp;', $class = 'minigraph-image', $absolute_size = 0)
+    public static function minigraphImage($device, $start, $end, $type, $legend = 'no', $width = 275, $height = 100, $class = 'minigraph-image', $absolute_size = 0): string
     {
-        $vars = ['device=' . $device->device_id, "from=$start", "to=$end", "width=$width", "height=$height", "type=$type", "legend=$legend", "absolute=$absolute_size"];
+        $vars = [
+            'device' => $device->device_id,
+            'from' => $start,
+            'to' => $end,
+            'width' => $width,
+            'height' => $height,
+            'type' => $type,
+            'legend' => $legend,
+            'absolute' => $absolute_size,
+        ];
 
-        return '<img class="graph-image ' . $class . '" width="' . $width . '" height="' . $height . '" src="' . url('graph.php') . '?' . implode($sep, $vars) . '">';
+        return '<img class="graph-image ' . $class . '" width="' . $width . '" height="' . $height . '" src="' . route('graph', $vars) . '">';
     }
 
     /**

app/Models/Port.php

@@ -150,12 +150,12 @@ public function getLabel()
 
     /**
      * Get the shortened label for this device.  Replaces things like GigabitEthernet with GE.
-     *
-     * @return string
      */
-    public function getShortLabel()
+    public function getShortLabel(?int $length = null): string
     {
-        return Rewrite::shortenIfName(Rewrite::normalizeIfName($this->ifName ?: $this->ifDescr));
+        $name = Rewrite::normalizeIfName($this->ifName ?: $this->ifDescr);
+
+        return substr(Rewrite::shortenIfName($name), 0, $length);
     }
 
     /**

app/View/Components/Graph.php

@@ -136,7 +136,7 @@ public function filterAttributes($value, $key): bool
 
     private function getSrc(): string
     {
-        return url('graph.php') . '?' . http_build_query($this->vars + [
+        return route('graph', $this->vars + [
             'type' => $this->type,
             'legend' => $this->legend,
             'absolute_size' => $this->absolute_size,