[squash]

Author: martialblog

application/forms/PerfdataGraphsElasticsearchConfigForm.php

@@ -82,7 +82,7 @@ public function createElements(array $formData)
                     . ' The module will use an aggregations query to downsample to this number.'
             ),
             'required' => false,
-            'placeholder' => 5000,
+            'placeholder' => 10000,
         ]);
     }
 

library/Perfdatagraphselasticsearch/Client/OTLPMetricsClient.php

@@ -50,6 +50,7 @@ public function __construct(
             $transport->setBasicAuth($username, $password);
         }
 
+        $this->index = $index;
         $this->transport = $transport;
         $this->maxDataPoints = $maxDataPoints;
     }
@@ -66,7 +67,7 @@ public static function fromConfig(Config $moduleConfig = null): ESInterface
             'api_url' => 'http://localhost:9200',
             'api_index' => 'icinga2',
             'api_timeout' => 10,
-            'api_max_data_points' => 5000,
+            'api_max_data_points' => 10000,
             'api_username' => '',
             'api_password' => '',
             'api_tls_insecure' => false,
@@ -141,26 +142,40 @@ public function fetchMetrics(
         $now = new DateTime();
         $from = $this->parseDuration($now, $from);
 
-        $esql = sprintf(
-            "TS %s",
-            '.ds-metrics-generic.otel-*'
-        );
+        // The index for the query
+        $esql = sprintf("TS %s", $this->index);
+
+        // The service or host filter
+        if (!$isHostCheck) {
+            $esql .= sprintf(
+                "| WHERE resource.attributes.icinga2.host.name == \"%s\""
+                    . "AND resource.attributes.icinga2.service.name == \"%s\""
+                    . "AND resource.attributes.icinga2.command.name == \"%s\"",
+                $hostName,
+                $serviceName,
+                $checkCommand,
+            );
+        } else {
+            $esql .= sprintf(
+                "| WHERE resource.attributes.icinga2.host.name == \"%s\""
+                    . "AND resource.attributes.icinga2.command.name == \"%s\"",
+                $hostName,
+                $checkCommand,
+            );
+        }
 
-        $esql .= sprintf(
-            "| WHERE resource.attributes.icinga2.host.name == \"%s\" AND resource.attributes.icinga2.service.name == \"%s\" AND resource.attributes.icinga2.command.name == \"%s\" AND @timestamp >= TO_DATETIME(\"%s\") AND @timestamp <= NOW()",
-            $hostName,
-            $serviceName,
-            $checkCommand,
-            $from
-        );
+        $esql .= sprintf("AND @timestamp >= TO_DATETIME(\"%s\") AND @timestamp <= NOW()", $from);
 
+        // The aggregated values we want
         $esql .= sprintf(
-            "| STATS avg_threshold = AVG(AVG_OVER_TIME(metrics.state_check.threshold)), avg_perfdata = AVG(AVG_OVER_TIME(metrics.state_check.perfdata)) BY attributes.perfdata_label, attributes.threshold_type, bucket = TBUCKET(%s seconds)",
+            "| STATS avg_threshold = AVG(AVG_OVER_TIME(metrics.state_check.threshold)),"
+                . "avg_perfdata = AVG(AVG_OVER_TIME(metrics.state_check.perfdata)) "
+                . "BY attributes.perfdata_label, attributes.threshold_type, bucket = TBUCKET(%s seconds)",
             $step,
         );
 
-
-        $esql .= "| EVAL bucket_epoch_ms = TO_LONG(bucket), bucket_epoch_s = TO_LONG(bucket) / 1000 | DROP bucket | SORT bucket_epoch_ms";
+        // Sort and transforming the bucket timestamp to seconds
+        $esql .= "| EVAL bucket_epoch_s = TO_LONG(bucket) / 1000 | DROP bucket | SORT bucket_epoch_s";
 
         $pfr = new PerfdataResponse();
 
@@ -176,32 +191,6 @@ public function fetchMetrics(
             $values = $response['values'];
         }
 
-        // "columns" : [
-        //   {
-        //     "name" : "avg_threshold",
-        //     "type" : "double"
-        //   },
-        //   {
-        //     "name" : "avg_perfdata",
-        //     "type" : "double"
-        //   },
-        //   {
-        //     "name" : "attributes.perfdata_label",
-        //     "type" : "keyword"
-        //   },
-        //   {
-        //     "name" : "attributes.threshold_type",
-        //     "type" : "keyword"
-        //   },
-        //   {
-        //     "name" : "bucket_epoch_ms",
-        //     "type" : "long"
-        //   },
-        //   {
-        //     "name" : "bucket_epoch_s",
-        //     "type" : "long"
-        //   }
-        // ],
         $timestamps = [];
 
         $lastTS = 0;
@@ -210,7 +199,7 @@ public function fetchMetrics(
             $avgPerfdata = $val[1] ?? null;
             $label = $val[2] ?? null;
             $type = $val[3] ?? null;
-            $ts = $val[5] ?? null;
+            $ts = $val[4] ?? null;
 
             if (!$this->isIncluded($label, $includeMetrics)) {
                 continue;
@@ -219,6 +208,8 @@ public function fetchMetrics(
                 continue;
             }
 
+            // The timestamp for all labels is the same, so we only add a new ts if it increases.
+            // There might be a better way to do this via the query?
             if ($ts > $lastTS) {
                 $timestamps[] = $ts;
                 $lastTS = $ts;